1154 commits

This branch

This branch

All branches

Author	SHA1	Message	Date
masensio	ea7f8fe491	Merge branch 'setup_colors' into setup_app_name	2013-10-18 12:24:29 +02:00
masensio	bf21e3f026	update strings to transifex	2013-10-18 12:17:37 +02:00
masensio	194a7360f8	Merge branch 'develop' into release-1.4.6	2013-10-18 10:33:26 +02:00
masensio	881727f050	Merge pull request #278 from owncloud/fix_synchronization_after_addition_of_infinite_propfind_in_server ... Added depth parameters to ervery PROPFIND method	2013-10-18 01:31:48 -07:00
David A. Velasco	db026d8a91	Added depth parameters to ervery PROPFIND method	2013-10-18 10:22:16 +02:00
masensio	2b5c567938	Delete maxSdkVersion=17 for workaround	2013-10-18 10:15:55 +02:00
David A. Velasco	8bd6f85e22	Fixed update of size in folders when browsing down and up through new folders in servers	2013-10-18 10:08:24 +02:00
masensio	6d17810140	Update serialVersionUIDs and version name/number	2013-10-18 09:01:17 +02:00
masensio	91e50a97a5	Merge branch 'transifex' into setup_app_name ... Conflicts: res/values-ko/strings.xml res/values-lt-rLT/strings.xml res/values-tr/strings.xml	2013-10-17 18:20:38 +02:00
masensio	dc70f9e890	Update transifex strings	2013-10-17 18:07:13 +02:00
masensio	7488345470	OC-1663: Replace references to app_name in code	2013-10-17 16:54:43 +02:00
masensio	db1ea01561	Merge pull request #268 from owncloud/fix_fails_in_uploads_after_fall_and_rise_of_network_connection ... Fix fails in uploads after fall and rise of network connection	2013-10-16 05:26:02 -07:00
David A. Velasco	af62f9857d	Refactoring FileContentProvider and FileDataStorageManager: deletion of subfolders in provider & transactions on database connection	2013-10-16 13:04:49 +02:00
masensio	5b8a5718cf	OC-1662: app_name to setup.xml	2013-10-16 09:37:28 +02:00
masensio	9681b8687e	OC-1656: Disable/enable help-imprint-feedback options	2013-10-16 08:56:41 +02:00
masensio	066cd5aab3	Merge branch 'develop' into contact_settings ... Conflicts: res/values/strings.xml	2013-10-15 14:07:59 +02:00
masensio	e4eabcb502	OC-1730: Update Images	2013-10-15 13:26:20 +02:00
masensio	152ab88d90	OC-1668: Block creation of account from device settings	2013-10-15 11:32:46 +02:00
David A. Velasco	47b7a164de	Merge remote-tracking branch 'origin/refresh_folder_contents_when_browsed_into' into refresh_folder_contents_when_browsed_into	2013-10-14 14:55:50 +02:00
masensio	9fcc118b8a	0C-1647: Enable/Disable Create Account option	2013-10-14 13:39:22 +02:00
David A. Velasco	d8de614d78	Some cleanup and methods renamed in FileDataStorageManager	2013-10-14 13:00:49 +02:00
masensio	76ed9aa72e	OC-1646: Adding multiaccount_support property	2013-10-14 12:55:21 +02:00
masensio	98d95b576e	OC-1701: Conflict detected in keep-in-sync	2013-10-14 12:48:26 +02:00
David A. Velasco	5b8731873e	Removed interface DataStorageManager	2013-10-14 12:33:19 +02:00
masensio	1809997dc1	OC-1671: ActionBar Color	2013-10-11 15:14:41 +02:00
masensio	b78eb416a4	OC-1670: owncloud_white --> background_color	2013-10-11 15:08:32 +02:00
masensio	10d1efa18d	OC-1580: Cancel upload	2013-10-11 14:54:40 +02:00
masensio	2694ac00c6	Merge remote-tracking branch 'origin/release-1.4.6' into release-1.4.6	2013-10-11 14:54:13 +02:00
David A. Velasco	552a34689c	Avoid occasional crash in app updates due to 'lost' events from previous synchronizations	2013-10-11 10:50:11 +02:00
David A. Velasco	31ccf4e966	Improved navitagation through navigation list, reducing the number of requests to the server to refresh the target folder	2013-10-09 10:17:21 +02:00
David A. Velasco	ec85b4225e	The app goes directly to root folder when the current folder does not exist anymore after refreshing with server	2013-10-08 15:06:20 +02:00
David A. Velasco	7d51200291	Merge branch 'develop' into release-1.4.6	2013-10-08 11:28:57 +02:00
David A. Velasco	79493448d9	Included name of the 'lost' folder in the toast warning about current folder removed in the server	2013-10-08 11:24:15 +02:00
David A. Velasco	fc2baec2f6	Fixed search of an existing current folder when the activity detects that the current folder does not exist any more	2013-10-08 11:17:20 +02:00
David A. Velasco	0aef684087	Fixed some crashes in refresh of current folder	2013-10-08 09:19:52 +02:00
David A. Velasco	d7c4d12485	Merge branch 'develop' into refresh_folder_contents_when_browsed_into	2013-10-08 08:52:14 +02:00
masensio	d4a020e338	Merge branch 'develop' into release-1.4.6	2013-10-07 14:36:43 +02:00
masensio	a67a6766a6	Merge pull request #267 from owncloud/fixed_permanent_redirections ... Fixed permanent redirections	2013-10-07 05:03:41 -07:00
David A. Velasco	8abfe39821	Removed useless log	2013-10-07 14:00:02 +02:00
David A. Velasco	d9f42d500c	Prevent double count of transfer progress when part of an upload is resend	2013-10-07 12:01:15 +02:00
masensio	72e54bf983	OC-1591: Update Error Message	2013-10-07 10:51:52 +02:00
David A. Velasco	23c9be24a2	Clean up of synchronization code	2013-10-04 15:07:05 +02:00
David A. Velasco	3ffc515f42	Merge branch 'develop' into fixed_permanent_redirections	2013-10-03 12:39:54 +02:00
David A. Velasco	8a27bf186a	Merge branch 'fixed_permanent_redirections' into refresh_folder_contents_when_browsed_into	2013-10-03 12:38:09 +02:00
David A. Velasco	86f7f0cc3c	Fixed units in media control view	2013-10-02 18:19:20 +02:00
David A. Velasco	74370d5dee	Exit the current folder when not existing in the server any more (2)	2013-10-02 18:08:01 +02:00
David A. Velasco	ab3bcf6fe6	Exit the current folder when not existing in the server any more	2013-10-02 16:52:36 +02:00
David A. Velasco	7c3fad35a3	Fixed behaviour when user enters in a folder deleted in the server before the app finishes to synchronize	2013-10-02 10:40:03 +02:00
David A. Velasco	9c03c10790	Merge branch 'develop' into refresh_folder_contents_when_browsed_into	2013-10-02 09:29:59 +02:00
David A. Velasco	99fb630273	Merge pull request #270 from owncloud/fix_instant_uploads_in_Samsung_4.x_devices ... Fix instant uploads in samsung 4.x devices	2013-10-01 05:39:27 -07:00