mirrors/nextcloud-android
1
0
Fork 0
mirror of https://github.com/nextcloud/android.git synced 2024-11-27 17:46:37 +03:00
Code Issues Projects Releases Packages Wiki Activity
6155 commits 227 branches 1574 tags 621 MiB
Commit graph

747 commits

Author SHA1 Message Date
jabarros
26c7a451e1 Change 'Favorite/Unfavorite' item menu to 'Set/Unset as available offline' 2016-06-01 17:07:13 +02:00
Andy Scherzinger
e80d1465cd show log preference item only for debug mode or flag set true (false by default) 2016-05-18 12:35:58 +02:00
Andy Scherzinger
74a05bb2a9 moved logs from drawer menu to "More" section in the settings 2016-05-18 12:35:57 +02:00
Juan Carlos González Cabrero
f9dcd8c700 Change the default text color of login view to black 2016-05-03 11:06:17 +02:00
Juan Carlos González Cabrero
43121bb313 Added hint color to setup 2016-04-29 12:35:53 +02:00
Juan Carlos González Cabrero
7ab8836394 Update UI for login view according setup config 2016-04-29 12:35:53 +02:00
Juan Carlos González Cabrero
c252313e99 Add new setup variable for text color in login view 2016-04-29 12:35:53 +02:00
jabarros
aabdcaa04a Changes after CR 2016-04-28 11:26:06 +02:00
jabarros
bf0af8e3a6 Add comments and rename vars 2016-04-28 11:26:06 +02:00
jabarros
93cd2be3bb Change names of share features vars 2016-04-28 11:26:06 +02:00
jabarros
4bdea46b63 Add configuration variables to setup and show or hide share feature on file menu 2016-04-28 11:26:06 +02:00
Juan Carlos González Cabrero
c494290130 Fix string typo 2016-04-21 11:34:38 +02:00
David A. Velasco
e43c1d6b3f Improved error handling when copying shared link to clipboard 2016-04-21 11:31:48 +02:00
David A. Velasco
68b96ce0db Error dialogs in Uploader updated, both messages and implementation 2016-04-14 09:39:10 +02:00
David A. Velasco
9d005d636f Refatoring, warnings clean-up, improved error logic 2016-04-14 09:39:10 +02:00
Juan Carlos González Cabrero
1b680c606b Update error handling parsing the received uri 2016-04-14 09:39:10 +02:00
Juan Carlos González Cabrero
da6b0c0162 Update dialog for sharing no files to be more intuitive 2016-04-14 09:39:10 +02:00
David A. Velasco
f6ea9b597a Merge branch 'master' into reliable_uploads_actions_uploads_view 
Conflicts FIXED in res/values/styles.xml (trivial)
 2016-03-30 13:27:09 +02:00
