557 commits

Author	SHA1	Message	Date
Andy Scherzinger	0d8f9cdc2e	issue #1426 - Background color should be white everywhere	2016-03-14 16:16:59 +01:00
David A. Velasco	ec9b705536	Wording and padding fixes in uploads list	2016-03-08 13:17:55 +01:00
David A. Velasco	beb10a91cd	Uploads over settings in navigation drawer	2016-03-03 13:00:32 +01:00
Juan Carlos González Cabrero	a506014d58	Checking of local file when an upload retry is requested	2016-02-24 10:41:50 +01:00
David A. Velasco	286dc8fafd	Merge branch 'master' into reliable_uploads_actions_uploads_view	2016-02-22 10:21:46 +01:00
David A. Velasco	82b0b7a84f	Merge branch 'master' into reliable_uploads_actions_uploads_view	2016-02-15 14:59:04 +01:00
Juan Carlos González Cabrero	9fe62d15ea	Refresh listview when clear failed/finished uploads clicked	2016-02-15 10:58:53 +01:00
Andy Scherzinger	9d9bc6958b	changes color of the OK button and the text	2016-02-12 12:29:05 +01:00
Andy Scherzinger	cbf134a6e2	move strings to resource file	2016-02-12 12:29:05 +01:00
David A. Velasco	3885db5013	Positive button of remove dialog(s) changed to 'Yes'	2016-02-09 08:59:35 +01:00
David A. Velasco	6eca835d1d	Renamed scaring 'delete account' to 'remove account'	2016-02-04 14:51:54 +01:00
David A. Velasco	008153a541	Changed text color of secondary buttons to black	2016-02-04 14:51:54 +01:00
David A. Velasco	7931c321f2	Merge pull request #1461 from owncloud/manage_space_activity ... Added own Activity to manage space instead of default "Clear data" button in device settings	2016-02-04 14:50:53 +01:00
masensio	9fd38ca0dd	Changes from comments in Code Review: staring and NPE	2016-02-03 16:03:10 +01:00
masensio	dc2fdb9744	Changes from comments in Code Review: Strings and minor things	2016-02-03 14:28:12 +01:00
masensio	14530aa7b8	Changes from comments in PR Code Review	2016-02-03 13:45:53 +01:00
masensio	3d623ca911	Review string manage_space_description	2016-02-03 13:37:47 +01:00
masensio	96ce49707b	Clean app data (keeping the PASSCODE untouched) from ManageSpaceActivity	2016-02-03 13:37:45 +01:00
masensio	d6653ef684	Add android:manageSpaceActivity to AndroidManifest.xml. Create empty activity ManageSpaceActivity.java	2016-02-03 13:37:43 +01:00
tobiasKaminsky	5b7f44e0f7	renamed security category to details for further use ... moved position	2016-02-02 17:45:01 +01:00
David A. Velasco	9761b34c76	Merge pull request #1439 from owncloud/wording-fixes ... Wording fixes, simplify some strings and fix capitalization	2016-02-02 17:33:25 +01:00
masensio	9c57aafab5	Review appereance of Uploads View	2016-01-27 13:59:51 +01:00
masensio	44f2894731	Checking Uploads with the same name	2016-01-26 17:53:13 +01:00
masensio	2f231561af	Checking Priviledges Error failed uploads	2016-01-25 15:20:50 +01:00
masensio	29cb1277c3	Checking File Error failed uploads	2016-01-25 14:54:31 +01:00
masensio	15d5350ef6	Checking Folder Error failed uploads	2016-01-25 14:23:23 +01:00
masensio	198c1bf3b0	Checking Credential Error failed uploads: show error as Credential error and relogin	2016-01-25 13:02:22 +01:00
masensio	b6f8e93504	Checking Network Connection failed uploads	2016-01-25 10:59:53 +01:00
David A. Velasco	0d4c9b9961	Show error message from server when update of permissions fail	2016-01-20 12:22:24 +01:00
Jan-Christoph Borchardt	61a1d97abc	wording fixes, simplify some strings and fix capitalization	2016-01-18 15:10:50 +01:00
David A. Velasco	e7901656a1	Polish UI to edit permissions	2016-01-11 15:34:41 +01:00
David A. Velasco	d826451e2d	Added buttons to unshare (working) and finish (not working) in EditShareFragment layout	2016-01-11 12:17:11 +01:00
David A. Velasco	5fcb70beee	Added fragment to edit share permissions with basic layout	2016-01-11 12:17:08 +01:00
masensio	2181239c6d	Merge branch 'master' into reliable_uploads_actions_uploads_view	2016-01-08 11:21:23 +01:00
tobiasKaminsky	6bd7065c73	wip	2016-01-05 11:16:00 +01:00
masensio	540d123ad5	Merge branch 'master' into reliable_uploads_actions_uploads_view	2015-12-29 12:46:45 +01:00
Andy Scherzinger	a812784ddd	Merge branch 'master' of https://github.com/owncloud/android into material_buttons ... Conflicts (resolved): res/layout/drawer.xml res/values/colors.xml res/values/setup.xml	2015-12-28 20:03:25 +01:00
David A. Velasco	bd1f6452ac	Make button colours easy to brand	2015-12-22 17:22:24 +01:00
David A. Velasco	147e6989c8	Added colors for header of navigation drawer and login button to the list of brandable colors	2015-12-14 12:50:52 +01:00
masensio	a840e67a68	Add 'Uploads' option into NavigationDrawer	2015-12-11 08:43:33 +01:00
masensio	dc0aea30f0	Merge branch 'master' into reliable_uploads ... Conflicts: AndroidManifest.xml res/values/strings.xml src/com/owncloud/android/datamodel/OCFile.java src/com/owncloud/android/db/ProviderMeta.java src/com/owncloud/android/files/FileMenuFilter.java src/com/owncloud/android/files/FileOperationsHelper.java src/com/owncloud/android/files/InstantUploadBroadcastReceiver.java src/com/owncloud/android/files/services/FileUploader.java src/com/owncloud/android/operations/SynchronizeFolderOperation.java src/com/owncloud/android/operations/UploadFileOperation.java src/com/owncloud/android/ui/activity/FileDisplayActivity.java src/com/owncloud/android/utils/FileStorageUtils.java	2015-12-10 17:18:52 +01:00
Andy Scherzinger	71e87d98a8	Merge branch 'master' of https://github.com/owncloud/android into material_buttons	2015-12-09 15:14:22 +01:00
Maria Asensio	896e4859c0	Merge pull request #1168 from owncloud/avoidDuplicateFiles ... Avoid duplicate files	2015-12-09 09:27:54 +01:00
masensio	59442c80ea	Update string	2015-12-03 12:58:22 +01:00
tobiasKaminsky	04fc2e3cc2	changed according to latest discussion	2015-12-01 22:00:53 +01:00
masensio	e08513a762	Delete any rest of old public share/unshare flow	2015-11-25 09:32:26 +01:00
David A. Velasco	729a9b7c77	Set or clear password to protect public link in ShareFileFragment	2015-11-25 09:32:19 +01:00
David A. Velasco	f1b3208f1a	Updated ShareFileFragment layout with extra section for public shares	2015-11-25 09:32:15 +01:00
tobiasKaminsky	2aac1e5270	Merge remote-tracking branch 'remotes/upstream/master' into avoidDuplicateFiles_Master	2015-11-21 08:48:40 +01:00
Andy Scherzinger	c31f602fd1	Merge branch 'master' of https://github.com/owncloud/android into material_buttons ... Conflicts: res/layout/list_item.xml	2015-11-06 11:38:51 +01:00