Commit graph

367 commits

Author SHA1 Message Date
David A. Velasco
ab3bcf6fe6 Exit the current folder when not existing in the server any more 2013-10-02 16:52:36 +02:00
masensio
b9c7b92940 OC-1129: Add LoadingDialog.java 2013-09-18 18:13:24 +02:00
masensio
63a2392cf0 OC-1128: Create new layout for loading dialog 2013-09-10 10:45:00 +02:00
masensio
52500fac9a Set SSO flag to OFF 2013-08-27 14:58:56 +02:00
masensio
5066193e58 Merge branch 'master' into saml_based_federated_single_sign_on_expired 2013-08-26 10:20:59 +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
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
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
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
David A. Velasco
37297fb7a9 Fixed orientation changes in SSO dialog with WebView 2013-08-21 18:51:13 +02:00
Jenkins for ownCloud
20afb728fe [tx-robot] updated from transifex 2013-08-21 07:08:27 -04: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
David A. Velasco
54679a521d Merge branch 'develop' into sso_bug_changing_orientation 2013-08-17 10:52:03 +02:00
Jenkins for ownCloud
ca98430f90 [tx-robot] updated from transifex 2013-08-15 16:57:14 -04:00
masensio
b458c92be0 Update server-url 2013-08-14 09:15: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
9dacdbec0b Move WebView to Dialog 2013-08-13 12:08:46 +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
Jenkins for ownCloud
3420444dff [tx-robot] updated from transifex 2013-08-03 01:14:29 -04:00
David A. Velasco
5ede3e9909 Improved status messages for authentication through SAML-based federated SSO 2013-08-01 17:44:23 +02:00
Jenkins for ownCloud
938e091dd8 [tx-robot] updated from transifex 2013-08-01 01:15:28 -04:00
Jenkins for ownCloud
c4b842f8ac [tx-robot] updated from transifex 2013-07-31 01:15:26 -04:00
David A. Velasco
d2ee9062fa Configured embedded WebView to allow the single-sign-on process is completed and to catch the cookie setting the authorized session 2013-07-30 13:02:13 +02:00
Jenkins for ownCloud
4d167731ea [tx-robot] updated from transifex 2013-07-30 01:14:15 -04:00
Jenkins for ownCloud
2ae677d7b3 [tx-robot] updated from transifex 2013-07-28 01:15:01 -04:00
Jenkins for ownCloud
cf18fbfad2 [tx-robot] updated from transifex 2013-07-27 01:15:00 -04:00
David A. Velasco
5a65ff53c2 AuthenticatorActivity updated to test existance through SAML-based-federated-authenticated entry point 2013-07-26 13:05:01 +02:00
David A. Velasco
0713ba613d Added SAML-based Web Single-Sign-On as new authentication method available in pre-build configuration 2013-07-25 17:29:52 +02:00
Jenkins for ownCloud
c4bf28b2c6 [tx-robot] updated from transifex 2013-07-22 01:19:06 -04:00
Jenkins for ownCloud
648ac49687 [tx-robot] updated from transifex 2013-07-20 01:20:01 -04:00
Jenkins for ownCloud
e2cd4e4d3d [tx-robot] updated from transifex 2013-07-19 01:20:04 -04:00
Jenkins for ownCloud
b87ba76545 [tx-robot] updated from transifex 2013-07-18 01:24:50 -04:00
Jenkins for ownCloud
3ef6bce0c6 [tx-robot] updated from transifex 2013-07-17 02:14:46 -04:00
masensio
c7188eb833 Merge branch 'master' into release-1.4.2 2013-07-16 09:05:34 +02:00
Jenkins for ownCloud
e3a1fb510d [tx-robot] updated from transifex 2013-07-15 17:07:21 -04:00
Jenkins for ownCloud
e33c118195 [tx-robot] updated from transifex 2013-07-14 01:14:27 +02:00