Commit graph

2078 commits

Author SHA1 Message Date
David A. Velasco
db6acc6868 Clean-up and small refactorings
Conflicts:
	src/com/owncloud/android/files/FileOperationsHelper.java
	src/com/owncloud/android/ui/fragment/ExtendedListFragment.java
2016-07-09 19:49:37 +02:00
David A. Velasco
fae65e5b1e Revert changes in translated string resources.
This reverts part of commit f44c74033527c2c3b36b552cca7519e7ec3b13ce.
2016-07-09 19:47:25 +02:00
Andy Scherzinger
ab136a14a3 Merge branch 'multiSelect' of https://github.com/owncloud/android into multiSelectNew
Conflicts:
	build.gradle
	oc_jb_workaround/build.gradle
	owncloud-android-library
	res/layout/uploader_layout.xml
	res/layout/uploader_list_item_layout.xml
	res/menu/file_actions_menu.xml
	res/values/setup.xml
	src/com/owncloud/android/authentication/AuthenticatorActivity.java
	src/com/owncloud/android/db/PreferenceManager.java
	src/com/owncloud/android/files/FileMenuFilter.java
	src/com/owncloud/android/files/FileOperationsHelper.java
	src/com/owncloud/android/ui/activity/FolderPickerActivity.java
	src/com/owncloud/android/ui/adapter/FileListListAdapter.java
	src/com/owncloud/android/ui/fragment/ExtendedListFragment.java