Andy Scherzinger
d893654bc1 Fix Headline in share edit and user search 2016-03-22 13:29:23 +01:00
Andy Scherzinger
43a530afcb overall style changes for share edit and search view 2016-03-22 13:29:23 +01:00
David A. Velasco
15eb8b493b Merge branch 'master' into reliable_uploads_actions_uploads_view 2016-03-21 17:42:13 +01:00
Juan Carlos González Cabrero
94864bb094 Update strings, comments and removed some conditions 2016-03-21 09:45:27 +01:00
Juan Carlos González Cabrero
55fdcee912 New switch in share via link to allow editing 2016-03-21 09:31:34 +01:00
Juan Carlos González Cabrero
b1d46eb8ab Change error label for uploads when app is killed 2016-03-18 14:03:33 +01:00
Juan Carlos González Cabrero
f556c5d684 Upload failed strings updated 2016-03-18 10:47:19 +01:00
Juan Carlos González Cabrero
f150dce25c Refactor clear options for uploads avoiding clear the current ones 2016-03-18 09:22:42 +01:00
David A. Velasco
e181253410 Retrying an upload failed due to wrong credentials checks if stored credentials were already updated before asking to the user 2016-03-17 13:23:25 +01:00
David A. Velasco
772d640bc8 Fixed status message in uploads view 2016-03-16 19:17:01 +01:00
Juan Carlos González Cabrero
a969250b23 Adapt autocompletion to the web UI 2016-03-16 13:46:05 +01:00
Juan Carlos González Cabrero
a7efcf6a2f Add the remote suggestion to the MatrixCursor instead of the JSON array, wich could not parse the path correctly 2016-03-16 13:46:05 +01:00
David A. Velasco
259c94a45b Merge branch 'master' into reliable_uploads_actions_uploads_view 2016-03-15 09:48:12 +01:00
David A. Velasco
09e1f443fc Window brackground color defined indirectly 2016-03-15 08:53:44 +01:00
Andy Scherzinger
0d8f9cdc2e issue #1426 - Background color should be white everywhere 2016-03-14 16:16:59 +01:00
David A. Velasco
ec9b705536 Wording and padding fixes in uploads list 2016-03-08 13:17:55 +01:00
David A. Velasco
beb10a91cd Uploads over settings in navigation drawer 2016-03-03 13:00:32 +01:00
Andy Scherzinger
8d23bdcf9f added accents color definition on missed out top level theme definitions. 2016-02-25 18:07:42 +01:00
Andy Scherzinger
b1dd299cdb coloer changes for #1132 2016-02-25 18:07:11 +01:00
Andy Scherzinger
e0bacfaaea initial implementation of the FAB with Speed Dial 2016-02-25 18:07:11 +01:00
Juan Carlos González Cabrero
a506014d58 Checking of local file when an upload retry is requested 2016-02-24 10:41:50 +01:00
David A. Velasco
286dc8fafd Merge branch 'master' into reliable_uploads_actions_uploads_view 2016-02-22 10:21:46 +01:00
David A. Velasco
82b0b7a84f Merge branch 'master' into reliable_uploads_actions_uploads_view 2016-02-15 14:59:04 +01:00
Juan Carlos González Cabrero
9fe62d15ea Refresh listview when clear failed/finished uploads clicked 2016-02-15 10:58:53 +01:00
Andy Scherzinger
9d9bc6958b changes color of the OK button and the text 2016-02-12 12:29:05 +01:00
Andy Scherzinger
cbf134a6e2 move strings to resource file 2016-02-12 12:29:05 +01:00
David A. Velasco
3885db5013 Positive button of remove dialog(s) changed to 'Yes' 2016-02-09 08:59:35 +01:00
David A. Velasco
6eca835d1d Renamed scaring 'delete account' to 'remove account' 2016-02-04 14:51:54 +01:00
David A. Velasco
008153a541 Changed text color of secondary buttons to black 2016-02-04 14:51:54 +01:00
David A. Velasco
7931c321f2 Merge pull request #1461 from owncloud/manage_space_activity 
Added own Activity to manage space instead of default "Clear data" button in device settings
 2016-02-04 14:50:53 +01:00
masensio
9fd38ca0dd Changes from comments in Code Review: staring and NPE 2016-02-03 16:03:10 +01:00
masensio
dc2fdb9744 Changes from comments in Code Review: Strings and minor things 2016-02-03 14:28:12 +01:00
masensio
14530aa7b8 Changes from comments in PR Code Review 2016-02-03 13:45:53 +01:00
masensio
3d623ca911 Review string manage_space_description 2016-02-03 13:37:47 +01:00
masensio
96ce49707b Clean app data (keeping the PASSCODE untouched) from ManageSpaceActivity 2016-02-03 13:37:45 +01:00
masensio
d6653ef684 Add android:manageSpaceActivity to AndroidManifest.xml. Create empty activity ManageSpaceActivity.java 2016-02-03 13:37:43 +01:00
tobiasKaminsky
5b7f44e0f7 renamed security category to details for further use 
moved position
 2016-02-02 17:45:01 +01:00
