mirrors/nextcloud-android
1
0
Fork 0
mirror of https://github.com/nextcloud/android.git synced 2024-12-23 01:00:26 +03:00
Code Issues Projects Releases Packages Wiki Activity
6338 commits 221 branches 1589 tags 640 MiB
Commit graph

519 commits

Author SHA1 Message Date
David A. Velasco
a3642ab864 Improved load of images in PreviewImageFragment - no more images in full size by default, up to 3 tries to downScale 2015-05-18 14:29:00 +02:00
purigarcia
2d95a83959 Merge branch 'develop' into automationTest 2015-05-11 08:16:43 +02:00
David A. Velasco
94f4a072ed Replaced 'pass code' with 'passcode' 2015-05-07 12:07:44 +02:00
purigarcia
6a9dfdb330 Merge branch 'develop' into automationTest 2015-05-06 19:05:03 +02:00
masensio
7d82231809 Merge branch 'develop' into pinEnhancement 2015-05-05 13:56:57 +02:00
David A. Velasco
9593b580b7 Replaced 'PIN code' by 'pass code' 2015-05-04 11:41:09 +02:00
masensio
7d5c573766 Show Waiting dialog, while copy temporal file async task is working 2015-04-30 13:04:51 +02:00
David A. Velasco
802a164616 Merge branch 'develop' into pinEnhancement 
Conflicts SOLVED:
	src/com/owncloud/android/ui/activity/FileDisplayActivity.java
	src/com/owncloud/android/ui/activity/Preferences.java
	src/com/owncloud/android/ui/activity/Uploader.java
	src/com/owncloud/android/ui/fragment/OCFileListFragment.java
 2015-04-28 14:20:17 +02:00
purigarcia
d8e954d2d3 add id and contentdescription to a layout 2015-03-25 18:54:10 +01:00
masensio
c0da8a93f2 Merge branch 'develop' into create_folder_during_upload_pr_701_with_develop 2015-03-20 14:55:48 +01:00
David A. Velasco
5ebd90ed2d Merge pull request #914 from owncloud/accessibility 
Added accesibility descriptions as a mean to add automatic tests un UI.
 2015-03-19 12:59:17 +01:00
masensio
876204faf0 Merge branch 'develop' into create_folder_during_upload_pr_701_with_develop 2015-03-16 11:15:27 +01:00
masensio
c963eb0fad Merge branch 'develop' into accessibility 
Conflicts:
	src/com/owncloud/android/ui/adapter/FileListListAdapter.java
 2015-03-10 14:58:21 +01:00
masensio
03b5cb9dd6 When no enter a password, message should be 'You must enter a password' 2015-03-09 11:38:36 +01:00
masensio
b08e9e35e6 Create password dialog: SharePasswordDialog.java 2015-03-05 17:54:03 +01:00
David A. Velasco
b5d70ad8e7 App updated to OwnCloudAccount with deferred load of credentials 2015-02-10 10:29:51 +01:00
David A. Velasco
28e4b35595 Quotes updated in subject message for shared link, better format string 2015-02-03 13:17:14 +01:00
masensio
7f6c5bd3b2 Merge commit 'refs/pr/701' into create_folder_during_upload_pr_701_with_develop 2015-01-30 12:10:15 +01:00
David A. Velasco
b894a0a4f9 Removed ... from content description 2015-01-12 09:44:00 +01:00
tobiasKaminsky
d54345d040 Merge remote-tracking branch 'upstream/develop' into uploadNewFolder 
Conflicts:
	src/com/owncloud/android/ui/activity/Uploader.java
 2015-01-08 22:41:41 +01:00
