mirrors/nextcloud-android
1
0
Fork 0
mirror of https://github.com/nextcloud/android.git synced 2024-12-23 01:00:26 +03:00
Code Issues Projects Releases Packages Wiki Activity
8287 commits 221 branches 1589 tags 640 MiB
Commit graph

503 commits

Author SHA1 Message Date
tobiaskaminsky
05b4c4b9f5
fix missing / 2017-07-14 11:16:58 +02:00
Nextcloud bot
3f59ac9554
[tx-robot] updated from transifex 2017-07-14 00:28:24 +00:00
AndyScherzinger
9ab5338099
Merge branch 'master' of https://github.com/nextcloud/android into userTheming 2017-07-13 09:24:46 +02:00
Nextcloud bot
1e667a260a
[tx-robot] updated from transifex 2017-07-13 00:28:00 +00:00
Nextcloud bot
a365552596
[tx-robot] updated from transifex 2017-07-12 00:27:58 +00:00
tobiasKaminsky
938e222e8f
themeable switch preference 2017-07-11 12:25:55 +02:00
tobiasKaminsky
0bd03548f3
use darker fallback color 2017-07-11 11:49:27 +02:00
AndyScherzinger
1b64ac7abe
Merge branch 'master' of https://github.com/nextcloud/android into userTheming 2017-07-11 09:26:34 +02:00
Nextcloud bot
36fa8691e4
[tx-robot] updated from transifex 2017-07-11 00:28:59 +00:00
AndyScherzinger
bf35562785
Merge branch 'master' of https://github.com/nextcloud/android into userTheming 2017-07-10 14:37:45 +02:00
Nextcloud bot
c493da52de
[tx-robot] updated from transifex 2017-07-10 00:27:56 +00:00
Allan Nordhøy
d4de0af079 Spelling and language fixes 
As per https://oauth.net/2/
Tab removed from:

"Your search returned no files modified
+    <string name="file_list_empty_recently_modified_filter">Search returned no files modified the last 7 days.</string>
-        in the last 7 days."

/AutoUpload is now consistent with /InstantUpload
 2017-07-09 19:55:36 +02:00
Nextcloud bot
684dde1795
[tx-robot] updated from transifex 2017-07-08 00:27:28 +00:00
Nextcloud bot
0d8b5090af
[tx-robot] updated from transifex 2017-07-06 00:27:38 +00:00
Nextcloud bot
a361088838
[tx-robot] updated from transifex 2017-07-05 00:27:15 +00:00
tobiaskaminsky
b85d7947b1
Merge remote-tracking branch 'remotes/origin/master' into userTheming 2017-07-04 10:03:12 +02:00
Nextcloud bot
cd9b12a99c
[tx-robot] updated from transifex 2017-07-04 00:26:48 +00:00
Nextcloud bot
3603ca1d40
[tx-robot] updated from transifex 2017-07-03 00:27:00 +00:00
Nextcloud bot
5d735a84ca
[tx-robot] updated from transifex 2017-07-02 00:26:31 +00:00
Nextcloud bot
8422555e6f
[tx-robot] updated from transifex 2017-07-01 00:27:19 +00:00
AndyScherzinger
c88d9205a2
Merge branch 'master' of https://github.com/nextcloud/android into userTheming 
# Conflicts:
#	scripts/lint/lint-results.txt
#	src/main/java/com/owncloud/android/ui/activity/ActivitiesListActivity.java
#	src/main/java/com/owncloud/android/ui/activity/FolderSyncActivity.java
#	src/main/java/com/owncloud/android/ui/fragment/contactsbackup/ContactsBackupFragment.java
 2017-06-30 22:43:37 +02:00
Andy Scherzinger
72e8888bd2 Merge pull request #1140 from nextcloud/autoUploadWithoutStoragePermission 
Prevent NPE when disabling "storage permission" and then access auto upload
 2017-06-30 22:25:27 +02:00