David A. Velasco
9761b34c76 Merge pull request #1439 from owncloud/wording-fixes 
Wording fixes, simplify some strings and fix capitalization
 2016-02-02 17:33:25 +01:00
masensio
9c57aafab5 Review appereance of Uploads View 2016-01-27 13:59:51 +01:00
masensio
44f2894731 Checking Uploads with the same name 2016-01-26 17:53:13 +01:00
masensio
2f231561af Checking Priviledges Error failed uploads 2016-01-25 15:20:50 +01:00
masensio
29cb1277c3 Checking File Error failed uploads 2016-01-25 14:54:31 +01:00
masensio
15d5350ef6 Checking Folder Error failed uploads 2016-01-25 14:23:23 +01:00
masensio
198c1bf3b0 Checking Credential Error failed uploads: show error as Credential error and relogin 2016-01-25 13:02:22 +01:00
masensio
b6f8e93504 Checking Network Connection failed uploads 2016-01-25 10:59:53 +01:00
David A. Velasco
0d4c9b9961 Show error message from server when update of permissions fail 2016-01-20 12:22:24 +01:00
Jan-Christoph Borchardt
61a1d97abc wording fixes, simplify some strings and fix capitalization 2016-01-18 15:10:50 +01:00
David A. Velasco
e7901656a1 Polish UI to edit permissions 2016-01-11 15:34:41 +01:00
David A. Velasco
d826451e2d Added buttons to unshare (working) and finish (not working) in EditShareFragment layout 2016-01-11 12:17:11 +01:00
David A. Velasco
5fcb70beee Added fragment to edit share permissions with basic layout 2016-01-11 12:17:08 +01:00
masensio
2181239c6d Merge branch 'master' into reliable_uploads_actions_uploads_view 2016-01-08 11:21:23 +01:00
tobiasKaminsky
6bd7065c73 wip 2016-01-05 11:16:00 +01:00
masensio
540d123ad5 Merge branch 'master' into reliable_uploads_actions_uploads_view 2015-12-29 12:46:45 +01:00
Andy Scherzinger
a812784ddd Merge branch 'master' of https://github.com/owncloud/android into material_buttons 
Conflicts (resolved):
	res/layout/drawer.xml
	res/values/colors.xml
	res/values/setup.xml
 2015-12-28 20:03:25 +01:00
David A. Velasco
bd1f6452ac Make button colours easy to brand 2015-12-22 17:22:24 +01:00
David A. Velasco
147e6989c8 Added colors for header of navigation drawer and login button to the list of brandable colors 2015-12-14 12:50:52 +01:00
masensio
a840e67a68 Add 'Uploads' option into NavigationDrawer 2015-12-11 08:43:33 +01:00
masensio
dc0aea30f0 Merge branch 'master' into reliable_uploads 
Conflicts:
	AndroidManifest.xml
	res/values/strings.xml
	src/com/owncloud/android/datamodel/OCFile.java
	src/com/owncloud/android/db/ProviderMeta.java
	src/com/owncloud/android/files/FileMenuFilter.java
	src/com/owncloud/android/files/FileOperationsHelper.java
	src/com/owncloud/android/files/InstantUploadBroadcastReceiver.java
	src/com/owncloud/android/files/services/FileUploader.java
	src/com/owncloud/android/operations/SynchronizeFolderOperation.java
	src/com/owncloud/android/operations/UploadFileOperation.java
	src/com/owncloud/android/ui/activity/FileDisplayActivity.java
	src/com/owncloud/android/utils/FileStorageUtils.java
 2015-12-10 17:18:52 +01:00
Andy Scherzinger
71e87d98a8 Merge branch 'master' of https://github.com/owncloud/android into material_buttons 2015-12-09 15:14:22 +01:00
Maria Asensio
896e4859c0 Merge pull request #1168 from owncloud/avoidDuplicateFiles 
Avoid duplicate files
 2015-12-09 09:27:54 +01:00