jabarros
3929f1e740 Add content description tag into EditText in account_setup 2015-01-08 13:07:54 +01:00
jabarros
d05d5ffe1a Merge branch 'develop' into download_folder 2015-01-07 14:04:46 +01:00
jabarros
f737785b4f Change error message when trying download a folder that does not exist 2015-01-07 13:47:38 +01:00
jabarros
90e49a96e4 Added folder name to 'file not found' error message 2015-01-07 13:04:46 +01:00
jabarros
1db11eb586 Fix. App does not realize that the folder does not exist 2015-01-07 11:22:24 +01:00
tobiasKaminsky
0ae80926ac update 2015-01-05 19:53:40 +01:00
tobiasKaminsky
cb725acdf3 - removed whitespaces 
- renamed pin description
 2015-01-01 13:06:25 +01:00
tobiasKaminsky
74bd1d8d78 - clarify pin description 2014-12-30 09:35:48 +01:00
jabarros
f0905fbaac Merge pull request #784 from ekeitho/develop 
subject mail populated when user shares >>file/folder<<
 2014-12-26 09:04:02 +01:00
Keith Abdulla
150050aeb0 fix tab indent 2014-12-23 09:38:38 -08:00
Keith Abdulla
1db0d7daf2 create an extra string resource 2014-12-23 09:31:59 -08:00
jabarros
6f11fa1c09 Added content description tag in 'account setup' layout elements 2014-12-18 12:22:07 +01:00
Luke Owncloud
61de793925 hide empty upload groups 2014-12-10 14:33:47 +01:00
jabarros
c34646aed3 Merge branch 'fix_protocol_send_mail' into fix_logs_change_orientation 2014-12-10 14:13:32 +01:00
Keith Abdulla
3d8174a73e fix tab 2014-12-09 23:01:48 -08:00
Keith Abdulla
1704c4f788 move subject message strings into strings.xml 2014-12-09 17:51:10 -08:00
Luke Owncloud
2d0c347bc4 Merge remote-tracking branch 'upstream/develop' into HEAD 
Conflicts:
	owncloud-android-library
	src/com/owncloud/android/datamodel/OCFile.java
	src/com/owncloud/android/files/InstantUploadBroadcastReceiver.java
	src/com/owncloud/android/ui/activity/FileDisplayActivity.java
	src/com/owncloud/android/ui/activity/FolderPickerActivity.java
	src/com/owncloud/android/ui/activity/Preferences.java
	src/com/owncloud/android/ui/adapter/FileListListAdapter.java
	src/com/owncloud/android/ui/fragment/ExtendedListFragment.java
	src/com/owncloud/android/ui/fragment/OCFileListFragment.java
 2014-12-08 16:24:10 +01:00
David A. Velasco
50e39f044f Merge branch 'master' into develop 2014-12-03 11:31:49 +01:00
Luke Owncloud
9445692878 fix cancel upload 
add remove single upload from list
add retry upload
 2014-11-28 14:01:19 +01:00
tobiasKaminsky
fa99fbe2d9 - Instant upload only when charging 2014-11-22 13:48:03 +01:00
tobiasKaminsky
ae6b686775 Merge remote-tracking branch 'upstream/develop' into fileCount 2014-11-21 17:59:51 +01:00
Luke Owncloud
8de07698d9 integrating @davivels remarks 2014-11-20 13:46:54 +01:00
jabarros
a2de2f28ab Add new preference on settings for setting the upload video path 2014-11-19 10:14:27 +01:00
jabarros
00a8eb415a Create FolderPickerActivity from which MoveActivity and UploadPathActivity extend 2014-11-18 14:51:49 +01:00
tobiasKaminsky
79cb6106fd Merge remote-tracking branch 'upstream/develop' into beautifyTimestamps 
Conflicts:
	src/com/owncloud/android/utils/DisplayUtils.java
 2014-11-12 09:02:23 +01:00
tobiasKaminsky
2117c024c4 < 60 seconds -> "seconds ago" 2014-11-12 08:56:53 +01:00
tobiasKaminsky
ccdf0f1b96 - adding possibility to create folder during upload 2014-11-01 13:41:06 +01:00
David A. Velasco
0bedcb9128 Merge branch 'remember_last_share_location' into remember_last_share_location_fixed 2014-10-31 15:23:59 +01:00
Luke Owncloud
035fc24a17 allow user to save choice of app for sending log 
warn user if no app for sending log available
 2014-10-30 09:53:24 +01:00