Tobias Kaminsky
9e68200880 Merge b3c9b504c3 into ad3bf3c256 2017-06-30 13:58:58 +00:00
tobiasKaminsky
ce9d48d08d
remove obsolete strings 2017-06-30 13:11:00 +02:00
tobiasKaminsky
a5f83d9d02
change ui for public release 2017-06-30 13:10:59 +02:00
tobiasKaminsky
e049b56c66
show "contacts backup" eithen in drawer or settings 2017-06-30 13:10:58 +02:00
Nextcloud bot
baf33b6b17
[tx-robot] updated from transifex 2017-06-30 00:27:29 +00:00
Nextcloud bot
b2f99131f2
[tx-robot] updated from transifex 2017-06-29 00:27:06 +00:00
Nextcloud bot
f9ec3574c1
[tx-robot] updated from transifex 2017-06-27 00:27:28 +00:00
tobiasKaminsky
a4c0693288
prevent NPE when disabling "storage permission" and then access auto upload 2017-06-26 16:15:27 +02:00
Nextcloud bot
88e58e9c0c
[tx-robot] updated from transifex 2017-06-26 00:27:26 +00:00
Nextcloud bot
5dcb279318
[tx-robot] updated from transifex 2017-06-25 00:27:29 +00:00
Nextcloud bot
0567679d39
[tx-robot] updated from transifex 2017-06-22 00:27:08 +00:00
Nextcloud bot
86d7d5728f
[tx-robot] updated from transifex 2017-06-21 00:26:37 +00:00
tobiasKaminsky
911c6459ff
use grey theme if no theming of elements is possible 2017-06-20 11:23:49 +02:00
tobiasKaminsky
379709d27a
Merge remote-tracking branch 'remotes/origin/master' into userTheming 2017-06-20 09:44:34 +02:00
Nextcloud bot
35b54651f9
[tx-robot] updated from transifex 2017-06-20 00:27:37 +00:00
tobiasKaminsky
d8d03244c0
participate 2017-06-19 12:05:56 +02:00
tobiasKaminsky
f0f5cb5fec
wip & preferences 2017-06-19 11:48:59 +02:00
Nextcloud bot
b0adc600d0
[tx-robot] updated from transifex 2017-06-17 00:28:22 +00:00
tobiasKaminsky
0db845a544
Merge remote-tracking branch 'origin/userTheming' into userTheming 2017-06-16 13:59:53 +02:00
tobiasKaminsky
8fae712a50
colors colors colors 2017-06-16 13:59:45 +02:00
Nextcloud bot
fcef688f1e
[tx-robot] updated from transifex 2017-06-16 00:29:04 +00:00
AndyScherzinger
914b32f7ab
Merge branch 'master' of https://github.com/nextcloud/android into userTheming 
# Conflicts:
#	src/main/java/com/owncloud/android/ui/fragment/ExtendedListFragment.java
 2017-06-15 07:47:25 +02:00
Nextcloud bot
8d8f0e572f
[tx-robot] updated from transifex 2017-06-15 00:28:23 +00:00
AndyScherzinger
51c2f1d83d
resolves #1078 - Empty content screen icon colors 2017-06-14 11:31:52 +02:00
tobiasKaminsky
db7f93fd14
use own FAB library to support colored FAB main button. 2017-06-14 07:56:55 +02:00
Nextcloud bot
5f61418fc1
[tx-robot] updated from transifex 2017-06-14 00:26:59 +00:00
tobiasKaminsky
db22cf5bb4
ManageAccountActivity: change color of font and active icon in accounts list 2017-06-13 11:13:04 +02:00
Nextcloud bot
6c76c26bc1
[tx-robot] updated from transifex 2017-06-12 00:25:59 +00:00
Nextcloud bot
6ee38c739b
[tx-robot] updated from transifex 2017-06-08 00:27:39 +00:00
tobiasKaminsky
d84c13a176
use background image from theming app in drawer 2017-06-07 09:33:11 +02:00
Nextcloud bot
a25f953b6e
[tx-robot] updated from transifex 2017-06-07 00:29:26 +00:00
Mario Danic
ee2d09be97 Fix a typo 
Signed-off-by: Mario Danic <mario@lovelyhq.com>
 2017-06-06 13:27:16 +02:00
Mario Danic
b530d38b07 Add various customization options 
Signed-off-by: Mario Danic <mario@lovelyhq.com>
 2017-06-06 11:32:29 +02:00
