mirrors/nextcloud-android
1
0
Fork 0
mirror of https://github.com/nextcloud/android.git synced 2024-12-21 00:12:05 +03:00
Code Issues Projects Releases Packages Wiki Activity
6267 commits 220 branches 1587 tags 639 MiB
Commit graph

759 commits

Author SHA1 Message Date
Andy Scherzinger
e45816a5ed fix string arrays, so n.o. elements doesn't depend on translation status, make upload spinner translatable 2016-09-06 16:17:14 +02:00
tobiasKaminsky
1ad97d9ff7 move / copy updated 2016-09-06 14:46:03 +02:00
tobiasKaminsky
90f582105f show compatibility warning 2016-09-06 10:36:07 +02:00
tobiasKaminsky
1ace509e4f wip 2016-09-06 10:36:07 +02:00
Andy Scherzinger
32be5dfeb3 Merge pull request #171 from nextcloud/uploadWhenCharging 
Upload when charging
 2016-09-04 19:12:44 +02:00
tobiasKaminsky
77f9902f17 Merge remote-tracking branch 'remotes/origin/master' into uploadWhenCharging 2016-09-03 20:10:51 +02:00
Andy Scherzinger
70e8f62581 Added 'Pending' placeholder for still-unknown size of incoming federated folders 2016-09-01 14:42:55 +02:00
Andy Scherzinger
5280d66139 colorize quota progress bar depending on thresholds met, reformattings 2016-08-18 15:55:11 +02:00
Andy Scherzinger
f8e0ee9ce1 initial quota display implementation 2016-08-18 15:55:11 +02:00
Andy Scherzinger
e790d4a520 initial layout changes for in drawer quota display 2016-08-18 15:55:11 +02:00
Andy Scherzinger
aa98938a55 textfile --> text file 2016-08-16 11:58:42 +02:00
tobiasKaminsky
993264c8b1 wip 2016-08-16 11:58:42 +02:00
Andy Scherzinger
4c6f1c0faa correct search view UI-behavior 2016-08-03 19:20:44 +02:00
tobiasKaminsky
a3a6420ead filter for oc file list and local file list 2016-08-03 19:20:44 +02:00
tobiasKaminsky
ac695b7444 fix sharing for beta 2016-07-30 18:38:21 +02:00
tobiasKaminsky
9587af3e9d Merge remote-tracking branch 'remotes/origin/master' into uploadWhenCharging 2016-07-30 16:56:44 +02:00
tobiasKaminsky
eff2aa1971 rename instant upload path 2016-07-28 19:09:46 +02:00
Andy Scherzinger
2bfb1b6903 fixed overlay bug with toolbar 2016-07-18 17:38:02 +02:00
tobiasKaminsky
98a679548a Merge remote-tracking branch 'remotes/origin/master' into multiSelectNew 2016-07-15 18:32:56 +02:00
Andy Scherzinger
fca1e0d2fd added line breaks according to CR 2016-07-14 23:31:48 +02:00
Bartosz Przybylski
098cf7dd46 Add confirmation dialog on account deletion 2016-07-14 23:31:46 +02:00
Andy Scherzinger
d1f9cae7f4 cleanup, accounts is handled differently with latest implementation (housekeeping here) 2016-07-14 22:42:23 +02:00
tobiasKaminsky
9d74b7e223 enabled all occurrences. 2016-07-14 22:42:18 +02:00
tobiasKaminsky
6c1deae1a2 use size computed by server 2016-07-13 11:04:43 +02:00
Andy Scherzinger
73013210a3 revert user agent due to server side checks 2016-07-12 14:50:43 +02:00
David A. Velasco
db6acc6868 Clean-up and small refactorings 
Conflicts:
	src/com/owncloud/android/files/FileOperationsHelper.java
	src/com/owncloud/android/ui/fragment/ExtendedListFragment.java
 2016-07-09 19:49:37 +02:00
Andy Scherzinger
fdf0e0510e fixed Google Play link 2016-07-02 19:59:30 +02:00
tobiasKaminsky
77573a3535 new feedback email address 
url help adjusted
 2016-07-01 17:46:25 +02:00
Marius Blüm
36b24a9673 Merge pull request #75 from nextcloud/loginLayout 
Slight design optimizations for the login screen #22
 2016-06-27 18:52:53 +02:00
Andy Scherzinger
bc94cbf631 login button colors changed 2016-06-27 16:36:45 +02:00
Andy Scherzinger
c875bbace1 Merge pull request #35 from nextcloud/feature_uploadsubfolders 
Feature uploadsubfolders
 2016-06-27 10:45:41 +02:00