Luke Owncloud
5caa8d25a0 use chooser for sendmail (remove explicit gmail) in LogHistory 2014-10-29 12:39:44 +01:00
tobiasKaminsky
fbc3d970c5 Merge remote-tracking branch 'upstream/develop' into fileCount 
Conflicts:
	res/layout/list_fragment.xml
	res/values/strings.xml
	src/com/owncloud/android/ui/fragment/ExtendedListFragment.java
	src/com/owncloud/android/ui/fragment/OCFileListFragment.java
 2014-10-24 18:18:06 +02:00
jabarros
6970560d2f Merge branch 'sortingFiles' of https://github.com/tobiasKaminsky/android into sorting_files_2 
Conflicts:
	src/com/owncloud/android/datamodel/OCFile.java
	src/com/owncloud/android/ui/adapter/FileListListAdapter.java
	src/com/owncloud/android/ui/fragment/OCFileListFragment.java
 2014-10-23 11:06:05 +02:00
jabarros
2fad1e1a99 Merge branch 'develop' into sorting_files_2 
Conflicts:
	src/com/owncloud/android/ui/adapter/FileListListAdapter.java
 2014-10-23 10:18:20 +02:00
jabarros
3a8ff76d0a Merge branch 'master' into develop 
Conflicts:
	owncloud-android-library
 2014-10-20 14:54:46 +02:00
Magnus Sjoqvist
844790057b Merge with develop 2014-10-20 14:38:13 +02:00
tobiasKaminsky
635394f2a2 - minor design changes 2014-10-19 08:56:57 +02:00
tobiasKaminsky
4e960eafeb added "x folders and y files" to end of list 2014-10-18 10:47:08 +02:00
Magnus Sjoqvist
b6c7719415 Merge with develop 2014-10-17 11:06:30 +02:00
jabarros
016bdfac1f Fixed. Upload path is not place correctly in setting view 2014-10-15 08:21:23 +02:00
Magnus Sjoqvist
ebe0f73068 Added feature for remembering last upload location when sharing a file. Also added an option to turn it off in prefrences. 2014-10-14 09:34:49 +02:00
tobiasKaminsky
706a769e30 - disabled sort by size until server supports server-side folder size 
calculation
 2014-10-11 09:14:14 +02:00
jabarros
7d9fc6857e Merge branch 'sortingFiles' of https://github.com/tobiasKaminsky/android into sorting_files 
Conflicts:
	res/menu/main_menu.xml
	src/com/owncloud/android/ui/activity/FileDisplayActivity.java
	src/com/owncloud/android/ui/adapter/FileListListAdapter.java
 2014-10-09 17:26:02 +02:00
jabarros
1e7e893321 Merge branch 'master' of https://github.com/loripino21/android into instant_upload_path_chooseable 2014-10-06 14:58:34 +02:00
jabarros
2e472998c1 Merge branch 'develop' into release-1.6.0 2014-10-02 09:04:11 +02:00
loripino21
47d1a5e3e4 Update strings.xml 2014-09-23 10:08:40 +02:00
loripino21
72c6e981c5 Update strings.xml 2014-09-23 10:03:56 +02:00
Volkan Gezer
863c0145be fix owncloud capitalization 2014-09-19 18:10:20 +02:00
David A. Velasco
aa354e5d73 Merge branch 'develop' into release-1.6.0 2014-09-18 14:27:13 +02:00
jabarros
33c171e6d4 Update string auth_redirect_non_secure_connection_title 2014-09-18 10:57:51 +02:00
jabarros
74c29e1ce1 Changes after CR 2014-09-17 16:46:11 +02:00
jabarros
2ef886af31 Merge branch 'develop' into better_loggin_system 2014-09-17 09:47:34 +02:00
tobiasKaminsky
a622b1dcfb - Only three orders: A-Z, Big-Small, New-Old. 
- Folder size is computed locally (therefore only downloaded files are
obeyed)
 2014-09-15 16:04:46 +02:00
