mirrors/nextcloud-android
1
0
Fork 0
mirror of https://github.com/nextcloud/android.git synced 2024-12-18 06:51:55 +03:00
Code Issues Projects Releases Packages Wiki Activity
4088 commits 221 branches 1585 tags 636 MiB
Commit graph

484 commits

Author SHA1 Message Date
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
David A. Velasco
a3bf6883fc Merge branch 'develop' into regular_authentication_in_saml_server 2014-03-21 11:02:36 +01:00
masensio
c6f0847866 Changes from comments in PR#443 2014-03-20 16:15:59 +01:00
David A. Velasco
8a9f504138 Fixed contrast of text in notifications for Android 2.x and 3.x 2014-03-20 12:56:44 +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
834c98644b Remove some import warnings 2014-03-12 10:53:32 +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
6944503874 OC-3208: Unify both SSL dialogs taking information from X509Certificate in just one 2014-03-07 14:48:42 +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
8db07c67b6 OC-3016: Add option 'send_files_to_other_apps' with default value 'on' 2014-02-19 10:33:27 +01:00
David A. Velasco
0f99af779e Merge branch 'share_link__unshare_file' into release-1.5.4 2014-02-18 11:16:22 +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
85db28795d OC-2982: Update Settings 2014-02-17 13:11:28 +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
masensio
3662fda2de Merge pull request #388 from owncloud/setup_additions 
Setup additions
 2014-02-06 18:42:33 +01:00
David A. Velasco
4db5295f56 Merge branch 'share_link__new_share' into setup_additions 2014-02-06 13:58:41 +01:00
David A. Velasco
a9bf3f334d Some high-priority strings needing translation 2014-02-06 13:16:16 +01:00
David A. Velasco
08cec8f7a2 Allow setup of display name in the action bar for root folder 2014-02-05 19:10:08 +01:00
masensio
e2af381b88 OC-2823: Show toast message when CreateShareOperation failes 2014-02-05 09:01:46 +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
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
masensio
ae61e2d7d4 OC-2587:Add new string to setup.xml: share_api_link 2014-01-17 14:35:00 +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
cc39a76a90 Reviewed integration with sychronization framework to fix problems in Android 4.4 2013-11-11 10:08:16 +01:00
David A. Velasco
a0efedc99d Merge branch 'develop' into setup_buttons 2013-11-06 11:43:22 +01:00
David A. Velasco
850a3dd09a Let setting up the visibility of the link for new users in the login view 2013-11-06 11:30:15 +01:00
David A. Velasco
d252a09f53 Merge branch 'develop' into setup_buttons 2013-11-06 10:36:34 +01:00
David A. Velasco
797d164184 Merge branch 'develop' into review_build_process 2013-10-31 17:30:38 +01:00
masensio
39688fe30f Remove custom_buttons option from setup.xml. Review account_setup and pincodelock 2013-10-31 16:59:38 +01:00
masensio
20b5ecbac1 Update images. New Styles for Buttons, Dropdown and Progress 2013-10-30 18:37:05 +01:00
masensio
4849affc6f Update image buttons and remove CustomButton class 2013-10-30 17:29:22 +01:00
masensio
920b6f4ecc Update preferences and style 2013-10-30 10:30:48 +01:00
masensio
19e065538b Update setup 2013-10-30 10:24:15 +01:00
masensio
e86d7cd9b4 Update setup and strings 2013-10-29 14:36:09 +01:00
masensio
6ace8ab1c1 Update packageName 2013-10-29 14:10:42 +01:00
David A. Velasco
a103eb3f96 Included in setup.xml the background color for logo in login view 2013-10-29 11:12:57 +01:00
masensio
2c1b67e143 OC-1832: Customize dropdown and spinner in ActionBar 2013-10-29 10:33:30 +01:00
masensio
b3752166e4 OC-1833: New color button_text_color in setup.xml 2013-10-28 13:38:15 +01:00
David A. Velasco
4160e7e256 Merge branch 'develop' into clean_up 2013-10-28 10:11:40 +01:00
masensio
6e21c84026 Customize buttons 2013-10-25 15:06:10 +02:00
masensio
de9b09fd3b Update colors 2013-10-25 13:55:15 +02:00
masensio
3889bea7c9 Update Social Links 2013-10-25 11:09:21 +02:00
masensio
21f491aab4 Update strings 2013-10-25 10:18:34 +02:00
David A. Velasco
56645d9640 Removed urls.xml and moved last URLs to setup.xml 2013-10-25 09:44:26 +02:00
masensio
7656cff3bb Update package name 2013-10-24 18:12:00 +02: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
75d58e44a6 Update data_folder value 2013-10-22 13:24:08 +02:00
masensio
fc5608de76 Merge branch 'setup_colors' into setup_app_name 2013-10-18 15:00:16 +02:00
masensio
a1f8d76188 OC-1769: Modify background_color and login_background_color works fine 2013-10-18 14:59:42 +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
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
9681b8687e OC-1656: Disable/enable help-imprint-feedback options 2013-10-16 08:56:41 +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
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
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
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
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
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
zerginator
536cc166b6 Issue #136 [Feature] Instant upload of videos 2013-05-01 20:06: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
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
David A. Velasco
2e5b40e357 Make the OAuth authorization available or not depending upon a variable in oauth.xml 2013-03-27 13:39:00 +01:00
David A. Velasco
980b31de2e Allow edition of OAuth endpoints for testing; better configuration values 2013-03-22 14:50:30 +01:00
David A. Velasco
cd45a90bac Fixed typo 2013-03-21 14:00:46 +01:00
David A. Velasco
69d6d821ec OAuth clean-up and refactoring 2013-03-21 12:21:48 +01:00
David A. Velasco
5665d9c306 Merge tag 'oc-android-1-3-22' into oauth_login 
Conflicts:
	AndroidManifest.xml
	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/services/FileOperation.java
	src/com/owncloud/android/files/services/InstantUploadService.java
	src/com/owncloud/android/ui/activity/AuthenticatorActivity.java
 2013-03-18 14:28:49 +01:00