masensio
59442c80ea Update string 2015-12-03 12:58:22 +01:00
tobiasKaminsky
04fc2e3cc2 changed according to latest discussion 2015-12-01 22:00:53 +01:00
masensio
e08513a762 Delete any rest of old public share/unshare flow 2015-11-25 09:32:26 +01:00
David A. Velasco
729a9b7c77 Set or clear password to protect public link in ShareFileFragment 2015-11-25 09:32:19 +01:00
David A. Velasco
f1b3208f1a Updated ShareFileFragment layout with extra section for public shares 2015-11-25 09:32:15 +01:00
tobiasKaminsky
2aac1e5270 Merge remote-tracking branch 'remotes/upstream/master' into avoidDuplicateFiles_Master 2015-11-21 08:48:40 +01:00
Andy Scherzinger
c31f602fd1 Merge branch 'master' of https://github.com/owncloud/android into material_buttons 
Conflicts:
	res/layout/list_item.xml
 2015-11-06 11:38:51 +01:00
Maria Asensio
19cce9c90f Merge pull request #1184 from Wikinaut/show-certificate-digest 
fix #1024 show cert fingerprints when adding new account w/ untrusted certificate
 2015-11-06 11:23:30 +01:00
David A. Velasco
b985935f22 Removed spurious file 2015-11-05 10:24:38 +01:00
Andy Scherzinger
f7fe0e00de moved back to #eee for the divider coloring since the coloring hasn't worked yet for the standard list views, see discussion #1232 2015-11-04 10:51:43 +01:00
Andy Scherzinger
838aaff224 change devider color to #f8f8f8 2015-11-02 15:25:43 +01:00
Andy Scherzinger
efdcb97963 setting divider color to #eee as decided by @jancborchardt 2015-11-02 12:05:52 +01:00
Andy Scherzinger
f72289f7bf Merge branch 'master' of https://github.com/owncloud/android into material_buttons 2015-11-02 08:41:51 +01:00
masensio
d1294ca584 Good behaviiour in servers not supporting SHAREE API: show the menu option and a messsage when try to share with a new user/group 2015-10-30 16:50:49 +01:00
David A. Velasco
33a9d1f447 Get rid of dependency on Context in CreateShareOperation 2015-10-30 16:41:59 +01:00
masensio
fcdef568ea Remove share_group_indicator string 2015-10-30 16:39:23 +01:00
masensio
ceffbc4aa8 Remove unshare with users/groups option from the menu 2015-10-30 16:39:21 +01:00
David A. Velasco
305536f8c2 Users and groups retrieved from server to fill search suggestions 2015-10-30 16:31:08 +01:00
masensio
1fbc44b574 Add new string for share_groups_indicator 2015-10-30 16:28:41 +01:00
David A. Velasco
e3d509a451 Complete search widget to send search requests to parent activity 2015-10-30 16:28:35 +01:00
masensio
905b68b4ec Show the 'search' layout in phone and tablet 2015-10-30 15:23:03 +01:00
David A. Velasco
bc5687b74a Changed title in sharing dialog from 'Share link' to 'Sharing' (seen in web UI) 2015-10-30 15:23:00 +01:00
masensio
c6c5b732c7 Add get list of users in the library 2015-10-30 15:22:12 +01:00
masensio
f28faf0c26 Show the layout to hsare with user in phone and tablet 2015-10-30 15:21:48 +01:00
masensio
8e3d7bdc8f Create the layout to share with a user 2015-10-30 15:10:42 +01:00
masensio
3a527a8fe4 Add 'Share with users/groups' to long press menu 2015-10-30 15:04:34 +01:00
masensio
b9ef747a0b Merge branch 'master' into sync_full_folder 
Conflicts:
	owncloud-android-library
	src/com/owncloud/android/files/services/FileUploader.java
 2015-10-27 08:52:17 +01:00