2016-06-30 15:11:34 +02:00
Andy Scherzinger
5d7c1f31e7 new open in app icon during multi select 2016-06-30 10:53:57 +02:00
David Wiesner
4f7d3d4fd1 fix: GridView not restore selected positions but getCheckedItemCount ill return right value 2016-06-24 12:11:31 +02:00
David Wiesner
659f280a8b build fixes 2016-06-24 12:11:31 +02:00
David A. Velasco
301ec578bc Fix crash due to obsolete string resources 2016-06-24 12:11:31 +02:00
Juan Carlos González Cabrero
9af6bf238c Remove deprecated code after last update 2016-06-24 12:11:31 +02:00
Juan Carlos González Cabrero
dd5cb1ad6a Disable favorite actions from multiple context menu 2016-06-24 12:11:31 +02:00
Andy Scherzinger
29aa48c8a7 align checkbox top left 2016-06-24 12:11:31 +02:00
Andy Scherzinger
cae4f248e5 fixed color references and list item layout for multi select 2016-06-24 12:11:31 +02:00
Andy Scherzinger
ef739c5d81 fixed coloring and material style for multi select 2016-06-24 12:11:31 +02:00
tobiasKaminsky
3f108e7a52 changes according to CR 2016-06-24 12:11:31 +02:00
Andy Scherzinger
4380290d90 code review fixes 2016-06-24 12:11:31 +02:00
Andy Scherzinger
2e65ffcf4f grey system bar coloring on multi select 2016-06-24 12:11:31 +02:00
Andy Scherzinger
fdcb17cd57 Fiy multiselect styling for action bar mode 2016-06-24 12:11:31 +02:00
Andy Scherzinger
e7fa658994 added menu item icons in material style for multi select display 2016-06-24 12:11:31 +02:00
tobiasKaminsky
f1cba47d40 wip 2016-06-24 12:11:31 +02:00
tobiasKaminsky
d142cca6ab wip 2016-06-24 12:11:31 +02:00
tobiasKaminsky
d761f24572 wip 2016-06-24 12:11:31 +02:00
Jenkins for ownCloud
62c83dc102 [tx-robot] updated from transifex 2016-06-24 01:14:05 -04:00
tobiasKaminsky
ee01a1ad1d add missing files 2016-06-23 21:23:52 +02:00
tobiasKaminsky
1183e51c19 Merge remote-tracking branch 'owncloud/multiSelect' into multiSelectOwncloud
# Conflicts:
#	res/drawable-hdpi/ic_checkbox_marked.png
#	res/drawable-mdpi/ic_checkbox_marked.png
#	res/drawable-xhdpi/ic_checkbox_marked.png
#	res/drawable-xxhdpi/ic_checkbox_marked.png
#	res/layout/grid_image.xml
#	res/values/strings.xml
#	src/com/owncloud/android/notifications/NotificationBuilderWithProgressBar.java
#	src/com/owncloud/android/ui/activity/FileDisplayActivity.java
#	src/com/owncloud/android/ui/adapter/FileListListAdapter.java
#	src/com/owncloud/android/ui/dialog/RemoveFileDialogFragment.java
#	src/com/owncloud/android/ui/fragment/OCFileListFragment.java
2016-06-23 21:10:58 +02:00
Andy Scherzinger
f73f78fb28 Merge pull request #55 from nextcloud/setupScreenImprovement
Update welcome url, fixes #16
2016-06-23 11:06:01 +02:00
Jenkins for ownCloud
aa118551e3 [tx-robot] updated from transifex 2016-06-23 01:13:52 -04:00
Andy Scherzinger
207801c000 Update welcome url, fixes #16 2016-06-22 19:14:19 +02:00
Andy Scherzinger
2c256bf53d added the ability to select all within a folder for upload - selection is discarded when navigating folders 2016-06-22 16:43:23 +02:00
Jenkins for ownCloud
9e65ac0365 [tx-robot] updated from transifex 2016-06-22 01:14:06 -04:00
Bartosz Przybylski
db7a4641c2 Add documents provider 2016-06-20 22:15:02 +02:00
Jenkins for ownCloud
674a094334 [tx-robot] updated from transifex 2016-06-20 01:13:38 -04:00
Jenkins for ownCloud
39a2d79841 [tx-robot] updated from transifex 2016-06-19 01:13:46 -04:00
Jenkins for ownCloud
18fa573009 [tx-robot] updated from transifex 2016-06-17 01:14:15 -04:00
Jenkins for ownCloud
6333e30558 [tx-robot] updated from transifex 2016-06-16 01:14:13 -04:00
Jenkins for ownCloud
f361398d5f [tx-robot] updated from transifex 2016-06-15 01:14:37 -04:00
Andy Scherzinger
0db0ab1fd5 layouting changes so file list, local list and uploader list look the same 2016-06-14 09:55:24 +02:00
Andy Scherzinger
68849c7305 code review: fixed minor layout optimizations, set generic preference methods to private visibility 2016-06-14 09:55:22 +02:00
Andy Scherzinger
9bbd7ee103 proper padding for the choose upload folder buttons 2016-06-14 09:55:16 +02:00
Andy Scherzinger
ef0b5030e1 fix background color 2016-06-14 09:55:14 +02:00
Andy Scherzinger
d74f5fdc2a implementation of #1193 - optimizing the uploader layout and taking user configured sorting into account 2016-06-14 09:55:14 +02:00
Jenkins for ownCloud
932c66d4c5 [tx-robot] updated from transifex 2016-06-14 01:13:59 -04:00
Andy Scherzinger
944af7e62b code review plus fixed for the layouts and data to be displayed
now all file list view (uploader, upload external and standard file list have the same layout)
2016-06-13 21:50:11 +02:00
Andy Scherzinger
bce26b4935 changes padding 2016-06-13 21:50:09 +02:00
Andy Scherzinger
e0a283a876 rebase changes with master 2016-06-13 21:50:08 +02:00
Andy Scherzinger
593e3e900f proper padding for the choose upload folder buttons 2016-06-13 21:50:07 +02:00
Andy Scherzinger
acdd68d775 fix background color 2016-06-13 21:50:06 +02:00
Andy Scherzinger
74fa10964a implementation of #1193 - optimizing the uploader layout and taking user configured sorting into account 2016-06-13 21:50:05 +02:00
Andy Scherzinger
cd0082c5e4 proper padding for the choose upload folder buttons 2016-06-13 21:49:59 +02:00
Andy Scherzinger
a3359d0a48 fix background color 2016-06-13 21:49:57 +02:00
Andy Scherzinger
cecab96b2f implementation of #1193 - optimizing the uploader layout and taking user configured sorting into account 2016-06-13 21:49:57 +02:00
Jenkins for ownCloud
00e7c102c2 [tx-robot] updated from transifex 2016-06-12 01:13:58 -04:00