Nextcloud bot
962c5bee7e
[tx-robot] updated from transifex 2017-06-06 00:27:03 +00:00
Nextcloud bot
9ec47db602
[tx-robot] updated from transifex 2017-06-05 00:26:28 +00:00
Nextcloud bot
3ac9c40469
[tx-robot] updated from transifex 2017-06-04 00:27:38 +00:00
Nextcloud bot
3de6aa9b51
[tx-robot] updated from transifex 2017-06-03 00:25:35 +00:00
Nextcloud bot
1e66a8235a
[tx-robot] updated from transifex 2017-06-02 00:27:31 +00:00
Nextcloud bot
22044ec663
[tx-robot] updated from transifex 2017-06-01 00:25:29 +00:00
AndyScherzinger
dd54aa7207
Merge branch 'master' of https://github.com/nextcloud/android into fixingContactBackup 2017-05-31 21:55:31 +02:00
AndyScherzinger
29bd72141d
corrected left icon size to file_icon_size 2017-05-31 12:52:13 +02:00
alejandro
1d92fe8df6
Removing RecyclerView 2017-05-31 11:02:24 +02:00
alejandro
fba1d38100
Header was added in ActivitiesView 
RichSubject was Added
 2017-05-31 11:02:19 +02:00
Nextcloud bot
a9a72106ee
[tx-robot] updated from transifex 2017-05-31 00:26:39 +00:00
alejandro
f0b76ede44 Add Load Contact in Background and ProgressBar 
Fixing Comparator

Format code
 2017-05-30 16:18:16 -05:00
AndyScherzinger
bdcbbb13c5
slightly enlarge autoUpload on/off button hitbox 2017-05-30 08:41:16 +02:00
tobiasKaminsky
328b6625ab
change auto upload path to "/Auto Upload" 2017-05-30 08:41:15 +02:00
tobiasKaminsky
7103fea76d
changed to default 
only "on wifi" is in settings
 2017-05-30 08:41:15 +02:00
tobiasKaminsky
ab096dd0f7
background logic implemented 2017-05-30 08:40:55 +02:00
Andy Scherzinger
0112219dd3 Merge pull request #1050 from nextcloud/comradekingu-patch-1 
Spelling: "Login" is not a verb. + ": Uppercase"
 2017-05-30 07:46:05 +02:00
Nextcloud bot
04d7b6895c
[tx-robot] updated from transifex 2017-05-30 00:27:06 +00:00
AndyScherzinger
1b6dc03872
Merge branch 'master' of https://github.com/nextcloud/android into searchViewWrongFiles 2017-05-29 21:42:51 +02:00
Mario Đanić
e2f07eb2d4 Merge pull request #1011 from nextcloud/contactListImprovement 
Contact list improvement
 2017-05-29 21:15:28 +02:00
comradekingu
7a7091d135 Update strings.xml 
Spelling: "Login" is not a verb. + ": Uppercase"
 2017-05-29 18:35:06 +02:00
Mario Danic
c774aa3040 Partially fix stuff 
Signed-off-by: Mario Danic <mario@lovelyhq.com>
 2017-05-29 12:57:19 +02:00
Nextcloud bot
7d2b37e3ec
[tx-robot] updated from transifex 2017-05-28 00:26:08 +00:00
Nextcloud bot
b6c592a067
[tx-robot] updated from transifex 2017-05-27 00:26:51 +00:00
AndyScherzinger
de58c864bb
fix folder/upload icons for empty list view (Nc blue + 50% opacity) 2017-05-26 11:36:54 +02:00
AndyScherzinger
dc21800299
fix material design color definitions 2017-05-26 11:19:13 +02:00
AndyScherzinger
49453742c9
cleanup actionbar style definition 2017-05-26 11:19:13 +02:00
tobiasKaminsky
5edd32b753
removed nc_blue_accent and nc_blue and use colors from setup.xml 2017-05-26 11:19:13 +02:00
tobiasKaminsky
b3eb13c2df
removed navigation bar color and set to primary 2017-05-26 11:19:12 +02:00
tobiaskaminsky
bf4191e251
checkbox in off state: grey 
auto upload cloud icon in on state: tint it
 2017-05-26 11:19:12 +02:00
tobiasKaminsky
71a9b683fa
change auto upload cloud icon 2017-05-26 11:19:11 +02:00
tobiasKaminsky
8ba192f38a
tint checkboxes 2017-05-26 11:19:11 +02:00
tobiasKaminsky
e671cecc45
WIP use colors from setup.xml for folder icons 2017-05-26 11:19:10 +02:00
Nextcloud bot
8d510e5244
[tx-robot] updated from transifex 2017-05-26 00:25:54 +00:00
Nextcloud bot
e2254cceac
[tx-robot] updated from transifex 2017-05-25 00:25:34 +00:00
tobiasKaminsky
b11ca04f8a
Merge remote-tracking branch 'remotes/origin/master' into contactListImprovement 2017-05-24 11:13:44 +02:00
Nextcloud bot
7995544f6c
[tx-robot] updated from transifex 2017-05-24 00:26:32 +00:00
Mario Đanić
c2edec6815 Merge pull request #1021 from nextcloud/brandingDrawer 
Drawer branding
 2017-05-24 00:56:44 +02:00
