25786 commits

This branch

This branch

All branches

Author	SHA1	Message	Date
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
masensio	0a7d508f92	Merge branch 'master' into saml_based_federated_single_sign_on	2013-08-26 10:19:37 +02:00
masensio	f8d6d882b0	Merge branch 'master' into develop	2013-08-26 10:19:02 +02:00
Jenkins for ownCloud	112cc0f80c	[tx-robot] updated from transifex	2013-08-23 19:12:48 -04:00
masensio	2948f1053e	OC-922: Synchronize folder, refresh folder size	2013-08-23 14:53:07 +02:00
David A. Velasco	dc02769e49	Merge branch 'saml_based_federated_single_sign_on' into saml_based_federated_single_sign_on_expired	2013-08-23 14:37:14 +02:00
David A. Velasco	43660cb8bd	Merge remote-tracking branch 'origin/saml_based_federated_single_sign_on_expired' into saml_based_federated_single_sign_on_expired	2013-08-23 14:33:23 +02:00
David A. Velasco	ea5cd96679	Merge remote-tracking branch 'origin/saml_based_federated_single_sign_on' into saml_based_federated_single_sign_on	2013-08-23 14:32:03 +02:00
David A. Velasco	2b1b98478b	Added handler to trigger server check when the background is touched in login view for SSO login	2013-08-23 14:31:17 +02:00
masensio	71347b48a0	Merge branch 'saml_based_federated_single_sign_on' into saml_based_federated_single_sign_on_expired ... Conflicts: src/com/owncloud/android/ui/dialog/SamlWebViewDialog.java	2013-08-23 13:42:07 +02:00
masensio	3072a29730	OC-1055: Remove follow instruction.	2013-08-23 13:28:02 +02:00
masensio	92c4528bdf	Merge remote-tracking branch 'origin/saml_based_federated_single_sign_on' into saml_based_federated_single_sign_on	2013-08-23 09:11:42 +02:00
masensio	913a74d9f8	Merge remote-tracking branch 'origin' into saml_based_federated_single_sign_on	2013-08-23 09:09:40 +02:00
David A. Velasco	8aa08be870	Merge branch 'saml_based_federated_single_sign_on' into saml_based_federated_single_sign_on_expired	2013-08-23 09:08:51 +02:00
David A. Velasco	b04c3e2398	Fixed cookie policy	2013-08-22 19:30:01 +02:00
David A. Velasco	2dc5cc57f1	Fixed condition to determine expiration of SAML SSO	2013-08-22 19:25:15 +02:00
David A. Velasco	e04f25735a	Fixed cookie policy	2013-08-22 19:24:51 +02:00
masensio	472b360675	OC-922: Refresh of folder	2013-08-22 19:11:30 +02:00
David A. Velasco	b2f18e0f12	Avoid that a user can recover an expirated SAML session with a different userid than the used to create it	2013-08-22 19:03:21 +02:00
David A. Velasco	316a0a12ad	Merge branch 'saml_based_federated_single_sign_on' into saml_based_federated_single_sign_on_expired	2013-08-22 17:50:11 +02:00