Commit graph

25786 commits

Author SHA1 Message Date
David A. Velasco
d7c6472bd3 Added check to avoid the creation of the same account (same oc_username in the same server) more than once 2013-08-22 17:38:26 +02:00
masensio
dea37f653c Merge branch 'saml_based_federated_single_sign_on' into saml_based_federated_single_sign_on_expired
Conflicts:
	res/values-es/strings.xml
	src/com/owncloud/android/operations/SynchronizeFolderOperation.java
2013-08-22 12:59:56 +02:00
masensio
540d4e87b9 Merge pull request #246 from owncloud/sso_bug_changing_orientation
Fixed bugs when changing orientation in single-sign-on dialog.
2013-08-22 03:25:36 -07:00
David A. Velasco
b6213a0d5f Fixed comments in PR#246 2013-08-22 11:48:57 +02:00
David A. Velasco
f67af8fd64 Merge branch 'saml_based_federated_single_sign_on' into sso_bug_changing_orientation 2013-08-21 18:56:19 +02:00
David A. Velasco
37297fb7a9 Fixed orientation changes in SSO dialog with WebView 2013-08-21 18:51:13 +02:00
masensio
7ed9e80013 OC-1029: add method isIdPRedirection 2013-08-21 18:31:57 +02:00
masensio
4dd5a5eab0 Merge remote-tracking branch 'origin/saml_based_federated_single_sign_on' into saml_based_federated_single_sign_on 2013-08-21 18:24:52 +02:00
masensio
9724afda5d OC-1028: add extra condition to check of redirection. New method isIdPRedirection at RemoteOperationResult 2013-08-21 18:12:28 +02:00
masensio
10f832498d OC-1029: add an extra condition to check of redirection. Check if LocationUrl contains SAML or wayf 2013-08-21 17:53:12 +02:00
masensio
68de068092 added webSettings.setSaveFormData(false) on Saml Dialog 2013-08-21 16:16:21 +02:00
Jenkins for ownCloud
20afb728fe [tx-robot] updated from transifex 2013-08-21 07:08:27 -04:00
masensio
75eab3de5a OC-1024: Show update credentials for uploads, when session is expired 2013-08-21 12:45:07 +02:00
masensio
31e83e17e4 refresh account when session expires 2013-08-20 11:02:17 +02:00
Jenkins for ownCloud
05eac46979 [tx-robot] updated from transifex 2013-08-19 14:03:43 -04:00
masensio
62e72ab303 Update string: auth_expired_saml_sso_token_toast 2013-08-18 17:32:32 +02:00
masensio
3f9774994c update strings.xml 2013-08-17 19:02:43 +02:00
masensio
2d36f5a564 message 'Session expires' in TextView instead of Toast 2013-08-17 18:39:05 +02:00
masensio
adcdc964c7 Merge pull request #241 from owncloud/sso_bug_changing_orientation
Fixed bug when changing orientation in SSO dialog
2013-08-17 04:28:39 -07:00
David A. Velasco
c88843916e Forms are resubmitted to grant correct recovery of SSO dialog when device orientation is changed after a bad login 2013-08-17 12:56:29 +02:00
David A. Velasco
54679a521d Merge branch 'develop' into sso_bug_changing_orientation 2013-08-17 10:52:03 +02:00
masensio
595f9b8ecd Merge remote-tracking branch 'origin/saml_based_federated_single_sign_on_expired' into saml_based_federated_single_sign_on_expired 2013-08-17 10:33:00 +02:00
David A. Velasco
782a38646d Merge branch 'master' into develop 2013-08-17 10:24:42 +02:00
David A. Velasco
e6b27a24c2 Merge remote-tracking branch 'origin/develop' into develop 2013-08-17 10:24:29 +02:00
masensio
60947d737c Merge branch 'saml_based_federated_single_sign_on' into saml_based_federated_single_sign_on_expired 2013-08-16 18:37:17 +02:00
David A. Velasco
710e976366 Merge pull request #235 from owncloud/fixed_instant_uploads_for_greater_4.0
Fixed instant upload of new pictures for Android 4.0 and greater.
2013-08-16 08:59:04 -07:00
Jenkins for ownCloud
ca98430f90 [tx-robot] updated from transifex 2013-08-15 16:57:14 -04:00
David A. Velasco
503743fa0d Merge remote-tracking branch 'origin/saml_based_federated_single_sign_on_for_any_operation' into saml_based_federated_single_sign_on_expired 2013-08-14 17:17:21 +02:00
David A. Velasco
ebd6888ed1 Merge remote-tracking branch 'origin/saml_based_federated_single_sign_on' into saml_based_federated_single_sign_on_expired 2013-08-14 17:16:42 +02:00
masensio
b458c92be0 Update server-url 2013-08-14 09:15:47 +02:00
masensio
8a2910a0ac Update server-url 2013-08-14 09:13:47 +02:00
masensio
1cb6b12869 Update server-url 2013-08-14 09:10:31 +02:00
Jenkins for ownCloud
5ee605ead5 [tx-robot] updated from transifex 2013-08-13 08:08:53 -04:00
masensio
55f2bd23e6 Move Shibboleth WebView to a big Dialog 2013-08-13 13:28:45 +02:00
masensio
9dacdbec0b Move WebView to Dialog 2013-08-13 12:08:46 +02:00
David A. Velasco
830bb7c853 Merge branch 'saml_based_federated_single_sign_on' into saml_based_federated_single_sign_on_expired 2013-08-12 13:21:01 +02:00
David A. Velasco
23a1ea68e0 Foreground operations on files (remove, rename, new folder) failed due to SAML SSO session expired redirect the app to the login view for a new authentication 2013-08-12 13:16:43 +02:00
David A. Velasco
dd9fe3e572 Fixed state of embedded web view for creation of second and later accounts, and for orientation changes 2013-08-12 12:55:01 +02:00
David A. Velasco
68df3cbfe7 Expiration of SSO session is detected in background operations (download, upload, sync account) and error notification lets the user access to the login view 2013-08-12 11:34:09 +02:00
Jenkins for ownCloud
56cf5d5467 [tx-robot] updated from transifex 2013-08-09 06:57:46 -04:00
David A. Velasco
78bcf72188 Foreground operations on files (remove, rename, new folder) failed due to SAML SSO session expired redirect the app to the login view for a new authentication 2013-08-07 19:13:00 +02:00
Jenkins for ownCloud
c66121a9e0 [tx-robot] updated from transifex 2013-08-07 07:58:05 -04:00
masensio
733206c54c OC-170. Add condition about android version when capturing the action com.android.camera.NEW_PICTURE 2013-08-07 12:10:00 +02:00
Luke Owncloud
154f038a40 added howto for Eclipse 2013-08-06 14:42:42 +02:00
Luke Owncloud
fb9a226be6 mc 2013-08-06 13:46:53 +02:00
David A. Velasco
1f02143d99 Merge remote-tracking branch 'origin/develop' into develop 2013-08-06 12:17:52 +02:00
Luke Owncloud
c93b552db5 mc 2013-08-06 11:27:07 +02:00
Luke Owncloud
1b3c3a3ece added more detailed download and compile instructions.
fixed setup_env.bat
added target/ to .gitignore
2013-08-06 11:19:30 +02:00
Luke Owncloud
01cc23802f added official NEW_PICTURE receiver (supported by Android since SDK 14).
old (unofficial) receiver still works, as well.

this enables instant upload for all Android 4 devices (also HTC!) and has no effect on older devices.
2013-08-05 16:34:21 +02:00
Jenkins for ownCloud
3420444dff [tx-robot] updated from transifex 2013-08-03 01:14:29 -04:00