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 |
|
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 |
|
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 |
|
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 |
|