2106 commits

This branch

This branch

All branches

Author	SHA1	Message	Date
Jenkins for ownCloud	0325e6a0a2	[tx-robot] updated from transifex	2014-06-01 01:13:34 -04:00
Jenkins for ownCloud	efee32876e	[tx-robot] updated from transifex	2014-05-31 01:13:38 -04:00
masensio	17c9af3541	Merge branch 'master' into develop	2014-05-30 09:30:05 +02:00
Jenkins for ownCloud	42f4659609	[tx-robot] updated from transifex	2014-05-30 01:13:36 -04:00
Jenkins for ownCloud	902bc3d9cd	[tx-robot] updated from transifex	2014-05-29 01:13:34 -04:00
masensio	76c2cf5b84	Update version number to 1.5.6, 1.0.15(workaround)	2014-05-28 17:17:24 +02:00
masensio	9fa747d3d1	Update failed_upload_load_more_images string	2014-05-28 17:16:20 +02:00
masensio	bdc4de75bc	Fix: App gets stuck when sharing a folder when there is a credential error	2014-05-28 17:14:21 +02:00
David A. Velasco	4bb658fe88	Fixed typo in strings	2014-05-28 14:55:18 +02:00
masensio	ae764c630f	Update library reference	2014-05-28 11:17:38 +02:00
masensio	0f7908ef04	Update library reference for release-1.5.6	2014-05-28 10:37:32 +02:00
masensio	d24ba158d2	Add comments	2014-05-27 14:10:52 +02:00
masensio	90a2d121b2	Remove unnecessary import in DisplayUtils	2014-05-27 14:08:05 +02:00
masensio	e9f0604fb7	Merge branch 'fixed_video_playback_on_rotations' into release-1.5.6	2014-05-27 13:20:01 +02:00
masensio	a3a5cd4eb7	Merge branch 'develop' into release-1.5.6	2014-05-27 13:18:41 +02:00
masensio	476bfba9e4	Update file images, add new mimetypes to show: spreadsheets, impress, rar, rtf and 3gp	2014-05-27 13:16:16 +02:00
David A. Velasco	a139eca126	Merge pull request #505 from owncloud/more_concrete_error_messages_session_expires ... More concrete error messages when session expires	2014-05-27 12:29:07 +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	99dcc9c5d5	New class ErrorMessageAdapter to choose proper error message to show to the user depending on the results of operations	2014-05-26 10:15:28 +02:00
masensio	f849570b0a	Merge branch 'develop' into more_concrete_error_messages_session_expires	2014-05-26 08:52:38 +02:00
Jenkins for ownCloud	f6fec8bfdd	[tx-robot] updated from transifex	2014-05-26 01:13:38 -04:00
Jenkins for ownCloud	2546b69f91	[tx-robot] updated from transifex	2014-05-25 01:13:33 -04:00
Jenkins for ownCloud	7848298c38	[tx-robot] updated from transifex	2014-05-24 01:13:34 -04:00
masensio	58a18684c2	Merge pull request #501 from owncloud/no_case_sensitive_log_in ... Make username case insensitive	2014-05-23 14:47:05 +02:00
David A. Velasco	8a74431926	Fixed reinit of video preview on rotations from portrait to landscape (tablets only) ; removed unneeded reinit of second fragment	2014-05-23 14:20:55 +02:00
David A. Velasco	869b92ffd6	Fixed recovery on file state in PreviewFragment on rotations	2014-05-23 14:03:35 +02:00
masensio	121887c899	Use the new strings for upload and download fails when it is necessary	2014-05-23 13:34:21 +02:00
David A. Velasco	12820ba757	Make username case insensitive	2014-05-23 11:21:48 +02:00
masensio	0a7f748902	Define strings for failes uploads/downloads with credentials errors	2014-05-23 09:40:09 +02:00
Jenkins for ownCloud	600dd05778	[tx-robot] updated from transifex	2014-05-22 01:13:36 -04:00
David A. Velasco	3969dbb768	Merge pull request #500 from owncloud/refactor_update_filelist_from_database ... Refactored update of UI after finish of operations and file updates	2014-05-20 14:49:28 +02:00
masensio	087b0159b3	Update library reference	2014-05-20 14:26:23 +02:00
masensio	41cee846cf	Changes in OCFileListFragment from comments in PR#500	2014-05-20 14:25:53 +02:00
masensio	9740acc17e	Changes in FileDisplayActivity from comments in PR#500	2014-05-20 14:20:17 +02:00
masensio	e790c8f83f	Changes in FileDataStorageManager from comments in PR#500	2014-05-20 14:01:55 +02:00
masensio	27ff23740c	Fix: It says 'Rename could not be completed' but it's done when renaming from detail view	2014-05-20 13:16:01 +02:00
masensio	57fe5e08fd	Merge branch 'develop' into refactor_update_filelist_from_database	2014-05-20 12:16:16 +02:00
masensio	a9bfb401d5	Fix: Loading icon is there when coming back to the app	2014-05-20 12:15:26 +02:00
masensio	d5c6450989	Merge pull request #498 from owncloud/fixed_accidental_refresh_when_sending_media_file_to_other_app ... Fixed accidental refresh when sending media file to other app	2014-05-20 12:08:20 +02:00
David A. Velasco	8385525aaa	Fixed accidental refresh when sending media file to other app	2014-05-20 11:24:50 +02:00
masensio	3b0a823458	Merge pull request #497 from owncloud/fixed_local_removal_of_files ... Fixed local removal of files	2014-05-20 10:37:57 +02:00
David A. Velasco	1664299bd2	Fixed local removal of files when a folder is removed locally and holds local files currently out of sync	2014-05-20 10:30:02 +02:00
masensio	b3c06007da	Merge pull request #496 from owncloud/removed_not_working_file_sync_in_gallery ... Removed not working file sync in gallery	2014-05-20 08:26:55 +02:00
Jenkins for ownCloud	50da978c29	[tx-robot] updated from transifex	2014-05-20 01:13:35 -04:00
David A. Velasco	0004e39023	Removed not working file sync option in gallery	2014-05-19 15:18:13 +02:00
masensio	81fd95ad6f	Merge pull request #495 from owncloud/fixed_loading_dialog_dismissed_on_rotation ... Fixed loading dialog dismissed on rotation	2014-05-19 13:31:37 +02:00
David A. Velasco	8d6f908bde	REAL New fix for loading dialog never disapearing when app is restarted after going with HOME while loading	2014-05-19 13:20:52 +02:00
masensio	ee53304947	Fix: Menu is not refreshed on the gallery view	2014-05-19 12:43:50 +02:00