David A. Velasco
7d84fd0c9f Refresh authorization token on failed synchronizations when notification error is clicked 2013-03-18 14:05:34 +01:00
Matthias Baumann
6c5f561342 - exclude none InstantUpload from InstantUploadActivity 
- add simple Activity for none InstantUloads to show the whole
error-message
 2013-03-17 10:38:42 +01:00
Matthias Baumann
7392cfe5ab - InstantUpload path const not longer at two places, only at 
InstantUploadService
- new method to create the full path for the instantupload's
- add QUOTA_EXCEEDED to RemoteOperationResult.ResultCode enum to hande
http-507 from oc
- handle RuntimeException at connection lost as HOST_NOT_AVAILABLE
- add the error message for failed uploads for every not uploaded
picture, espacially  for QUOTA_EXCEEDED is it necessary to show that to
the user
 2013-03-16 18:56:27 +01:00
David A. Velasco
dc08386401 Merge branch 'details' into feature_previews 2013-03-12 13:03:15 +01:00
David A. Velasco
1493579a2e Changed 'See details' option menu for 'Details' 2013-03-12 13:02:51 +01:00
zerginator
8e36e7cc3e This wraps the android.util.logging into Log_OC which , if its enabled 
in the app, logs the logcat into a file. It also includes the phone
information (MODEL, VERSION...)

https://github.com/owncloud/android/issues/97
 2013-03-12 07:56:27 +01:00
David A. Velasco
7d67737a4f Updating translation files... 2013-03-11 13:27:56 +01:00
zerginator
18a715072c moved About App into preferences 
https://github.com/owncloud/android/issues/57
 2013-03-10 20:38:46 +01:00
