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

6299 commits

This branch
This branch
All branches
Author SHA1 Message Date
Andy Scherzinger
9474658bcd bumped support lib to latest version of 23 2016-07-20 15:55:11 +02:00
Andy Scherzinger
573f95d110 fixes after merge 2016-07-20 15:33:08 +02:00
Andy Scherzinger
62c918f59a Merge 'master' including conflict fixing 
Conflicts:
	src/com/owncloud/android/ui/adapter/FileListListAdapter.java
	src/com/owncloud/android/ui/fragment/OCFileListFragment.java
 2016-07-20 15:26:59 +02:00
Andy Scherzinger
1876746481 Merge pull request #36 from nextcloud/video_thumbnail 
Video thumbnail
 2016-07-20 15:20:26 +02:00
Andy Scherzinger
71a44db0dd CR changes 2016-07-20 14:24:03 +02:00
Andy Scherzinger
2af26edb0b Merge branch 'master' of https://github.com/nextcloud/android into multiSelectNew 
Conflicts:
	res/values-ca/strings.xml
	res/values-he/strings.xml
	res/values-hu-rHU/strings.xml
	res/values-ja-rJP/strings.xml
	res/values-ko/strings.xml
	res/values-lb/strings.xml
	res/values-lt-rLT/strings.xml
	res/values-pl/strings.xml
	res/values-pt-rPT/strings.xml
	res/values-th-rTH/strings.xml
	res/values-tr/strings.xml
 2016-07-20 13:19:41 +02:00
Andy Scherzinger
ecf1f9e3da proper status bar coloring for multi select mode, cleanup logging 2016-07-20 13:09:56 +02:00
Nextcloud bot
22b9ad807c
[tx-robot] updated from transifex 2016-07-20 00:33:48 +00:00
Andy Scherzinger
a6bd6030d2 Replace Log.wtf calls with Log.e 2016-07-19 14:36:41 +02:00
Kenny Root
b7295e5f09 Replace Log.wtf calls with Log.e 
This will prevent crashing when running on a userdebug phone. Log#wtf
should only be used when the program can not go on because a critical
assertion fails. These all don't seem to meet that criteria.

Fixes #1603

Conflicts:
	src/com/owncloud/android/ui/activity/FileActivity.java
 2016-07-19 14:33:01 +02:00
Nextcloud bot
7f9cf817a7
[tx-robot] updated from transifex 2016-07-19 00:33:47 +00:00
Andy Scherzinger
2bfb1b6903 fixed overlay bug with toolbar 2016-07-18 17:38:02 +02:00
Tobias Kaminsky
0484d4aa06 Merge pull request #130 from nextcloud/129_authoritiesFillPath 
#129 Add authorities prefixes to providers
 2016-07-18 17:35:42 +02:00
Nextcloud bot
5ef50c6658
[tx-robot] updated from transifex 2016-07-18 13:28:56 +00:00
Andy Scherzinger
3ea6c22ae6 Merge pull request #132 from nextcloud/accountDeletionFix 
Fix NPE on last account deletion
 2016-07-18 10:58:32 +02:00
Bartosz Przybylski
a4d30e88e5 update authority to match authority in java files 2016-07-17 23:38:36 +02:00
Tobias Kaminsky
64f3fa9290 Merge pull request #134 from nextcloud/textPreviewSelectable 
textPreview is selectable
 2016-07-17 13:20:30 +02:00
tobiasKaminsky
e714707754 textPreview is selectable 2016-07-16 09:08:52 +02:00
tobiasKaminsky
dfae9cfc27 fix NPE 2016-07-16 08:11:30 +02:00
tobiasKaminsky
ff32763024 update to master 2016-07-15 20:15:59 +02:00
tobiasKaminsky
98a679548a Merge remote-tracking branch 'remotes/origin/master' into multiSelectNew 2016-07-15 18:32:56 +02:00
tobiasKaminsky
411e5392bc Merge remote-tracking branch 'remotes/origin/master' into video_thumbnail 2016-07-15 18:05:05 +02:00
Bartosz Przybylski
a4900f9bfa Add authorities prefixes to providers 2016-07-15 00:42:33 +02:00
Andy Scherzinger
f2939a01fd Merge pull request #116 from nextcloud/confirmAccountDeletion 
Add confirmation dialog on account deletion
 2016-07-14 23:59:49 +02:00
Andy Scherzinger
fca1e0d2fd added line breaks according to CR 2016-07-14 23:31:48 +02:00
Andy Scherzinger
956edc5e7a use nextcloud trashbin icon 2016-07-14 23:31:47 +02:00
Bartosz Przybylski
6ad28b5250 change close icon to delete icon 2016-07-14 23:31:47 +02:00
Bartosz Przybylski
3f952fad30 Update account list adapter, just notifying adapter makes no sense 2016-07-14 23:31:46 +02:00
Bartosz Przybylski
098cf7dd46 Add confirmation dialog on account deletion 2016-07-14 23:31:46 +02:00
Andy Scherzinger
381feafce1 Merge pull request #125 from nextcloud/switchOfflineFiles 
Switch offline files
 2016-07-14 23:30:40 +02:00
Andy Scherzinger
f1e2f1151b recovered icon after rebase 2016-07-14 22:45:29 +02:00
Andy Scherzinger
9172618c73 rename fix 2016-07-14 22:43:20 +02:00
Andy Scherzinger
1119702fe2 cleanup iconwork 2016-07-14 22:43:19 +02:00
Andy Scherzinger
55e088e33a renamed icon, fixed string ref for Uploads drawer item 2016-07-14 22:43:19 +02:00
Andy Scherzinger
9c76e2828c proper on device icon 2016-07-14 22:42:24 +02:00
tobiasKaminsky
cc3dfd6100 using all files not only downloaded one 2016-07-14 22:42:24 +02:00
Andy Scherzinger
d1f9cae7f4 cleanup, accounts is handled differently with latest implementation (housekeeping here) 2016-07-14 22:42:23 +02:00
Andy Scherzinger
a33a03a928 adaption after rebase to switch between all/offline files 2016-07-14 22:42:23 +02:00
tobiasKaminsky
abca14ce17 fixed bug #1297 2016-07-14 22:42:21 +02:00
Andy Scherzinger
2a7ce555b9 fixed icon (+naming) to use resolution depended icon and don't scale 2016-07-14 22:42:20 +02:00
Andy Scherzinger
6e2a6326f0 download icon 2016-07-14 22:42:20 +02:00
tobiasKaminsky
a1d3a10146 add missing file 2016-07-14 22:42:19 +02:00
tobiasKaminsky
7a2338f8d8 refresh after chage 2016-07-14 22:42:18 +02:00
tobiasKaminsky
9d74b7e223 enabled all occurrences. 2016-07-14 22:42:18 +02:00
Andy Scherzinger
d00893c66a Merge pull request #124 from nextcloud/sortInUploadFilesActivity 
Sort in upload files activity
 2016-07-14 22:38:04 +02:00
Andy Scherzinger
be8d8460df Merge pull request #128 from nextcloud/hdpiIconFix 
corrected icon sizes for hdpi and mdpi
 2016-07-14 21:40:23 +02:00
Andy Scherzinger
21c80b056e added local size sorter 2016-07-14 15:46:02 +02:00
Andy Scherzinger
cfe77ce270 renamed method 2016-07-14 15:40:45 +02:00
Andy Scherzinger
edc7781af9 simplified and bugfixed code using our own preference manager to handle preferences 2016-07-14 15:33:33 +02:00
Andy Scherzinger
19b711f2d8 cleanup menus 2016-07-14 14:48:22 +02:00