tobiaskaminsky
778829d69c - always update contacts backup folder 
- if file is not downloaded, download it then show content
 2017-05-24 00:55:48 +02:00
Mario Đanić
febd1435de Merge pull request #995 from nextcloud/crashDueToEmptyString 
Crash due to non-existing empty string
 2017-05-24 00:15:14 +02:00
Nextcloud bot
0ae25b0c2c
[tx-robot] updated from transifex 2017-05-23 06:55:56 +00:00
Nextcloud bot
00f4e595fa
[tx-robot] updated from transifex 2017-05-23 00:26:22 +00:00
tobiaskaminsky
ce57d257b1
Merge remote-tracking branch 'remotes/origin/master' into brandingDrawer2 2017-05-22 10:03:15 +02:00
tobiaskaminsky
1f8ee72aa5
set to 757575ff and no transparence as in othere files 2017-05-22 10:02:08 +02:00
tobiaskaminsky
16cfaa5525
change/add nav_videos res 2017-05-22 09:49:58 +02:00
Nextcloud bot
9bc5d1bde7
[tx-robot] updated from transifex 2017-05-22 00:25:50 +00:00
Nextcloud bot
ae373a0693
[tx-robot] updated from transifex 2017-05-21 00:25:37 +00:00
Nextcloud bot
50889f726b
[tx-robot] updated from transifex 2017-05-20 00:24:46 +00:00
Nextcloud bot
4ed4ed8dc0
[tx-robot] updated from transifex 2017-05-19 00:25:56 +00:00
tobiaskaminsky
7eddd7440c
fixed "all files" 2017-05-18 14:34:44 +02:00
tobiaskaminsky
fabecc86a5
Merge remote-tracking branch 'remotes/origin/master' into contactListImprovement 2017-05-18 13:47:03 +02:00
Tobias Kaminsky
98989a9363 Merge 44b9355315 into 547453760e 2017-05-18 10:52:31 +00:00
tobiaskaminsky
da497abdb6
move/copy drawer icons 2017-05-18 12:20:55 +02:00
Nextcloud bot
547453760e
[tx-robot] updated from transifex 2017-05-18 00:24:19 +00:00
Tobias Kaminsky
c2010bb3d0 Merge branch 'master' into crashDueToEmptyString 2017-05-17 15:26:05 +02:00
Mario Đanić
01e7112a9a Merge pull request #194 from nextcloud/setAsWallpaper 
Set as wallpaper/contact-photo/etc.
 2017-05-17 13:26:51 +02:00
Tobias Kaminsky
d6a1c7ee83 Merge branch 'master' into crashDueToEmptyString 2017-05-17 12:10:52 +02:00
Nextcloud bot
a79dbe78d4
[tx-robot] updated from transifex 2017-05-17 09:58:58 +00:00
Nextcloud bot
e420fac753
[tx-robot] updated from transifex 2017-05-17 00:23:49 +00:00
tobiasKaminsky
e520c5a585
fix some issues/warnings 
fix some issues/warnings

scoping back
 2017-05-16 13:14:19 +02:00
Mario Đanić
f1c0317dce Merge pull request #1001 from nextcloud/enhanceParticipate 
Minor improvements to participate view
 2017-05-16 11:06:20 +02:00
Nextcloud bot
e4e75bc7cb
[tx-robot] updated from transifex 2017-05-16 00:23:28 +00:00
tobiasKaminsky
6c6b0465b6
Merge remote-tracking branch 'remotes/origin/master' into setAsWallpaper 2017-05-15 14:08:36 +02:00
Tobias Kaminsky
cea61893a0 Merge branch 'master' into enhanceParticipate 2017-05-15 14:04:15 +02:00
Tobias Kaminsky
a2ff44a77e Merge branch 'master' into crashDueToEmptyString 2017-05-15 12:44:22 +02:00
tobiasKaminsky
ebd94e889e
use contribute url from setup.xml 
escape quote signs
 2017-05-15 11:42:28 +02:00