David A. Velasco
d68b324653 Create our own media control - basic operation 2013-03-08 13:32:10 +01:00
David A. Velasco
6cfa24f55a Improved error messages in gallery for images that can not be loaded 2013-03-01 09:54:49 +01:00
David A. Velasco
cb66b59918 Minimize new fragment to monitor the progress of file download 2013-02-25 15:19:18 +01:00
Matthias Baumann
f764980474 - extend existing FileUpload, so we can handel failed instand upload 
later
- new Activity to handle failed instant uploads
- new Activity InstantUploadActivity can be started at two ways,
     -touch to the 'Faild Upload Notifivation'
     -submenue underneath the upload menue  
- merges from head
- add lazy loading for the images list with failed uploads
 2013-02-25 08:21:33 +01:00
David A. Velasco
24dd513682 Added progress bar for file transfers in details view (untested) 2013-02-19 13:28:01 +01:00
David A. Velasco
f2474ae28d Added basic menu options to the preview fragment: open, delete, see details 2013-02-18 11:23:18 +01:00
David A. Velasco
7101a04247 Created preview fragment to show previews for audio, video and images; shown when a downloaded file in these categories is downloaded 2013-02-14 19:21:09 +01:00
David A. Velasco
9420651936 Error messages for media playback improved 2013-02-12 12:07:42 +01:00
David A. Velasco
11c1ad8f78 Fixed bad behaviours when an error occurrs during audio playback 2013-02-12 11:26:38 +01:00
David A. Velasco
e4cd3fe54c Removed unused code in MediaService 2013-02-11 12:46:50 +01:00
David A. Velasco
6103446ab8 Error messages for video playback reviewed 2013-02-11 11:33:50 +01:00
David A. Velasco
4dc81e5168 Removed usused drawable; list_selector rewritten from scratch with new license (and color fixed for Android before ICS) 2013-02-08 11:37:02 +01:00
David A. Velasco
2623e9c195 Replaced GPL v3 with GPL v2; PLEASE, note that GPL v2 still allows the code is used under the terms of later versions of GPL, depending upon the will of the user, so no right is being diminished 2013-02-08 09:22:46 +01:00
David A. Velasco
bb257ec729 Updated copyright in source files 2013-02-07 18:45:10 +01:00
David A. Velasco
7018ae7e1f Added music player service in background; 'open' button in details used to test (temporal) 2013-02-05 12:20:47 +01:00
David A. Velasco
5da9c095a4 Added dialog in the main app to advise users about the workaround app 2013-01-30 13:46:15 +01:00
David A. Velasco
fb8a8a2166 Fixed behaviour when authorization is denied by user; added toast message to explain the need to update credentials 2013-01-28 13:15:28 +01:00
David A. Velasco
63106c9238 Locked edition of URL and password in redirection due to expired credentials; error messages reviewed; fixed capture of redirection from web browser in OAuth 2013-01-25 15:11:10 +01:00
David A. Velasco
088b1e83a4 Cleaning-up AuthenticatorActivty code 2013-01-24 10:29:11 +01:00
David A. Velasco
2b5785556e Merge branch 'master' into oauth_login 
Conflicts:
	AndroidManifest.xml
	res/values-de-rDE/strings.xml
	res/values-de/strings.xml
	res/values/strings.xml
	src/com/owncloud/android/Uploader.java
	src/com/owncloud/android/datamodel/FileDataStorageManager.java
	src/com/owncloud/android/files/OwnCloudFileObserver.java
	src/com/owncloud/android/files/services/FileDownloader.java
	src/com/owncloud/android/files/services/FileUploader.java
	src/com/owncloud/android/operations/RemoteOperationResult.java
	src/com/owncloud/android/syncadapter/FileSyncAdapter.java
	src/com/owncloud/android/ui/activity/AuthenticatorActivity.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
 2013-01-17 14:25:49 +01:00