Andy Scherzinger
5c1e6e59ba Merge branch 'master' of https://github.com/owncloud/android into material_buttons 2015-10-22 13:05:06 +02:00
tobiasKaminsky
e92297ccaf split "on charging" to photo and video 2015-10-18 12:51:08 +02:00
tobiasKaminsky
e5caabd104 Merge remote-tracking branch 'remotes/upstream/master' into uploadWhenCharging 2015-10-18 12:50:54 +02:00
tobiasKaminsky
1db620124a update according to jan 2015-10-18 10:21:29 +02:00
Andy Scherzinger
a61f862677 directly link owncloud_blue color ID to setup.xml's actionbar_start_color to enable proper color manipulation. Technical debt: setup should rename the actionbar_start_color (and actionbar_end_color) since it is basically the primary-oiiod value due to material design terms. 2015-10-09 15:04:39 +02:00
Andy Scherzinger
41a883549f Merge branch 'master' of https://github.com/owncloud/android into material_buttons 2015-10-07 19:03:23 +02:00
Andy Scherzinger
8f0ea82efd Fix for #1182 on Android 5 2015-10-05 18:44:50 +02:00
Wikinaut
cf063bf04a fix #1024 show cert fingerprints when adding new account w/ untrusted cert 
+ show SHA-256, SHA-1 and MD5 certificate fingerprint
  instead of signature hex dump
  when certificate is untrusted
+ show error string if one of the digest algorithms is not available
+ added check and error msg for certificate load problems
 2015-10-02 02:39:10 +02:00
David A. Velasco
056b7c964d Updated error message for failed folder synchronization ('download' not anymore) 2015-09-25 15:13:59 +02:00
David A. Velasco
9b5506f81e Join cancelation of downloads and uploads in 'cancel sync', both for files and folders 2015-09-25 15:13:41 +02:00
David A. Velasco
ac685690a2 Extend SyncFolderOperation to check local changes of all files and trigger uploads 2015-09-25 15:13:35 +02:00
tobiasKaminsky
5034e42928 extracted hard-coded string to string resource 2015-09-23 19:49:01 +02:00
tobiasKaminsky
2b6a61ddae #819 part3: When uploading from filesystem inside the owncloud app, show question 2015-09-21 09:45:20 +02:00
tobiasKaminsky
4b8a5a9c92 #819, part 2: Instant uploads, depends on setting 2015-09-19 14:33:29 +02:00
Andy Scherzinger
6d670fb678 Merge branch 'master' of https://github.com/owncloud/android into material_buttons 2015-09-07 11:16:29 +02:00
David A. Velasco
1ff57e0665 HOT FIX: recovered lost strings 2015-09-07 10:07:54 +02:00
Andy Scherzinger
32145d57db Merge branch 'master' of https://github.com/owncloud/android into material_buttons 
Conflicts:
	res/layout/uploader_layout.xml
 2015-09-04 13:16:11 +02:00
David A. Velasco
e6be60679f Merge branch 'master' into copy 
Conflicts FIXED:
	src/com/owncloud/android/ui/activity/FileDisplayActivity.java
	src/com/owncloud/android/ui/fragment/OCFileListFragment.java
	src/com/owncloud/android/ui/preview/FileDownloadFragment.java
	src/com/owncloud/android/ui/preview/PreviewImageFragment.java
	src/com/owncloud/android/ui/preview/PreviewMediaFragment.java
 2015-09-01 18:35:51 +02:00
masensio
efb3989ee6 Merge branch 'develop' into uploadWhenCharging 
Conflicts:
	res/values-fr/strings.xml
	res/xml/preferences.xml
 2015-09-01 16:51:40 +02:00
masensio
3e6bcda9a4 Merge branch 'develop' into reliable_uploads 
Conflicts:
	src/com/owncloud/android/ui/activity/ConflictsResolveActivity.java
	src/com/owncloud/android/ui/activity/FileActivity.java
	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/ExtendedListFragment.java
 2015-08-20 16:37:10 +02:00