tobiasKaminsky
c98f2b56c6 Renamed sorting labels 2014-09-15 11:42:27 +02:00
tobiasKaminsky
20cd00b22c Added sorting by name, date or size ascending/descending 2014-09-14 15:51:09 +02:00
David A. Velasco
cbdb5d3ff0 Fixed mess created with b9eaffd 2014-09-12 13:49:37 +02:00
jabarros
4599553545 Move Logger class to owncloud library and update references. Add async task for loading log info into LogHistoryActivity 2014-09-11 18:26:52 +02:00
jabarros
ba6c6375cf Merge branch 'develop' into ADFS_auth_support 
Conflicts:
	res/values/strings.xml
 2014-09-09 13:17:41 +02:00
jabarros
2ada53c99b Enable log into text file automatically when BuildConfig.DEBUG is true. Open log activity when user clicks on action bar menu option. Add button to send email with log file attached. 2014-09-04 09:06:14 +02:00
David A. Velasco
1dbba08c7b Improved messages for operations on files not existing anymore in the server 2014-09-02 10:13:14 +02:00
jabarros
622523b3e3 Show alert message when user or password in authentication is not correct 2014-08-28 16:03:03 +02:00
jabarros
28614af18d Merge branch 'develop' into move_files_and_folders 2014-08-28 12:32:39 +02:00
jabarros
d3d0816ed7 Show a dialog to request username and password to the user on authentication request 2014-08-28 12:30:32 +02:00
jabarros
8188d4fa92 Update messages for moving files operation results 2014-08-27 10:01:28 +02:00
jabarros
622d78906b Show an alert message when user tries to move a file or folder to a location where its name is used by other file or folder and when it is forbidden to move it 2014-08-26 18:44:14 +02:00
jabarros
a6afe6efd2 Add gestion for errors when moving files 2014-08-26 17:44:18 +02:00
jabarros
dc984ec5bf Add new activity for selecting the destination folder when moving files, including new List Fragment and new Adapter for listing only the folders 2014-08-13 16:43:50 +02:00
David A. Velasco
0cc6b8a3ff Improved English wording 2014-08-12 09:27:23 +02:00
jabarros
fbe0568883 Add into file_actions_menu xml the 'move' option 2014-08-11 14:39:44 +02:00
jabarros
b154fba6ee Merge branch 'develop' into accounts_view 
Conflicts:
	res/values/strings.xml
 2014-08-07 17:34:15 +02:00
David A. Velasco
aa4709024e Updated message for warning about HTTPS -> HTTP redirection 2014-08-07 13:32:22 +02:00
jabarros
471d64a16c Change the title of preference for adding new accounts and remove unused commented code 2014-08-06 09:23:21 +02:00
jabarros
5cba80a1ab Add new preference category on settings and list in it the accounts 2014-08-05 11:22:16 +02:00
jabarros
fcb556eb2d Show appropiate message and update library reference 2014-08-04 10:21:48 +02:00
David A. Velasco
41666b2d6c Merge pull request #578 from owncloud/show_message_for_empty_list 
Show background message when list of files is empty
 2014-07-30 09:40:17 +02:00
jabarros
89e7ad9e67 Show message when the file list is being loading and when it is empty 2014-07-25 13:13:58 +02:00
jabarros
2b21d67791 Add case for when trying to download a file that is no longer available on the server 2014-07-25 09:11:21 +02:00
jabarros
61c8f7f083 Upgrade notifications on status bar when uploading to show proper message about fails due to lack of permissions and removed FailedUploaderActivity 2014-07-25 09:11:20 +02:00
jabarros
a28fa921c9 Update ErrorMessageAdapter class to generate appropiate error messages for operations failed due to lack of permissions (ResultCode.FORBIDDEN) 2014-07-25 09:10:26 +02:00
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
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
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
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
cd45a90bac Fixed typo 2013-03-21 14:00:46 +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
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