masensio
|
31f6e61f89
|
Merge branch 'setup_multiaccount' into setup_app_name
Conflicts:
res/values/setup.xml
src/com/owncloud/android/authentication/AccountAuthenticator.java
|
2013-10-18 12:32:22 +02:00 |
|
masensio
|
ea7f8fe491
|
Merge branch 'setup_colors' into setup_app_name
|
2013-10-18 12:24:29 +02:00 |
|
masensio
|
7488345470
|
OC-1663: Replace references to app_name in code
|
2013-10-17 16:54:43 +02:00 |
|
masensio
|
5b8a5718cf
|
OC-1662: app_name to setup.xml
|
2013-10-16 09:37:28 +02:00 |
|
masensio
|
152ab88d90
|
OC-1668: Block creation of account from device settings
|
2013-10-15 11:32:46 +02:00 |
|
masensio
|
9fcc118b8a
|
0C-1647: Enable/Disable Create Account option
|
2013-10-14 13:39:22 +02:00 |
|
masensio
|
76ed9aa72e
|
OC-1646: Adding multiaccount_support property
|
2013-10-14 12:55:21 +02:00 |
|
masensio
|
1809997dc1
|
OC-1671: ActionBar Color
|
2013-10-11 15:14:41 +02:00 |
|
masensio
|
b78eb416a4
|
OC-1670: owncloud_white --> background_color
|
2013-10-11 15:08:32 +02:00 |
|
masensio
|
52500fac9a
|
Set SSO flag to OFF
|
2013-08-27 14:58:56 +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 |
|
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
|
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 |
|
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 |
|
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 |
|
David A. Velasco
|
5ede3e9909
|
Improved status messages for authentication through SAML-based federated SSO
|
2013-08-01 17:44:23 +02: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 |
|
David A. Velasco
|
c593c1ecb9
|
Fixed default value of parameters for URL-input visibility
|
2013-07-09 10:19:47 +02:00 |
|
David A. Velasco
|
233533faa3
|
Merge branch 'develop' into branding_configurable_URL_input_field
|
2013-07-05 11:52:24 +02:00 |
|
David A. Velasco
|
dcbc08cae7
|
Merge branch 'develop' into check_account_existance_in_gallery
|
2013-07-03 10:06:37 +02:00 |
|
David A. Velasco
|
e8239f434a
|
Merge branch 'develop' into modify_password
|
2013-07-02 13:08:27 +02:00 |
|
David A. Velasco
|
5b792b0440
|
Merge branch 'develop' into check_account_existance_in_gallery
|
2013-06-28 11:58:43 +02:00 |
|
masensio
|
b52f0484b4
|
OC-461: Add check server button. OC-394
|
2013-06-26 18:50:08 +02:00 |
|
masensio
|
dcc0461a7d
|
OC-459:new string server_url, new bool show_server_url_input. OC-394
|
2013-06-25 11:00:19 +02:00 |
|
masensio
|
6436606c1c
|
OC-458: new branding.xml. OC-394
|
2013-06-25 10:19:19 +02:00 |
|
David A. Velasco
|
7c1be6db3e
|
Updated some messages in login activity
|
2013-06-24 10:59:11 +02:00 |
|
David A. Velasco
|
1019dfc34d
|
Added new contextual option in account list to allow the user modify the password
|
2013-06-21 13:10:13 +02:00 |
|
David A. Velasco
|
63a3522ab7
|
Merge branch 'develop'after SPRINT-002
Conflicts:
.classpath
|
2013-06-19 17:56:46 +02:00 |
|
David A. Velasco
|
d612f37de4
|
'Refresh' options in menus differentiated: 'refresh file' and 'refresh account'
|
2013-06-18 15:04:45 +02:00 |
|
David A. Velasco
|
3ecabe3ea7
|
PreviewVideoActivity protected against access to non-exiting account
|
2013-06-14 16:59:38 +02:00 |
|
David A. Velasco
|
5bd3fd6273
|
Fixed bad replace tokens and removed unnecessary quote
|
2013-06-12 09:36:38 +02:00 |
|
David A. Velasco
|
c70f333358
|
REFACTORING: fix layout problems in orientation changes after removing FileDetailActivity
|
2013-06-04 14:30:29 +02:00 |
|
David A. Velasco
|
f767bf3f01
|
Non-previewable file is opened after successful donwload
|
2013-05-28 13:11:57 +02:00 |
|
David A. Velasco
|
50d77e8dc8
|
Review of login view layout optimizing the adaption to different screen sizes
|
2013-05-10 16:35:01 +02:00 |
|
David A. Velasco
|
1ee5b70d94
|
Generic values for Oauth 2 configuration
|
2013-05-03 13:30:35 +02:00 |
|
David A. Velasco
|
9b4da8439a
|
Merge branch 'develop' into oauth_login
Conflicts:
res/layout-land/account_setup.xml
res/layout/account_setup.xml
|
2013-05-03 10:24:20 +02:00 |
|
zerginator
|
2acbe9455d
|
Issue #56 + Issue #14 + Issue #143
|
2013-05-01 21:34:13 +02:00 |
|
David A. Velasco
|
2946d8dd69
|
Merge branch 'develop' into oauth_login
Conflicts:
AndroidManifest.xml
res/values/strings.xml
src/com/owncloud/android/Uploader.java
src/com/owncloud/android/authentication/AccountAuthenticator.java
src/com/owncloud/android/authenticator/AuthenticationRunnable.java
src/com/owncloud/android/authenticator/OnAuthenticationResultListener.java
src/com/owncloud/android/authenticator/OnConnectCheckListener.java
src/com/owncloud/android/files/InstantUploadBroadcastReceiver.java
src/com/owncloud/android/files/services/FileDownloader.java
src/com/owncloud/android/files/services/FileOperation.java
src/com/owncloud/android/files/services/FileUploader.java
src/com/owncloud/android/network/OwnCloudClientUtils.java
src/com/owncloud/android/operations/RemoteOperationResult.java
src/com/owncloud/android/operations/UpdateOCVersionOperation.java
src/com/owncloud/android/syncadapter/FileSyncAdapter.java
src/com/owncloud/android/ui/activity/AccountSelectActivity.java
src/com/owncloud/android/ui/activity/AuthenticatorActivity.java
src/com/owncloud/android/ui/activity/FileDisplayActivity.java
src/com/owncloud/android/ui/fragment/FileDetailFragment.java
src/eu/alefzero/webdav/WebdavClient.java
|
2013-04-25 19:39:22 +02:00 |
|
David A. Velasco
|
bdc0332c23
|
Copyright note fixes
|
2013-04-17 12:26:13 +02:00 |
|
David A. Velasco
|
7052e3b5b8
|
About in settings, more i18n-friendly
|
2013-04-15 13:45:20 +02:00 |
|
David A. Velasco
|
c3ca5b5a4f
|
Merge branch 'develop' into loggingtool
Conflicts:
AndroidManifest.xml
res/menu/main_menu.xml
src/com/owncloud/android/datamodel/OCFile.java
src/com/owncloud/android/files/services/FileDownloader.java
src/com/owncloud/android/files/services/InstantUploadService.java
src/com/owncloud/android/operations/SynchronizeFileOperation.java
src/com/owncloud/android/operations/UploadFileOperation.java
src/com/owncloud/android/ui/activity/FileDetailActivity.java
src/com/owncloud/android/ui/activity/FileDisplayActivity.java
src/com/owncloud/android/ui/activity/UploadFilesActivity.java
src/com/owncloud/android/ui/fragment/FileDetailFragment.java
src/com/owncloud/android/ui/fragment/OCFileListFragment.java
src/eu/alefzero/webdav/ChunkFromFileChannelRequestEntity.java
src/eu/alefzero/webdav/FileRequestEntity.java
src/eu/alefzero/webdav/WebdavClient.java
|
2013-04-15 13:12:04 +02:00 |
|
David A. Velasco
|
053aad5ae1
|
Merge branch 'bug_hunting' into feature_previews
Conflicts:
src/com/owncloud/android/ui/activity/FileDisplayActivity.java
|
2013-04-04 16:49:04 +02:00 |
|