Andy Scherzinger
7f13b98cc0 Merge branch 'material_toolbar' of https://github.com/owncloud/android into material_buttons 
Conflicts:
	res/layout-land/account_setup.xml
	res/layout/account_setup.xml
 2015-08-18 23:20:01 +02:00
Andy Scherzinger
dbed65610b fix for the progress bar on pre lollipop devices via manipulating windowFrame, windowBackground and windowTitleBackgroundStyle 2015-08-18 22:09:53 +02:00
Andy Scherzinger
da89715045 reverted back to light colored login 2015-08-18 17:48:10 +02:00
Jorge Antonio Diaz-Benito Soriano
eb1e41bc76 Added error messages for copy action. English only. 2015-08-18 17:04:47 +02:00
masensio
e5e5b3638c Merge branch 'develop' into reliable_uploads 
Conflicts:
	SETUP.md
	owncloud-android-library
	res/menu/main_menu.xml
	res/values/strings.xml
	src/com/owncloud/android/db/DbHandler.java
	src/com/owncloud/android/db/ProviderMeta.java
	src/com/owncloud/android/files/FileMenuFilter.java
	src/com/owncloud/android/files/FileOperationsHelper.java
	src/com/owncloud/android/files/services/FileDownloader.java
	src/com/owncloud/android/files/services/FileUploader.java
	src/com/owncloud/android/operations/SynchronizeFileOperation.java
	src/com/owncloud/android/operations/UploadFileOperation.java
	src/com/owncloud/android/ui/activity/ComponentsGetter.java
	src/com/owncloud/android/ui/activity/ConflictsResolveActivity.java
	src/com/owncloud/android/ui/activity/FileActivity.java
	src/com/owncloud/android/ui/activity/FileDisplayActivity.java
	src/com/owncloud/android/ui/activity/Preferences.java
	src/com/owncloud/android/ui/activity/UploadFilesActivity.java
	src/com/owncloud/android/ui/activity/Uploader.java
	src/com/owncloud/android/ui/adapter/FileListListAdapter.java
	src/com/owncloud/android/ui/fragment/ExtendedListFragment.java
	src/com/owncloud/android/ui/fragment/FileDetailFragment.java
	src/com/owncloud/android/ui/preview/PreviewImageActivity.java
 2015-08-18 15:14:37 +02:00
Andy Scherzinger
e79f92f566 Conflict Dialog Fix 2015-08-18 13:57:09 +02:00
Jorge Antonio Diaz-Benito Soriano
7c19fcdc94 Added error messages for copy action. English only. 2015-08-18 13:44:28 +02:00
Jorge Antonio Diaz-Benito Soriano
fe5b6aa4a8 Added copy action 2015-08-18 13:35:28 +02:00
Andy Scherzinger
a393531774 visual fix for Progress DialogFragment(s) 2015-08-18 13:08:58 +02:00
Andy Scherzinger
b669bd7737 Merge branch 'material_toolbar' of https://github.com/owncloud/android into material_buttons 2015-08-17 16:04:17 +02:00
Andy Scherzinger
ba80646e4e Fix for 4.0 file action context menu (re-implement it via DialogFragment) 2015-08-17 15:58:03 +02:00
Andy Scherzinger
92af92ee3b merged part of the fixes from material buttons branch to fix bugs reported in PR #1076 2015-08-14 17:18:36 +02:00
Andy Scherzinger
7df40c01c8 fixed drawer font size, changed color according to material guide 2015-08-14 16:00:35 +02:00
Andy Scherzinger
abb6e2dbd5 Move to AppCompat AlertDialog for proper rendering on pre-lollipop devices 2015-08-14 15:29:22 +02:00
Andy Scherzinger
c86e92870f fixed padding of list items 2015-08-14 00:34:12 +02:00
Andy Scherzinger
8a8eb435a3 set standard 16dp whitespaces via config values not hardcoded 2015-08-13 18:08:21 +02:00
Andy Scherzinger
af2af7198b Merge branch 'material_toolbar' of https://github.com/owncloud/android into material_buttons 
Conflicts:
	res/layout/ssl_untrusted_cert_layout.xml
	res/layout/ssl_validator_layout.xml
 2015-08-13 15:57:38 +02:00
