David A. Velasco
|
e1245bbda7
|
Merge branch 'develop' into refactor_remote_operation_to_create_folder
|
2013-11-18 14:10:16 +01:00 |
|
David A. Velasco
|
73849d822d
|
Add check of characters in file name before starting rename/createFolder operations
|
2013-11-18 14:10:11 +01:00 |
|
David A. Velasco
|
d7559f22a9
|
Removed obsolete quote
|
2013-11-18 08:54:29 +01:00 |
|
masensio
|
3ee1c51039
|
OC-2067: Adapt CreateRemoteFolderOperation, new class FileUtils.java. Try to create folder with invalid characters return an error message
|
2013-11-14 09:27:34 +01:00 |
|
David A. Velasco
|
4160e7e256
|
Merge branch 'develop' into clean_up
|
2013-10-28 10:11:40 +01:00 |
|
David A. Velasco
|
db87c22150
|
Merge branch 'develop' into refresh_folder_contents_when_browsed_into
|
2013-10-23 17:35:07 +02:00 |
|
David A. Velasco
|
f88f81e906
|
Replace 'ownCloud' with reference to app_name
|
2013-10-23 12:54:49 +02:00 |
|
David A. Velasco
|
d2b61f546d
|
Replace 'ownCloud' with reference to app_name
|
2013-10-23 12:48:55 +02:00 |
|
David A. Velasco
|
39cc0adf8d
|
Improved messages
|
2013-10-23 12:18:50 +02:00 |
|
David A. Velasco
|
5d6ba2495a
|
Removed unused code for ownCloud extensions and strings related
|
2013-10-23 11:15:44 +02:00 |
|
David A. Velasco
|
79aeef21a6
|
Removed unused code for tracking and related strings
|
2013-10-23 10:56:24 +02:00 |
|
David A. Velasco
|
fbcd392251
|
Removed unused landing page and strings related
|
2013-10-23 10:46:29 +02:00 |
|
David A. Velasco
|
fed7ee2d1a
|
Removed unreferenced string resources
|
2013-10-23 10:31:17 +02:00 |
|
masensio
|
b66e309dfa
|
Merge branch 'contact_settings' into setup_app_name
Conflicts:
res/values/setup.xml
|
2013-10-18 12:42:00 +02:00 |
|
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
|
5b8a5718cf
|
OC-1662: app_name to setup.xml
|
2013-10-16 09:37:28 +02:00 |
|
masensio
|
066cd5aab3
|
Merge branch 'develop' into contact_settings
Conflicts:
res/values/strings.xml
|
2013-10-15 14:07:59 +02:00 |
|
masensio
|
152ab88d90
|
OC-1668: Block creation of account from device settings
|
2013-10-15 11:32:46 +02:00 |
|
David A. Velasco
|
79493448d9
|
Included name of the 'lost' folder in the toast warning about current folder removed in the server
|
2013-10-08 11:24:15 +02:00 |
|
masensio
|
72e54bf983
|
OC-1591: Update Error Message
|
2013-10-07 10:51:52 +02:00 |
|
David A. Velasco
|
74370d5dee
|
Exit the current folder when not existing in the server any more (2)
|
2013-10-02 18:08:01 +02:00 |
|
David A. Velasco
|
ab3bcf6fe6
|
Exit the current folder when not existing in the server any more
|
2013-10-02 16:52:36 +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
|
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 |
|
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
|
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
|
233533faa3
|
Merge branch 'develop' into branding_configurable_URL_input_field
|
2013-07-05 11:52:24 +02:00 |
|
David A. Velasco
|
12bffce50c
|
Added help link, feedback email, recommendations through email, and (disabled) imprint link to app settings
|
2013-07-05 10:47:34 +02:00 |
|
David A. Velasco
|
e8239f434a
|
Merge branch 'develop' into modify_password
|
2013-07-02 13:08:27 +02:00 |
|
masensio
|
b52f0484b4
|
OC-461: Add check server button. OC-394
|
2013-06-26 18:50:08 +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
|
5bd3fd6273
|
Fixed bad replace tokens and removed unnecessary quote
|
2013-06-12 09:36:38 +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
|
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
|
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 |
|
David A. Velasco
|
77ddd1ccb6
|
Merge branch 'develop' into feature_previews
Conflicts:
AndroidManifest.xml
res/menu/file_context_menu.xml
res/menu/menu.xml
res/values-de-rDE/strings.xml
res/values/strings.xml
src/com/owncloud/android/files/services/FileUploader.java
src/com/owncloud/android/operations/UploadFileOperation.java
src/com/owncloud/android/ui/activity/FileDisplayActivity.java
|
2013-04-04 16:44:30 +02:00 |
|
zerginator
|
5a22c7e79f
|
Cleaned stuff , add a history delete button and renamed
Log2EmailActivity in LogHistoryActivity
|
2013-04-01 10:26:40 +02:00 |
|
David A. Velasco
|
97ae9007e4
|
Fixed hardcoded string in UploaderActivity layout; and German translations
|
2013-03-27 17:19:19 +01:00 |
|