tobiasKaminsky
6f3c3b5579
remove all "string empty" 2017-05-15 10:27:43 +02:00
tobiasKaminsky
aeba233894
use app specific log folder 2017-05-15 09:08:19 +02:00
tobiasKaminsky
4e80906cd9
fix typo 2017-05-15 07:40:14 +02:00
tobiasKaminsky
c6c1713ec2
beautify it 2017-05-15 07:39:00 +02:00
tobiasKaminsky
3351cd4541
add string.empty 2017-05-15 07:38:19 +02:00
Nextcloud bot
0017e16748
[tx-robot] updated from transifex 2017-05-15 00:23:31 +00:00
Nextcloud bot
6db771d36a
[tx-robot] updated from transifex 2017-05-14 00:23:16 +00:00
tobiaskaminsky
c28f17d9af
remove old reference to onClick, this is now handled via ButterKnife 
use "end" instead of "right" for RTL support
 2017-05-13 22:30:00 +02:00
Andy Scherzinger
6409e22228 Merge pull request #502 from nextcloud/recognizeMaintenanceMode 
Recognize maintenance mode
 2017-05-13 13:31:41 +02:00
Nextcloud bot
d0427e78ab
[tx-robot] updated from transifex 2017-05-13 00:23:27 +00:00
davigonz
ea0b399550
Changed maintenance mode message 2017-05-12 15:46:01 +02:00
davigonz
9594835f24
Change dynamically the authentication maintenance mode message with the name of the app 
# Conflicts:
#	res/values/strings.xml
 2017-05-12 15:46:00 +02:00
davigonz
a08fe1e2c9
Changed maintenance mode message 2017-05-12 15:45:56 +02:00
davigonz
8b22e17ab2
Change dynamically the authentication maintenance mode message with the name of the app 
# Conflicts:
#	res/values/strings.xml
 2017-05-12 15:45:56 +02:00
davigonz
74e2438ada
Changed maintenance mode message 2017-05-12 15:45:50 +02:00
davigonz
036b34ca3c
Change dynamically the authentication maintenance mode message with the name of the app 
# Conflicts:
#	res/values/strings.xml
 2017-05-12 15:45:50 +02:00
davigonz
81baba92a0
Changed maintenance mode message 2017-05-12 15:45:44 +02:00
davigonz
1b95c2fb91
Change dynamically the authentication maintenance mode message with the name of the app 
# Conflicts:
#	res/values/strings.xml
 2017-05-12 15:45:44 +02:00
davigonz
a417f2ab2b
Change dynamically the maintenance mode message with the name of the app 2017-05-12 15:45:43 +02:00
davigonz
c7ef965564
Show maintenance mode message while authenticating 
# Conflicts:
#	src/com/owncloud/android/authentication/AuthenticatorActivity.java
 2017-05-12 15:45:43 +02:00
davigonz
c47970857c
Show maintenance mode message while downloading, removing, renaming or creating folder operations 2017-05-12 15:45:42 +02:00
davigonz
ad6d867971
Show maintenance mode error in notifications while uploading a file 
# Conflicts:
#	build.gradle
#	res/values/strings.xml
 2017-05-12 15:45:42 +02:00
Tobias Kaminsky
b98beaf0ef Merge branch 'master' into setAsWallpaper 2017-05-12 15:18:52 +02:00
tobiaskaminsky
01761718d9
handle Nougat and wallpaper app 2017-05-12 15:17:16 +02:00
tobiaskaminsky
58c9a7ddc7
remove authority cache 2017-05-12 15:03:34 +02:00
tobiaskaminsky
d50ee0085d
Merge remote-tracking branch 'remotes/origin/master' into setAsWallpaper 2017-05-12 15:02:11 +02:00
tobiasKaminsky
854a3c026c
added privacy webview 
restructured setup.xml
adapted modified/setup.xml to general/setup.xml
 2017-05-12 12:43:36 +02:00
Nextcloud bot
8ec2a1de46
[tx-robot] updated from transifex 2017-05-12 00:22:16 +00:00
Mario Đanić
99114a2c72 Merge pull request #972 from nextcloud/hideContactsBackupFolder 
Hide contacts backup folder
 2017-05-11 11:32:15 +02:00