David A. Velasco
7239b9eb9d Translations update 2013-01-10 18:38:41 +01:00
David A. Velasco
c38a3b2ef1 Merge master into oauth_login 2012-12-18 11:20:03 +01:00
David A. Velasco
279670c303 Merge remote-tracking branch 'origin/sync_review_2' 2012-12-05 23:23:10 +01:00
David A. Velasco
4558866223 Give the user a chance to move the files selected for an upload when there is not space enough to copy them into the ownCloud folder 2012-12-04 14:20:02 +01:00
David A. Velasco
f68d10abc7 Give the user the option to move all the foreign files into the ownCloud local folder when the try to copy them during an account synchronization failed 2012-12-04 12:49:18 +01:00
David A. Velasco
a7535406d4 Customized error message for uploads when the local file cannot by copied to the ownCloud local directory 2012-11-30 14:39:31 +01:00
David A. Velasco
3ef64834e9 Added scroll to generic explanation activity. Enabled the copy of past uploads into ownCloud folder during synchronization. 2012-11-30 11:58:46 +01:00
David A. Velasco
2a913bfbeb Files uploaded in the past are copied to the local ownCloud directory during account synchronization 2012-11-30 11:29:18 +01:00
David A. Velasco
236895e7f8 Refactored app name in strings.xml 2012-11-29 12:26:55 +01:00
David A. Velasco
757f9027f5 Updating language strings; some hardcoded strings moved to strings.xml; workaround for bug in error popup 2012-11-29 11:28:34 +01:00
David A. Velasco
4c50eb4d2d Merge of master after sync_review was merged into it 2012-11-23 10:25:06 +01:00
David A. Velasco
d49bfd0c77 Added title to rename dialog; and some cleaning 2012-11-22 10:24:26 +01:00
David A. Velasco
38a80be828 Fixed lock of buttons in details view when the 'Keep both' option in conflicts dialog is used 2012-11-20 14:41:04 +01:00
David A. Velasco
c301865c35 Synchronize kept-in-sync files during account synchronization, in both directions and considering conflicts 2012-11-16 16:23:45 +01:00
David A. Velasco
a7ee15e023 Renaming confussing token 2012-11-16 09:42:51 +01:00
David A. Velasco
ff2271a8c5 Download button in file details view upgraded to sync file content in both directions 2012-11-15 17:18:04 +01:00
David A. Velasco
500cbf9cea New items in the context menu for files (not folders), depending upon its state 2012-11-06 15:13:27 +01:00
David A. Velasco
b27ebf0310 Removal of folders completed 2012-11-05 15:44:09 +01:00
David A. Velasco
cab55a8edd Login page updated to get OAuth2 access token 2012-10-31 18:59:43 +01:00
David A. Velasco
454f15138e Rename and remove operations connected to the contextual menu over items at the list of files 2012-10-31 17:41:57 +01:00
David A. Velasco
3d72058691 Quick fix to avoid two lines in button 2012-10-30 11:24:30 +01:00
David A. Velasco
cc1eb7a352 SSL warning with more information about certificate, accessible through a new 'Details' button 2012-10-29 15:03:34 +01:00
Bartek Przybylski
6c32365704 Solving modified date and length conflicts 2012-10-27 12:20:52 +02:00
David A. Velasco
8f2314d80e Improved explanation in PIN code view 2012-10-19 09:24:34 +02:00
David A. Velasco
97f21ee7be About message moved to strings.xml 2012-10-17 19:34:31 +02:00
David A. Velasco
d0f7de3ce0 Added help text in background of empty files list 2012-10-17 19:22:40 +02:00
David A. Velasco
d193e0031b Added explanation in the view for PIN Code creation 2012-10-17 11:04:27 +02:00
David A. Velasco
6eff1c94be Updated text in 'Remote and local' option offered when removing a downloaded file to fit the button size' (just some languages) 2012-10-17 10:14:14 +02:00
Bartek Przybylski
671cb91cef add upload via wifi only option 2012-10-08 21:26:18 +02:00
David A. Velasco
76ba00b2b2 Cancellation of current download in details view - UI changes 2012-10-08 09:03:12 +02:00
David A. Velasco
0c3aaf3c5a Fixed typo in link to owncloud.com 2012-10-03 11:52:54 +02:00
David A. Velasco
131d97d74d A new string 2012-09-13 17:08:00 +02:00
David A. Velasco
261aaf5001 Improvements in SSL certifcates checking: URL is checked with the hostname in the certificate and all the problems are shown in the same dialog 2012-09-07 14:11:08 +02:00
David A. Velasco
48f13c8adc SSL connections update: notice about untrusted certificates and allow the user save them as reliable 2012-09-05 13:46:30 +02:00
David A. Velasco
91bc3fdb1e Added notification for failures in manual synchronizations; some improvements in the management of exceptions occurred while synchronizing (more TODO) 2012-08-23 17:09:05 +02:00
David A. Velasco
4e57c008b7 Fixed crash when sending nothing to the Uploader activity; slightly more prettier UI 2012-08-22 13:53:03 +02:00
David A. Velasco
081b333eb1 Added link to register a new user at owncloud.com ; fixed cancel button in account creation for SGS3 2012-08-20 14:36:46 +02:00
David A. Velasco
1ecd2b61c5 Multiple upload available from the app 2012-08-14 12:37:08 +02:00
David A. Velasco
58ebd9d7e1 FIleDisplayActivity refactored to fix view never updated after installation in some devices and problems when all the accounts are deleted 2012-08-08 12:30:11 +02:00
David A. Velasco
532492bf9b Fixed crashed when the user tries to upload to ownCloud some content for wich the client does not have enough permissions; such as a contact. 2012-08-03 11:39:08 +02:00
David A. Velasco
38ece35da5 Fixed crash by URL with whitespaces in login page; reviewed error handling and user info in connection checking 2012-08-02 13:28:33 +02:00
David A. Velasco
6a9eaaf9aa Better failure handling in files renaming and removal 2012-07-30 15:11:59 +02:00
David A. Velasco
76a123fc35 Added failure handling to directory creation 2012-07-30 14:06:53 +02:00
David A. Velasco
3ab381f0e0 More hardcoded strings passed to string resources 2012-07-30 12:58:36 +02:00
David A. Velasco
e8852fa725 Fixed compatibility issue in local deletion and text typo 2012-07-30 09:46:24 +02:00
Bartek Przybylski
0cced280a4 allow removing local file only 2012-07-28 21:15:41 +02:00
David A. Velasco
7c93676d6f Make resource values for some hardcoded string 2012-07-27 15:02:03 +02:00
David A. Velasco
f3ba107585 Upload improvements: better control of errors, updated use of status notifications, removed toast notifications, new isUploading(...) mehtod 2012-07-26 18:35:09 +02:00
David A. Velasco
81970c8131 Reviewed error handling and notifications in downloads 2012-07-25 12:04:08 +02:00
David A. Velasco
20c5767a04 Minor typos and spelling corrected 2012-07-24 09:08:29 +02:00
Bartek Przybylski
7f75f13f0c make confirmation dialog more universal 2012-07-23 19:09:44 +02:00
David A. Velasco
eb2a7bcec2 Replaced strings in two pieces with formatted string 2012-07-23 14:38:16 +02:00
David A. Velasco
2a04c6ae5d Some fixes about downloads and how the detals view and list view is updated when downloads start and finish 2012-07-20 10:13:50 +02:00
David A. Velasco
0583bc8b33 Pin code messages update 2012-07-17 15:16:27 +02:00
David A. Velasco
463b30c46a Avoid crashes when an external app makes a bad response for the selection of a file to upload 2012-07-17 14:51:36 +02:00
David A. Velasco
91b1728493 More fixes to PIN code 2012-07-13 14:46:40 +02:00