333 commits

Author	SHA1	Message	Date
tobiasKaminsky	1327ce7315	renamed string values	2015-08-04 12:39:56 +02:00
purigarcia	61e6191342	change the name of the method from keepInSync to favorite. Other changes commented in the review	2015-07-22 18:13:45 +02:00
purigarcia	7df9aa7310	add unfavorite option in context menu	2015-07-08 08:50:24 +02:00
purigarcia	ebe5a62f73	change the name from favorites to keep_up_to_date	2015-07-08 08:43:49 +02:00
David A. Velasco	8107d9dc4f	Fixed wrong format of files & folder count	2015-06-23 14:40:51 +02:00
David A. Velasco	8c5b2b7b13	Merge remote-tracking branch 'origin/release-1.7.2' into release-1.7.2	2015-06-22 14:56:13 +02:00
David A. Velasco	69a5b6f25d	More i18n-friendly format for footer in list of files (no string composition) ... Conflicts FIXED: res/values/strings.xml	2015-06-22 11:42:37 +02:00
masensio	e7710e7383	Update string subject_token and update library reference	2015-06-19 15:11:49 +02:00
masensio	75fd0f40c6	Merge branch 'develop' into forbidden_characters_from_server ... Conflicts: owncloud-android-library src/com/owncloud/android/ui/dialog/CreateFolderDialogFragment.java src/com/owncloud/android/ui/dialog/RenameFileDialogFragment.java	2015-06-15 14:51:13 +02:00
David A. Velasco	66f3a45d05	Merge branch 'develop' into navigationDrawer_basic ... Conflicts FIXED: res/layout/files.xml	2015-06-15 13:43:17 +02:00
masensio	febe1fef89	Add new string message for forbidden characters controlled by the server	2015-06-02 11:07:34 +02:00
David A. Velasco	0117006313	Fixed update of id.home action bar button on navigation through FileDisplayActivity	2015-06-02 01:00:14 +02:00
purigarcia	916bd5c6ca	Merge branch 'develop' into automationTest	2015-05-29 14:17:52 +02:00
masensio	cf535b70f1	Disable 'Accounts' in Navigation Drawer	2015-05-29 11:32:36 +02:00
masensio	a9dad9e480	Add content_description to Navigation Drawer options	2015-05-26 11:46:15 +02:00
masensio	101989b70c	Move 'Logs' from Settings to Navigation Drawer	2015-05-26 09:11:27 +02:00
masensio	015eb6fee9	Disable On Device option in Navigation Drawer	2015-05-26 00:01:39 +02:00
tobiasKaminsky	6d4207a06b	Merge remote-tracking branch 'upstream/develop' into navigationDrawer_update	2015-05-21 21:12:44 +02:00
David A. Velasco	a3642ab864	Improved load of images in PreviewImageFragment - no more images in full size by default, up to 3 tries to downScale	2015-05-18 14:29:00 +02:00
purigarcia	2d95a83959	Merge branch 'develop' into automationTest	2015-05-11 08:16:43 +02:00
David A. Velasco	94f4a072ed	Replaced 'pass code' with 'passcode'	2015-05-07 12:07:44 +02:00
purigarcia	6a9dfdb330	Merge branch 'develop' into automationTest	2015-05-06 19:05:03 +02:00
masensio	7d82231809	Merge branch 'develop' into pinEnhancement	2015-05-05 13:56:57 +02:00
David A. Velasco	9593b580b7	Replaced 'PIN code' by 'pass code'	2015-05-04 11:41:09 +02:00
masensio	7d5c573766	Show Waiting dialog, while copy temporal file async task is working	2015-04-30 13:04:51 +02:00
David A. Velasco	802a164616	Merge branch 'develop' into pinEnhancement ... Conflicts SOLVED: src/com/owncloud/android/ui/activity/FileDisplayActivity.java src/com/owncloud/android/ui/activity/Preferences.java src/com/owncloud/android/ui/activity/Uploader.java src/com/owncloud/android/ui/fragment/OCFileListFragment.java	2015-04-28 14:20:17 +02:00
purigarcia	d8e954d2d3	add id and contentdescription to a layout	2015-03-25 18:54:10 +01:00
masensio	c0da8a93f2	Merge branch 'develop' into create_folder_during_upload_pr_701_with_develop	2015-03-20 14:55:48 +01:00
David A. Velasco	5ebd90ed2d	Merge pull request #914 from owncloud/accessibility ... Added accesibility descriptions as a mean to add automatic tests un UI.	2015-03-19 12:59:17 +01:00
masensio	876204faf0	Merge branch 'develop' into create_folder_during_upload_pr_701_with_develop	2015-03-16 11:15:27 +01:00
masensio	c963eb0fad	Merge branch 'develop' into accessibility ... Conflicts: src/com/owncloud/android/ui/adapter/FileListListAdapter.java	2015-03-10 14:58:21 +01:00
masensio	03b5cb9dd6	When no enter a password, message should be 'You must enter a password'	2015-03-09 11:38:36 +01:00
masensio	b08e9e35e6	Create password dialog: SharePasswordDialog.java	2015-03-05 17:54:03 +01:00
David A. Velasco	b5d70ad8e7	App updated to OwnCloudAccount with deferred load of credentials	2015-02-10 10:29:51 +01:00
David A. Velasco	28e4b35595	Quotes updated in subject message for shared link, better format string	2015-02-03 13:17:14 +01:00
masensio	7f6c5bd3b2	Merge commit 'refs/pr/701' into create_folder_during_upload_pr_701_with_develop	2015-01-30 12:10:15 +01:00
David A. Velasco	b894a0a4f9	Removed ... from content description	2015-01-12 09:44:00 +01:00
tobiasKaminsky	d54345d040	Merge remote-tracking branch 'upstream/develop' into uploadNewFolder ... Conflicts: src/com/owncloud/android/ui/activity/Uploader.java	2015-01-08 22:41:41 +01:00
jabarros	3929f1e740	Add content description tag into EditText in account_setup	2015-01-08 13:07:54 +01:00
jabarros	d05d5ffe1a	Merge branch 'develop' into download_folder	2015-01-07 14:04:46 +01:00
jabarros	f737785b4f	Change error message when trying download a folder that does not exist	2015-01-07 13:47:38 +01:00
jabarros	90e49a96e4	Added folder name to 'file not found' error message	2015-01-07 13:04:46 +01:00
jabarros	1db11eb586	Fix. App does not realize that the folder does not exist	2015-01-07 11:22:24 +01:00
tobiasKaminsky	0ae80926ac	update	2015-01-05 19:53:40 +01:00
tobiasKaminsky	cb725acdf3	- removed whitespaces ... - renamed pin description	2015-01-01 13:06:25 +01:00
tobiasKaminsky	74bd1d8d78	- clarify pin description	2014-12-30 09:35:48 +01:00
jabarros	f0905fbaac	Merge pull request #784 from ekeitho/develop ... subject mail populated when user shares >>file/folder<<	2014-12-26 09:04:02 +01:00
Keith Abdulla	150050aeb0	fix tab indent	2014-12-23 09:38:38 -08:00
Keith Abdulla	1db0d7daf2	create an extra string resource	2014-12-23 09:31:59 -08:00
jabarros	6f11fa1c09	Added content description tag in 'account setup' layout elements	2014-12-18 12:22:07 +01:00