jabarros
|
fb1a4bad59
|
Add message when LocalFileList and OCFileLIst are empty
|
2014-07-24 18:34:12 +02:00 |
|
jabarros
|
055be96386
|
Remove InstantUploadActivity and related resources
|
2014-07-14 08:40:16 +02:00 |
|
David A. Velasco
|
dacc14a882
|
Merge remote-tracking branch 'origin/develop' into add_cookie_based_session_support
|
2014-07-01 14:21:26 +02:00 |
|
David A. Velasco
|
1958964f56
|
Added lost string for previous commit
|
2014-06-26 11:33:51 +02:00 |
|
David A. Velasco
|
c266cccb23
|
Fixed lost pronoun
|
2014-06-24 14:51:39 +02:00 |
|
David A. Velasco
|
7c34300268
|
Improved message
|
2014-06-23 08:48:42 +02:00 |
|
masensio
|
9fa747d3d1
|
Update failed_upload_load_more_images string
|
2014-05-28 17:16:20 +02:00 |
|
David A. Velasco
|
4bb658fe88
|
Fixed typo in strings
|
2014-05-28 14:55:18 +02:00 |
|
masensio
|
a3a5cd4eb7
|
Merge branch 'develop' into release-1.5.6
|
2014-05-27 13:18:41 +02:00 |
|
masensio
|
ba1a428964
|
Modify strings: can not --> cannot, remove space before ?
|
2014-05-27 09:08:10 +02:00 |
|
masensio
|
bcab40c535
|
Use ErrorMessageAdapter to access the error string when an error in a finished foreground operation occurs
|
2014-05-26 14:56:51 +02:00 |
|
masensio
|
db43531874
|
Add specific message(s) for network error(s) in strings.xml
|
2014-05-26 13:00:22 +02:00 |
|
masensio
|
0a7f748902
|
Define strings for failes uploads/downloads with credentials errors
|
2014-05-23 09:40:09 +02:00 |
|
David A. Velasco
|
dfdc713a15
|
Created new dialog classes for file renaming and folder creations
|
2014-05-16 14:57:19 +02:00 |
|
David A. Velasco
|
68f4ceb5a7
|
Separate options to enable & disable instant upload of new pictures and new videos
|
2014-04-21 10:49:31 +02:00 |
|
masensio
|
3351db6527
|
Merge branch 'develop' into videoInstandUploads
|
2014-04-08 12:50:50 +02:00 |
|
David A. Velasco
|
5611205f1d
|
Merge branch 'develop' into operations_service
|
2014-04-03 11:27:44 +02:00 |
|
David A. Velasco
|
0024569aff
|
AuthenticatorActivity clean up: removed commented code and warnings
|
2014-04-02 12:46:54 +02:00 |
|
masensio
|
f7bc72f21d
|
Replace 'directory' by 'folder' in strings.xml
|
2014-03-31 10:36:56 +02:00 |
|
masensio
|
5f4b46015f
|
Update string: 'New folder' instead of 'Create directory'
|
2014-03-31 10:32:49 +02:00 |
|
David A. Velasco
|
565875d753
|
AuthenticatorActivity is bound to OperationsService when created
|
2014-03-28 12:55:07 +01:00 |
|
David A. Velasco
|
d2ff7d4755
|
Merge branch 'develop' into release-1.5.5
|
2014-03-24 10:23:05 +01:00 |
|
masensio
|
c6f0847866
|
Changes from comments in PR#443
|
2014-03-20 16:15:59 +01:00 |
|
masensio
|
b0cfec7a00
|
Add auth_unsupported_basic_auth string
|
2014-03-20 09:08:02 +01:00 |
|
masensio
|
a9c0d1c62b
|
Update auth_fail_get_user_name string
|
2014-03-19 10:31:18 +01:00 |
|
masensio
|
71e049394e
|
OC-3390: Shows message about 'not support authentication' under server address
|
2014-03-19 10:07:56 +01:00 |
|
masensio
|
d01e065586
|
OC-3261: Fix a problem when trying to detect the kind of authentication. Add new AlertMessageDialog. Show an alert message if it is necessary a different authentication method
|
2014-03-17 13:39:03 +01:00 |
|
masensio
|
41efad3804
|
Merge branch 'develop' into check_server_certificates_in_SSO_webview
|
2014-03-12 08:44:56 +01:00 |
|
masensio
|
207a52f422
|
OC-3242: Add new error message for fail in GetUserName. No changes in library reference
|
2014-03-11 14:43:48 +01:00 |
|
masensio
|
660f97baab
|
Revert "OC-3242: Add new error message for fail in GetUserName"
This reverts commit 564bbf7bb8.
|
2014-03-11 14:40:38 +01:00 |
|
masensio
|
564bbf7bb8
|
OC-3242: Add new error message for fail in GetUserName
|
2014-03-11 13:56:41 +01:00 |
|
masensio
|
101cbbe492
|
Merge branch 'develop' into check_server_certificates_in_SSO_webview
|
2014-03-10 11:08:42 +01:00 |
|
masensio
|
45bc02fbe5
|
OC-3212: Show appropiate error messages for SslError in SSL error dialog shown by WebViewClient
|
2014-03-10 10:53:11 +01:00 |
|
masensio
|
8e1a2573b9
|
OC-3116: Add a warning dialog for untrusted SslCertificates and show it instead of call proceed() directly
|
2014-03-06 18:26:35 +01:00 |
|
masensio
|
56853acff0
|
Won't Fix:
Revert "OC-3121: (fix bug) An empty message is sent, when renaming a file in the web of a big file"
This reverts commit df4d0355f2.
|
2014-03-04 13:28:07 +01:00 |
|
masensio
|
df4d0355f2
|
OC-3121: (fix bug) An empty message is sent, when renaming a file in the web of a big file
|
2014-03-04 11:58:30 +01:00 |
|
masensio
|
af1f880b27
|
Merge branch 'develop' into send_file_pr311_with_develop
|
2014-02-24 13:33:23 +01:00 |
|
masensio
|
271078a403
|
Merge branch 'master' into develop
|
2014-02-24 13:16:57 +01:00 |
|
David A. Velasco
|
42fc189367
|
Implemented option to copy shared link in clipboard instead of trusting in external clipboard front-ends
|
2014-02-19 18:00:49 +01:00 |
|
masensio
|
6cf78042b0
|
OC-2968: Filter out ownCloud from the list of apps able to receive the file
|
2014-02-17 13:54:02 +01:00 |
|
masensio
|
a5db2c2f68
|
HotFix to add Send File option, after PR#311
|
2014-02-17 09:16:29 +01:00 |
|
masensio
|
99686805e1
|
Merge branch 'develop' into send_file_pr311_with_develop
|
2014-02-17 08:45:52 +01:00 |
|
masensio
|
7ead9a0fe4
|
Merge pull request #311 from tobiasKaminsky/develop
Added support for sharing files:
|
2014-02-14 14:59:24 +01:00 |
|
masensio
|
42834b213a
|
OC-2966: Change name of the action from 'Share' to 'Send'
|
2014-02-14 12:38:38 +01:00 |
|
masensio
|
065a9c0046
|
OC-2966: Change name of the action from 'Share' to 'Send'
|
2014-02-14 12:13:58 +01:00 |
|
masensio
|
296df1bb65
|
Merge branch 'pr/311' into pull_request_311_with_develop
|
2014-02-14 10:59:26 +01:00 |
|
masensio
|
eb7bbebc08
|
OC-2868: Fix bug: Unshare a file that does not exist any more, no message is shown
|
2014-02-07 12:54:52 +01:00 |
|
David A. Velasco
|
a9bf3f334d
|
Some high-priority strings needing translation
|
2014-02-06 13:16:16 +01:00 |
|
masensio
|
3f701c5bb8
|
OC-2834: Access to unshare link from PreviewMediaFragment
|
2014-02-05 12:52:55 +01:00 |
|
masensio
|
e437d8320d
|
Merge branch 'share_link__new_share' into share_link__unshare_file
|
2014-02-05 11:25:39 +01:00 |
|
masensio
|
e2af381b88
|
OC-2823: Show toast message when CreateShareOperation failes
|
2014-02-05 09:01:46 +01:00 |
|
masensio
|
8d493de0ea
|
OC-2734: Update Database for UnshareLink operation
|
2014-02-03 14:24:36 +01:00 |
|
David A. Velasco
|
77d22d5a31
|
Added filtered chooser dialog for activities that can receive a link
|
2014-02-03 14:24:28 +01:00 |
|
masensio
|
2b8588ab0b
|
OC-2732: Create 'unshare' option menu for a shared file/folder
|
2014-02-03 11:22:39 +01:00 |
|
David A. Velasco
|
59513cd56d
|
Merge branch 'share_link__new_share' into share_link__new_share_menu
|
2014-02-03 09:46:26 +01:00 |
|
masensio
|
261d8a5167
|
OC-2772:Display a message if the user selects to share a file or folder that does not exist on the server
|
2014-02-03 09:26:36 +01:00 |
|
masensio
|
0f7d8d8453
|
OC-2771: Add pop-up message if the server doesn't support Share API and Share Link option is selected
|
2014-02-01 19:38:36 +01:00 |
|
David A. Velasco
|
fbe5f83aee
|
Adding custom dialog to let the user choose what app should received a shared link [WIP]
|
2014-01-31 15:38:53 +01:00 |
|
David A. Velasco
|
ef0df64070
|
Added entry menu to share files, whereever actions on files can be triggered
|
2014-01-22 13:31:52 +01:00 |
|
David A. Velasco
|
81e906bc34
|
Updated hint in URL input field
|
2013-12-10 13:53:21 +01:00 |
|
tobiasKaminsky
|
0d01bf30c3
|
Added support for sharing files:
- Long press on file list
- Add option on ImageViewer
|
2013-11-24 10:00:04 +01:00 |
|
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 |
|