1052 commits

This branch

This branch

All branches

Author	SHA1	Message	Date
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
masensio	b6020228c8	Changes from comments of PR #270	2013-10-01 14:33:40 +02:00
masensio	df394c71be	OC-1507- Reopened. Browse up <	2013-10-01 13:43:52 +02:00
masensio	5ff0989eb4	Merge remote-tracking branch 'origin/develop' into refresh_folder_contents_when_browsed_into	2013-10-01 12:58:17 +02:00
masensio	a8fade7369	OC-1508: App crashes when changing the orientation	2013-10-01 12:56:28 +02:00
David A. Velasco	abd0dfd385	Fixed URL encoding in check of existence	2013-10-01 09:02:07 +02:00
David A. Velasco	01a4676beb	Merge branch 'develop' into fix_instant_uploads_in_Samsung_4.x_devices	2013-09-30 13:49:50 +02:00
masensio	8b13784522	Merge pull request #266 from owncloud/fix_fake_creation_of_InstantUploads_folder_when_app_is_offline ... Fix fake creation of instant uploads folder when app is offline	2013-09-30 04:46:42 -07:00
David A. Velasco	dabd24c985	Recover name of instant_uploads table	2013-09-30 13:29:18 +02:00
masensio	47d115d75a	Change the loop mChildren update to the previous version	2013-09-30 10:28:03 +02:00
David A. Velasco	ea26ae4349	Check and creation for InstantUploads folder fixed and rewritten	2013-09-27 14:34:43 +02:00
masensio	9aa8babbe2	OC-1507: When you browse up, < is shown all the time in the top bar	2013-09-27 14:33:57 +02:00
masensio	ef78e58fed	Add a log and a comment	2013-09-27 12:42:34 +02:00
masensio	da6683e2be	OC-1470: Remove condition to ignore android.hardware.action.NEW_PICTURE events in devices with version >= 4.0	2013-09-26 18:33:27 +02:00
masensio	aaf8043d0c	OC-1230: app doesn't show the folders structure correct for a while. Improve Sync Proccess	2013-09-25 18:38:17 +02:00
masensio	fdf2cae2ce	Merge branch 'develop' into refresh_folder_contents_when_browsed_into	2013-09-24 14:57:45 +02:00
David A. Velasco	292870c300	Merge pull request #263 from owncloud/fix_loading_dialog_crash ... Fix loading dialog crash	2013-09-24 05:56:18 -07:00
masensio	e2e1e62e45	Changes from comments of PR	2013-09-24 14:54:46 +02:00
masensio	c77919b96c	Merge branch 'develop' into refresh_folder_contents_when_browsed_into	2013-09-24 14:29:18 +02:00
masensio	4811eb4f57	Merge branch 'develop' into fix_loading_dialog_crash	2013-09-24 14:22:07 +02:00
David A. Velasco	ab6b82750e	Merge pull request #234 from LukeOwncloud/develop ... More detailed compile instructions	2013-09-24 02:26:54 -07:00
masensio	801475b924	OC-1388: Refresh	2013-09-23 15:00:34 +02:00
masensio	0c4adf5134	Merge branch 'develop' into fix_loading_dialog_crash	2013-09-23 09:06:37 +02:00
masensio	8fef772af4	OC-1380: Fix Start Synchroniztion fails	2013-09-20 11:39:50 +02:00
masensio	d6267698e8	Merge branch 'develop' into refresh_folder_contents_when_browsed_into ... Conflicts: src/com/owncloud/android/operations/SynchronizeFolderOperation.java	2013-09-20 10:19:44 +02:00
masensio	b884276998	OC-1130: Change the old dialog by the new dialog.	2013-09-19 13:29:25 +02:00
masensio	b9c7b92940	OC-1129: Add LoadingDialog.java	2013-09-18 18:13:24 +02:00
masensio	31615a24ce	OC-1250: Fix bug - App crashes when you enter in an account with a lot of files	2013-09-18 16:12:58 +02:00
masensio	68d4c74fda	OC-1321: fix renaming problem: parent and children	2013-09-16 10:54:20 +02:00
masensio	0b42b7b01f	Update version number to 1.4.5 and 1.0.6(wa_jb)	2013-09-12 18:20:21 +02:00
masensio	776c6f1ffd	OC-1230	2013-09-11 09:08:21 +02:00
masensio	63a2392cf0	OC-1128: Create new layout for loading dialog	2013-09-10 10:45:00 +02:00
masensio	e0b1e23e45	OC-1194: Adapt Sync Process using etag	2013-09-09 14:42:06 +02:00
masensio	eaa17eb429	OC-1196 OC-1195: Obtain etag from de Server and save it	2013-09-05 13:06:00 +02:00
masensio	0d81994506	OC-1193:Add etag to DB	2013-09-05 09:20:58 +02:00
masensio	50067ee42b	Fix bug: When you browses up, the folder and files dissapears	2013-09-04 10:25:27 +02:00
masensio	fe9354ef5c	OC-265:Fix Situation when renaming a folder does not work correctly	2013-08-29 13:02:16 +02:00
masensio	52500fac9a	Set SSO flag to OFF	2013-08-27 14:58:56 +02:00
masensio	cfa974db49	Merge pull request #250 from owncloud/saml_based_federated_single_sign_on_expired ... Saml based federated single sign on expired	2013-08-27 05:44:58 -07:00
masensio	a6a56bae2a	Merge pull request #249 from owncloud/saml_based_federated_single_sign_on ... Saml based federated single sign on	2013-08-27 05:44:12 -07:00
masensio	ce1e0c210a	Merge branch 'saml_based_federated_single_sign_on' into saml_based_federated_single_sign_on_expired	2013-08-27 13:49:31 +02:00
masensio	11389ddeb2	OC-1080: Message 'Server does not support this authentication method' should be there although orientation of the device is changed	2013-08-27 13:48:44 +02:00
masensio	4047c62527	OC-1079: Use isIdPRedirection	2013-08-27 12:32:52 +02:00
masensio	da77406209	Merge branch 'saml_based_federated_single_sign_on' into saml_based_federated_single_sign_on_expired ... Conflicts: src/com/owncloud/android/authentication/AuthenticatorActivity.java	2013-08-27 12:15:06 +02:00
masensio	46674d32fe	OC-1078: Use isIdPRedirection	2013-08-27 12:10:47 +02:00
masensio	eb437200aa	Merge branch 'saml_based_federated_single_sign_on' into saml_based_federated_single_sign_on_expired	2013-08-27 11:39:26 +02:00
masensio	e7d9114859	OC-1075: message 'This authenticated method is not supported', should be shown when need it.	2013-08-27 11:38:03 +02:00
masensio	5066193e58	Merge branch 'master' into saml_based_federated_single_sign_on_expired	2013-08-26 10:20:59 +02:00