Andy Scherzinger
60e0f09278 Fix for ssl popups padding, button style changed to borderless, fixed weight on buttons 2015-08-13 15:41:59 +02:00
Andy Scherzinger
f7d6939264 fix for text field focus colors 2015-08-12 19:12:56 +02:00
Andy Scherzinger
05ca0270a8 fixed button style blue/grey 2015-08-12 18:54:27 +02:00
Andy Scherzinger
c085ffd545 inital work on 16dp margin/padding values and material margin/padding values for List items as well as font sizes 2015-08-10 18:32:25 +02:00
Andy Scherzinger
4a4296a07e Material Buttons (draft) 2015-08-07 17:09:47 +02:00
Andy Scherzinger
ddd01569cd Optimized translucence for lollipop on image preview 2015-08-06 19:14:52 +02:00
Andy Scherzinger
6b6227125b added back translucent action bar for image preview 2015-08-06 19:04:22 +02:00
Andy Scherzinger
9d9efd1c1d Merge branch 'develop' of https://github.com/owncloud/android into material_toolbar 
Conflicts:
	owncloud-android-library
 2015-08-06 17:23:02 +02:00
Andy Scherzinger
a257935b8c Bugfix für Lollipop AlertDialog Bug (see styles), moved away from android referenced icon to self-shipped version for design consistency 2015-08-06 17:13:00 +02:00
Andy Scherzinger
1ce7d79ff0 Move alert dialog to material variant and setting the correct accent color for the button texts via styles 2015-08-06 16:27:56 +02:00
purigarcia
91000ba405 change the subject 2015-08-06 10:23:27 +02:00
Andy Scherzinger
97b9932d81 changed color for hint text on login screens to 777 2015-08-05 13:36:12 +02:00
Andy Scherzinger
e36349f77e fixing the progressbar corner glitch, bumping style of indeterminate animation to material style via appcompat, fixing progress bar for folder picker too, see comment 2015-08-04 18:32:33 +02:00
David A. Velasco
156cb5e81b Updated conflict message (same as in web app) 2015-08-04 17:29:42 +02:00
Andy Scherzinger
f7f468b578 extracted color values for download fragment, see comments 172c3f56a3 2015-08-04 17:06:27 +02:00
Andy Scherzinger
10c5498879 extracted text colors for account setup to color.xml, see e72caebbce comments 2015-08-04 16:41:53 +02:00
tobiasKaminsky
1327ce7315 renamed string values 2015-08-04 12:39:56 +02:00
AndyScherzinger
c49fbfb02c adding a new accent color see #1076 comment by @jancborchardt 2015-07-27 16:34:16 +02:00
AndyScherzinger
49b3acd2be added indeterminate progress bar to show activity since this isn't supported by AppCompat anymore 2015-07-26 17:52:29 +02:00
AndyScherzinger
8f401a38d8 redone color changes for login screen 2015-07-26 02:10:51 +02:00
AndyScherzinger
d474239b21 initial material design changes for the action bar 2015-07-26 01:49:27 +02:00
purigarcia
61e6191342 change the name of the method from keepInSync to favorite. Other changes commented in the review 2015-07-22 18:13:45 +02:00
purigarcia
7df9aa7310 add unfavorite option in context menu 2015-07-08 08:50:24 +02:00
purigarcia
ebe5a62f73 change the name from favorites to keep_up_to_date 2015-07-08 08:43:49 +02:00
David A. Velasco
8107d9dc4f Fixed wrong format of files & folder count 2015-06-23 14:40:51 +02:00
David A. Velasco
8c5b2b7b13 Merge remote-tracking branch 'origin/release-1.7.2' into release-1.7.2 2015-06-22 14:56:13 +02:00
David A. Velasco
69a5b6f25d More i18n-friendly format for footer in list of files (no string composition) 
Conflicts FIXED:
	res/values/strings.xml
 2015-06-22 11:42:37 +02:00