Andy Scherzinger
718fec0935 remove card view, change edit text and icon coloring 2016-06-26 22:59:28 +02:00
Andy Scherzinger
bd7a50aabc add constants for margins and use different placeholder 2016-06-25 16:27:23 +02:00
Andy Scherzinger
5c88b03721 List divider Fix 2016-06-25 16:27:21 +02:00
Andy Scherzinger
993a681cf8 fixed size differences of generated and image based avatars 2016-06-25 16:27:18 +02:00
Andy Scherzinger
dfe15c4b00 set navigation view menu icon size for avatars according to Google's guidelines: 14sp 2016-06-25 16:27:15 +02:00
Andy Scherzinger
86dc83a96a ellipsized superlong username in the dropdown list 2016-06-25 16:27:14 +02:00
Andy Scherzinger
cf158abbb6 aligned management screen with material design sizings 2016-06-25 16:27:13 +02:00
Andy Scherzinger
ff75f71836 move avatar helper method to TextDrawable, define everything in dp to be independent 2016-06-25 16:27:12 +02:00
Andy Scherzinger
aed4b6f7ea color fix for EditText (due to wrong parent style) 2016-06-25 16:27:11 +02:00
Andy Scherzinger
56e84a2c7f Fix for dynamic avatar sizing for generic letter/circle avatars 2016-06-25 16:27:10 +02:00
Andy Scherzinger
583dca5cbc rudimentary drawer header / avatar based account switching. 2016-06-25 16:27:10 +02:00
tobiasKaminsky
8dbb5b6305 wip 
Conflicts:
	res/layout/drawer.xml
	src/com/owncloud/android/ui/activity/FileActivity.java
	src/com/owncloud/android/ui/activity/FileDisplayActivity.java
 2016-06-25 16:27:08 +02:00
Andy Scherzinger
acf77ddc04 standard header layouting, flexible avatar radius, code cleanups, dynamic avatar sizing 2016-06-25 16:27:06 +02:00
Andy Scherzinger
b60e1828e2 removed now unused drawer resource file due to new implementation 2016-06-25 16:27:05 +02:00
Andy Scherzinger
f41e567b90 general menu/account list switch implemented (open: populate account list) 2016-06-25 16:26:47 +02:00
Andy Scherzinger
ce803aa4e0 initial (functionless) account switcher for the drawer header and display size depending header sizing 2016-06-25 16:26:46 +02:00
Andy Scherzinger
ed33c0aff4 initial rewrite to make use of the toolbar 2016-06-25 16:26:44 +02:00
tobiasKaminsky
1183e51c19 Merge remote-tracking branch 'owncloud/multiSelect' into multiSelectOwncloud 
# Conflicts:
#	res/drawable-hdpi/ic_checkbox_marked.png
#	res/drawable-mdpi/ic_checkbox_marked.png
#	res/drawable-xhdpi/ic_checkbox_marked.png
#	res/drawable-xxhdpi/ic_checkbox_marked.png
#	res/layout/grid_image.xml
#	res/values/strings.xml
#	src/com/owncloud/android/notifications/NotificationBuilderWithProgressBar.java
#	src/com/owncloud/android/ui/activity/FileDisplayActivity.java
#	src/com/owncloud/android/ui/adapter/FileListListAdapter.java
#	src/com/owncloud/android/ui/dialog/RemoveFileDialogFragment.java
#	src/com/owncloud/android/ui/fragment/OCFileListFragment.java
 2016-06-23 21:10:58 +02:00
Andy Scherzinger
f73f78fb28 Merge pull request #55 from nextcloud/setupScreenImprovement 
Update welcome url, fixes #16
 2016-06-23 11:06:01 +02:00
Andy Scherzinger
207801c000 Update welcome url, fixes #16 2016-06-22 19:14:19 +02:00
Andy Scherzinger
2c256bf53d added the ability to select all within a folder for upload - selection is discarded when navigating folders 2016-06-22 16:43:23 +02:00
Bartosz Przybylski
db7a4641c2 Add documents provider 2016-06-20 22:15:02 +02:00
Timo Witte
f68b53ba61 introduce upload subfolders configuration variable 2016-06-19 16:43:12 +02:00
Andy Scherzinger
944af7e62b code review plus fixed for the layouts and data to be displayed 
now all file list view (uploader, upload external and standard file list have the same layout)
 2016-06-13 21:50:11 +02:00
Andy Scherzinger
cecab96b2f implementation of #1193 - optimizing the uploader layout and taking user configured sorting into account 2016-06-13 21:49:57 +02:00
Andy Scherzinger
3521017fb3 configure nc again 2016-06-09 19:15:52 +02:00
Andy Scherzinger
8b0bab8feb nextcloud logo for login 2016-06-08 16:46:31 +02:00
Andy Scherzinger
1533c6b52c corresponding primary dark color 2016-06-08 16:17:43 +02:00
tobiasKaminsky
1147778794 allow nextcloud to be parallel to owncloud 2016-06-07 21:58:37 +02:00
Andy Scherzinger
105541c4b0 moved to a brighter accent color 2016-06-07 12:11:05 +02:00
Andy Scherzinger
567375e860 initial color changed to nextcloud blue 2016-06-07 10:31:12 +02:00
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