masensio
|
5ff0989eb4
|
Merge remote-tracking branch 'origin/develop' into refresh_folder_contents_when_browsed_into
|
2013-10-01 12:58:17 +02:00 |
|
masensio
|
a8fade7369
|
OC-1508: App crashes when changing the orientation
|
2013-10-01 12:56:28 +02:00 |
|
David A. Velasco
|
dabd24c985
|
Recover name of instant_uploads table
|
2013-09-30 13:29:18 +02:00 |
|
masensio
|
47d115d75a
|
Change the loop mChildren update to the previous version
|
2013-09-30 10:28:03 +02:00 |
|
David A. Velasco
|
ea26ae4349
|
Check and creation for InstantUploads folder fixed and rewritten
|
2013-09-27 14:34:43 +02:00 |
|
masensio
|
9aa8babbe2
|
OC-1507: When you browse up, < is shown all the time in the top bar
|
2013-09-27 14:33:57 +02:00 |
|
masensio
|
aaf8043d0c
|
OC-1230: app doesn't show the folders structure correct for a while. Improve Sync Proccess
|
2013-09-25 18:38:17 +02:00 |
|
masensio
|
fdf2cae2ce
|
Merge branch 'develop' into refresh_folder_contents_when_browsed_into
|
2013-09-24 14:57:45 +02:00 |
|
masensio
|
e2e1e62e45
|
Changes from comments of PR
|
2013-09-24 14:54:46 +02: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
|
776c6f1ffd
|
OC-1230
|
2013-09-11 09:08:21 +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
|
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
|
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
|
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 |
|
David A. Velasco
|
2dc5cc57f1
|
Fixed condition to determine expiration of SAML SSO
|
2013-08-22 19:25:15 +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 |
|
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
|
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 |
|