masensio
e7710e7383 Update string subject_token and update library reference 2015-06-19 15:11:49 +02:00
masensio
75fd0f40c6 Merge branch 'develop' into forbidden_characters_from_server 
Conflicts:
	owncloud-android-library
	src/com/owncloud/android/ui/dialog/CreateFolderDialogFragment.java
	src/com/owncloud/android/ui/dialog/RenameFileDialogFragment.java
 2015-06-15 14:51:13 +02:00
David A. Velasco
66f3a45d05 Merge branch 'develop' into navigationDrawer_basic 
Conflicts FIXED:
	res/layout/files.xml
 2015-06-15 13:43:17 +02:00
masensio
febe1fef89 Add new string message for forbidden characters controlled by the server 2015-06-02 11:07:34 +02:00
David A. Velasco
0117006313 Fixed update of id.home action bar button on navigation through FileDisplayActivity 2015-06-02 01:00:14 +02:00
purigarcia
916bd5c6ca Merge branch 'develop' into automationTest 2015-05-29 14:17:52 +02:00
David A. Velasco
41b5eb13b1 Merge remote-tracking branch 'origin/navigationDrawer_basic' into navigationDrawer_basic 2015-05-29 13:46:30 +02:00
David A. Velasco
27148acf16 Fixed style in log-in activity; should be Light, as before 2015-05-29 13:30:02 +02:00
masensio
cf535b70f1 Disable 'Accounts' in Navigation Drawer 2015-05-29 11:32:36 +02:00
masensio
c20041d157 Merge branch 'remove_ActionBarSherlock' into navigationDrawer_update 
Conflicts:
	res/menu/main_menu.xml
	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/preview/PreviewImageActivity.java
 2015-05-27 14:19:30 +02:00
masensio
a9dad9e480 Add content_description to Navigation Drawer options 2015-05-26 11:46:15 +02:00
masensio
101989b70c Move 'Logs' from Settings to Navigation Drawer 2015-05-26 09:11:27 +02:00
masensio
015eb6fee9 Disable On Device option in Navigation Drawer 2015-05-26 00:01:39 +02:00
masensio
4f2f0ceb80 Add actionBar 2015-05-25 12:39:05 +02:00
tobiasKaminsky
6d4207a06b Merge remote-tracking branch 'upstream/develop' into navigationDrawer_update 2015-05-21 21:12:44 +02:00
masensio
5f2820355d Merge branch 'develop' into navigation_drawer 
Conflicts:
	src/com/owncloud/android/ui/preview/PreviewImageFragment.java
 2015-05-21 09:46:59 +02:00
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
masensio
a496f08717 Remove actionbarsherlock , replace it with Android Support Library (v7) 2015-05-18 12:59:46 +02:00
masensio
d43fbbac6b [DEV] Remove actionbarsherlock , replace it with Android Support Library (v7) 2015-05-15 11:24:14 +02:00
purigarcia
2d95a83959 Merge branch 'develop' into automationTest 2015-05-11 08:16:43 +02:00
David A. Velasco
47343ca299 Merge pull request #973 from owncloud/delete_share_option_in_app 
Make share feature configurable
 2015-05-08 14:55:07 +02:00
David A. Velasco
fb6047a72c Rename the flag to show my wish that someday the app will allow to share with other users too 2015-05-08 11:17:39 +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
masensio
a41c0b39f2 Add option to turn off share in setup.xml 2015-05-04 14:29:17 +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
68b9744a9c Merge branch 'develop' into automationTest 2015-04-16 09:10:59 +02:00
masensio
7696c08565 Hotfix user_agent 2015-04-09 11:16:13 +02:00