256 commits

Author	SHA1	Message	Date
jabarros	3a8ff76d0a	Merge branch 'master' into develop ... Conflicts: owncloud-android-library	2014-10-20 14:54:46 +02:00
jabarros	016bdfac1f	Fixed. Upload path is not place correctly in setting view	2014-10-15 08:21:23 +02:00
jabarros	1e7e893321	Merge branch 'master' of https://github.com/loripino21/android into instant_upload_path_chooseable	2014-10-06 14:58:34 +02:00
jabarros	2e472998c1	Merge branch 'develop' into release-1.6.0	2014-10-02 09:04:11 +02:00
loripino21	47d1a5e3e4	Update strings.xml	2014-09-23 10:08:40 +02:00
loripino21	72c6e981c5	Update strings.xml	2014-09-23 10:03:56 +02:00
Volkan Gezer	863c0145be	fix owncloud capitalization	2014-09-19 18:10:20 +02:00
David A. Velasco	aa354e5d73	Merge branch 'develop' into release-1.6.0	2014-09-18 14:27:13 +02:00
jabarros	33c171e6d4	Update string auth_redirect_non_secure_connection_title	2014-09-18 10:57:51 +02:00
jabarros	74c29e1ce1	Changes after CR	2014-09-17 16:46:11 +02:00
jabarros	2ef886af31	Merge branch 'develop' into better_loggin_system	2014-09-17 09:47:34 +02:00
David A. Velasco	cbdb5d3ff0	Fixed mess created with b9eaffd	2014-09-12 13:49:37 +02:00
jabarros	4599553545	Move Logger class to owncloud library and update references. Add async task for loading log info into LogHistoryActivity	2014-09-11 18:26:52 +02:00
jabarros	ba6c6375cf	Merge branch 'develop' into ADFS_auth_support ... Conflicts: res/values/strings.xml	2014-09-09 13:17:41 +02:00
jabarros	2ada53c99b	Enable log into text file automatically when BuildConfig.DEBUG is true. Open log activity when user clicks on action bar menu option. Add button to send email with log file attached.	2014-09-04 09:06:14 +02:00
David A. Velasco	1dbba08c7b	Improved messages for operations on files not existing anymore in the server	2014-09-02 10:13:14 +02:00
jabarros	622523b3e3	Show alert message when user or password in authentication is not correct	2014-08-28 16:03:03 +02:00
jabarros	28614af18d	Merge branch 'develop' into move_files_and_folders	2014-08-28 12:32:39 +02:00
jabarros	d3d0816ed7	Show a dialog to request username and password to the user on authentication request	2014-08-28 12:30:32 +02:00
jabarros	8188d4fa92	Update messages for moving files operation results	2014-08-27 10:01:28 +02:00
jabarros	622d78906b	Show an alert message when user tries to move a file or folder to a location where its name is used by other file or folder and when it is forbidden to move it	2014-08-26 18:44:14 +02:00
jabarros	a6afe6efd2	Add gestion for errors when moving files	2014-08-26 17:44:18 +02:00
jabarros	dc984ec5bf	Add new activity for selecting the destination folder when moving files, including new List Fragment and new Adapter for listing only the folders	2014-08-13 16:43:50 +02:00
David A. Velasco	0cc6b8a3ff	Improved English wording	2014-08-12 09:27:23 +02:00
jabarros	fbe0568883	Add into file_actions_menu xml the 'move' option	2014-08-11 14:39:44 +02:00
jabarros	b154fba6ee	Merge branch 'develop' into accounts_view ... Conflicts: res/values/strings.xml	2014-08-07 17:34:15 +02:00
David A. Velasco	aa4709024e	Updated message for warning about HTTPS -> HTTP redirection	2014-08-07 13:32:22 +02:00
jabarros	471d64a16c	Change the title of preference for adding new accounts and remove unused commented code	2014-08-06 09:23:21 +02:00
jabarros	5cba80a1ab	Add new preference category on settings and list in it the accounts	2014-08-05 11:22:16 +02:00
jabarros	fcb556eb2d	Show appropiate message and update library reference	2014-08-04 10:21:48 +02:00
David A. Velasco	41666b2d6c	Merge pull request #578 from owncloud/show_message_for_empty_list ... Show background message when list of files is empty	2014-07-30 09:40:17 +02:00
jabarros	89e7ad9e67	Show message when the file list is being loading and when it is empty	2014-07-25 13:13:58 +02:00
jabarros	2b21d67791	Add case for when trying to download a file that is no longer available on the server	2014-07-25 09:11:21 +02:00
jabarros	61c8f7f083	Upgrade notifications on status bar when uploading to show proper message about fails due to lack of permissions and removed FailedUploaderActivity	2014-07-25 09:11:20 +02:00
jabarros	a28fa921c9	Update ErrorMessageAdapter class to generate appropiate error messages for operations failed due to lack of permissions (ResultCode.FORBIDDEN)	2014-07-25 09:10:26 +02:00
jabarros	fb1a4bad59	Add message when LocalFileList and OCFileLIst are empty	2014-07-24 18:34:12 +02:00
jabarros	055be96386	Remove InstantUploadActivity and related resources	2014-07-14 08:40:16 +02:00
David A. Velasco	dacc14a882	Merge remote-tracking branch 'origin/develop' into add_cookie_based_session_support	2014-07-01 14:21:26 +02:00
David A. Velasco	1958964f56	Added lost string for previous commit	2014-06-26 11:33:51 +02:00
David A. Velasco	c266cccb23	Fixed lost pronoun	2014-06-24 14:51:39 +02:00
David A. Velasco	7c34300268	Improved message	2014-06-23 08:48:42 +02:00
masensio	9fa747d3d1	Update failed_upload_load_more_images string	2014-05-28 17:16:20 +02:00
David A. Velasco	4bb658fe88	Fixed typo in strings	2014-05-28 14:55:18 +02:00
masensio	a3a5cd4eb7	Merge branch 'develop' into release-1.5.6	2014-05-27 13:18:41 +02:00
masensio	ba1a428964	Modify strings: can not --> cannot, remove space before ?	2014-05-27 09:08:10 +02:00
masensio	bcab40c535	Use ErrorMessageAdapter to access the error string when an error in a finished foreground operation occurs	2014-05-26 14:56:51 +02:00
masensio	db43531874	Add specific message(s) for network error(s) in strings.xml	2014-05-26 13:00:22 +02:00
masensio	0a7f748902	Define strings for failes uploads/downloads with credentials errors	2014-05-23 09:40:09 +02:00
David A. Velasco	dfdc713a15	Created new dialog classes for file renaming and folder creations	2014-05-16 14:57:19 +02:00
David A. Velasco	68f4ceb5a7	Separate options to enable & disable instant upload of new pictures and new videos	2014-04-21 10:49:31 +02:00