424 commits

Author	SHA1	Message	Date
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
David A. Velasco	41b5eb13b1	Merge remote-tracking branch 'origin/navigationDrawer_basic' into navigationDrawer_basic	2015-05-29 13:46:30 +02:00
David A. Velasco	27148acf16	Fixed style in log-in activity; should be Light, as before	2015-05-29 13:30:02 +02:00
masensio	cf535b70f1	Disable 'Accounts' in Navigation Drawer	2015-05-29 11:32:36 +02:00
masensio	c20041d157	Merge branch 'remove_ActionBarSherlock' into navigationDrawer_update ... Conflicts: res/menu/main_menu.xml src/com/owncloud/android/ui/activity/FileDisplayActivity.java src/com/owncloud/android/ui/activity/FolderPickerActivity.java src/com/owncloud/android/ui/activity/Preferences.java src/com/owncloud/android/ui/preview/PreviewImageActivity.java	2015-05-27 14:19:30 +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
masensio	4f2f0ceb80	Add actionBar	2015-05-25 12:39:05 +02:00
tobiasKaminsky	6d4207a06b	Merge remote-tracking branch 'upstream/develop' into navigationDrawer_update	2015-05-21 21:12:44 +02:00
masensio	5f2820355d	Merge branch 'develop' into navigation_drawer ... Conflicts: src/com/owncloud/android/ui/preview/PreviewImageFragment.java	2015-05-21 09:46:59 +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
masensio	a496f08717	Remove actionbarsherlock , replace it with Android Support Library (v7)	2015-05-18 12:59:46 +02:00
masensio	d43fbbac6b	[DEV] Remove actionbarsherlock , replace it with Android Support Library (v7)	2015-05-15 11:24:14 +02:00
purigarcia	2d95a83959	Merge branch 'develop' into automationTest	2015-05-11 08:16:43 +02:00
David A. Velasco	47343ca299	Merge pull request #973 from owncloud/delete_share_option_in_app ... Make share feature configurable	2015-05-08 14:55:07 +02:00
David A. Velasco	fb6047a72c	Rename the flag to show my wish that someday the app will allow to share with other users too	2015-05-08 11:17:39 +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
masensio	a41c0b39f2	Add option to turn off share in setup.xml	2015-05-04 14:29:17 +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	68b9744a9c	Merge branch 'develop' into automationTest	2015-04-16 09:10:59 +02:00
masensio	7696c08565	Hotfix user_agent	2015-04-09 11:16:13 +02:00
purigarcia	d8e954d2d3	add id and contentdescription to a layout	2015-03-25 18:54:10 +01:00
David A. Velasco	6bef4abf74	Merge pull request #924 from owncloud/add_user_agent_support ... Updated after adding custom user agent support to library	2015-03-25 10:57:04 +01:00
masensio	e18de547c8	Update user agent string	2015-03-24 14:53:53 +01:00
masensio	0de25b228c	Update uger agent string	2015-03-24 14:44:05 +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	7a42dc2bf4	Add user-agent string to setup options	2015-03-18 17:08:42 +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	82fa95fe43	Merge branch 'develop' into share_password_support	2015-03-06 10:19:06 +01:00
masensio	b08e9e35e6	Create password dialog: SharePasswordDialog.java	2015-03-05 17:54:03 +01:00
masensio	0bef9fdedb	Update year in license	2015-03-05 13:27:45 +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
David A. Velasco	4af15f7b4e	Merge branch 'develop' into imageGrid	2015-02-02 13:48:30 +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
jabarros	0470de47e0	Fixed. Line behind the folder is not shown in the upload view	2015-01-22 09:29:36 +01:00
tobiasKaminsky	b5fdba576f	changes as requested	2015-01-19 22:13:45 +01:00