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
5217 commits 221 branches 1585 tags 636 MiB
Commit graph

502 commits

Author SHA1 Message Date
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
55fdcee912 New switch in share via link to allow editing 2016-03-21 09:31:34 +01:00
David A. Velasco
772d640bc8 Fixed status message in uploads view 2016-03-16 19:17:01 +01:00
David A. Velasco
259c94a45b Merge branch 'master' into reliable_uploads_actions_uploads_view 2016-03-15 09:48:12 +01:00
Andy Scherzinger
1df0587ce3 fixed alignment of upload list elements 2016-03-14 16:11:45 +01:00
Thomas Müller
ea2fe8cb4e Merge pull request #1399 from owncloud/uploadShowsFiles_Master 
Upload shows files
 2016-03-09 13:10:53 +01:00
David A. Velasco
b2c81d3b08 Merge pull request #1100 from owncloud/material_fab 
Material FAB with speed dial implementation
 2016-03-09 08:38:33 +01:00
David A. Velasco
0117123335 Set same color for normal state of FAB and 'primary buttons' 2016-03-08 17:11:59 +01:00
David A. Velasco
ec9b705536 Wording and padding fixes in uploads list 2016-03-08 13:17:55 +01:00
Andy Scherzinger
6c83af4521 using color_accent instead of internal owncloud color reference 2016-03-02 11:36:45 +01:00
Andy Scherzinger
2d0fc03ef0 remove divider according to #1428 2016-03-01 15:37:32 +01:00
masensio
8006c893f9 Clean code, from uploads view implementation 2016-02-26 14:15:42 +01:00
Andy Scherzinger
8bf7c22ad7 fix for scrolling beyond the fab see #1346 2016-02-25 18:15:01 +01:00
Andy Scherzinger
d4ce0d920f hide FAB in copy/move folder chooser 2016-02-25 18:07:49 +01:00
Andy Scherzinger
be421ce04d don't show labels all the time just during the first usage and application lifecycle. When the app is restarted the labels then won't show again. 2016-02-25 18:07:42 +01:00
Andy Scherzinger
e8c64ebf8d initial implementaion for click events + using the import icon for upload from other apps, also fixed the checkboxes for hdpi/mdpi 2016-02-25 18:07:28 +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
87076468da New resolution for ic_cancel icon 2016-02-22 14:09:56 +01:00
David A. Velasco
82b0b7a84f Merge branch 'master' into reliable_uploads_actions_uploads_view 2016-02-15 14:59:04 +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
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
da0d98629c Merge remote-tracking branch 'remotes/upstream/master' into uploadShowsFiles_Master 2016-02-02 21:05:16 +01:00
masensio
9c57aafab5 Review appereance of Uploads View 2016-01-27 13:59:51 +01:00
David A. Velasco
628e713268 Update model changed: permission updates are requested to the server as soon as the user changes any value 2016-01-20 18:18:14 +01:00
masensio
b353ed62cd Show thumbnail or file icon depending on the file type in Uploads view 2016-01-20 18:06:35 +01:00
masensio
2c4daf3a93 Update the status of current upload when it finishes 2016-01-20 11:19:43 +01:00
masensio
6f58527273 Update progress bar for Current Upload 2016-01-19 17:32:50 +01:00
David A. Velasco
81b8918939 Fixed color of 'stop sharing' button in Android 4.x 2016-01-13 14:23:50 +01:00
David A. Velasco
e4078a5734 Added scroll to permissions editor to grant usability in landscape 2016-01-13 13:43:07 +01:00
masensio
990f16ca47 Add drawe access from uploads view 2016-01-12 14:16:22 +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
tobiasKaminsky
021fe9d14b changes according to CR 2016-01-10 20:17:21 +01:00
tobiasKaminsky
b2ae3fa467 Merge remote-tracking branch 'remotes/upstream/master' into uploadShowsFiles 2015-12-31 13:26:36 +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
dee7c33235 Added style to buttons in share_file_layout and centered refresh button in account_setup 2015-12-17 16:58:47 +01:00
David A. Velasco
d5c4d7ab92 Changes from code review 2015-12-17 15:49:55 +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
a2b680edd0 Merge branch 'reliable_uploads' into reliable_uploads_actions_uploads_view 2015-12-10 17:35:32 +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
David A. Velasco
f5369ac4b2 Hide UI elements about public share when this is disabled in the server 2015-11-25 09:32:31 +01:00
masensio
3087a3af3e Review padding values for expiration date and password rows in share view 2015-11-25 09:32:28 +01:00
masensio
030eaffcfc List view is shown completelly on the ShareFileFragment 2015-11-25 09:32:27 +01:00
David A. Velasco
f1b3208f1a Updated ShareFileFragment layout with extra section for public shares 2015-11-25 09:32:15 +01:00
David A. Velasco
a39c857680 Removed unneeded FrameLayout 2015-11-25 09:32:14 +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
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
2cfc7237ea correct text field names 2015-11-02 15:26:00 +01:00
Andy Scherzinger
90097b107d typos fixed 2015-11-02 12:22:49 +01:00
Andy Scherzinger
efdcb97963 setting divider color to #eee as decided by @jancborchardt 2015-11-02 12:05:52 +01:00
Andy Scherzinger
6e54dfc55c flipped size and mod date 2015-11-02 08:40:18 +01:00
masensio
f1bd33ce00 Fix: Having the device in landscape current shared users are not shown. Redimension 'Share with' dialog 2015-10-30 16:53:06 +01:00
masensio
f8548b49f1 Delete search_user_item.xml 2015-10-30 16:48:33 +01:00
masensio
671fef617b Show users/groups in Search Fragment list 2015-10-30 16:48:31 +01:00
masensio
b3dc5f477c Show 'Add Users or Groups' button properly 2015-10-30 16:47:31 +01:00
masensio
fff362d103 Add unshare with user option to share with view 2015-10-30 16:28:37 +01:00
masensio
20b0ec8977 Show users/groups in share with view, getting the data from the server 2015-10-30 16:26:26 +01:00
masensio
00a221ea8f Remove android.support.widget components from the sharewith view. Waiting for introducing Floating button in the project 2015-10-30 16:25:54 +01:00
David A. Velasco
0db4fc9b17 Sync user and group shares into database 2015-10-30 16:25:52 +01:00
masensio
905b68b4ec Show the 'search' layout in phone and tablet 2015-10-30 15:23:03 +01:00
masensio
2855a81cf0 Create the layout for searching users/groups 2015-10-30 15:22:58 +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
Andy Scherzinger
5c1e6e59ba Merge branch 'master' of https://github.com/owncloud/android into material_buttons 2015-10-22 13:05:06 +02:00
Andy Scherzinger
dffd81e00c removed primary color usage for textColor of the input fields on the loginscreen 2015-10-21 11:31:58 +02:00
Andy Scherzinger
e61641b39d center align radio buttons 2015-10-21 11:05:11 +02:00
tobiasKaminsky
e18773465d Merge remote-tracking branch 'remotes/upstream/master' into uploadShowsFiles 2015-10-15 18:27:07 +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
Andy Scherzinger
917039411c added a divider to the bottom part 2015-09-27 20:43:18 +02:00
Andy Scherzinger
2ffdb4db00 16dp right and left for checkpoxed 2015-09-27 20:32:44 +02:00
tobiasKaminsky
57862ef52c added 16dp padding 2015-09-25 17:30:30 +02:00
Andy Scherzinger
5417b2a4e5 Merge branch 'release-1.8' of https://github.com/owncloud/android into material_buttons 2015-09-25 16:09:01 +02:00
David A. Velasco
c44ed4980c Fixed lost background color for icon in login view 2015-09-25 11:11:46 +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
a64308f382 wip 2015-09-21 09:03:09 +02:00
tobiasKaminsky
a1b2655d85 wip 2015-09-21 08:57:00 +02:00
Andy Scherzinger
f6b2b856cb Fixed the jumping text on refreshed (status text), aligned the margin of the url field for landscape/portrait, fixed the refresh icon size on landscape - also fixes #192 2015-09-17 11:46:37 +02:00
Andy Scherzinger
044c597e2b fix for refresh bug 2015-09-16 17:21:53 +02:00
Andy Scherzinger
94bc0699ac Merge branch 'master' of https://github.com/owncloud/android into material_buttons 
fixed realignment item badges
Conflicts:
	res/layout/list_item.xml
 2015-09-16 16:27:47 +02:00
Andy Scherzinger
4c0371f82b center aligned the folder icon with the drawer icon 2015-09-16 11:41:37 +02:00
Andy Scherzinger
13a73dd568 Merge branch 'master' of https://github.com/owncloud/android into material_buttons 2015-09-11 12:47:01 +02:00
Andy Scherzinger
e9f793755e showing the filename in the long press menu on file list, see #559 2015-09-07 12:24:01 +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
Andy Scherzinger
e7674368e2 fix duplicate 2015-09-04 13:24:12 +02:00
Andy Scherzinger
7ac2a0d297 fix layout/uploader_layout.xml 2015-09-04 13:20:41 +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
masensio
3b2c61a48c Merge branch 'master' into uploadShowsFiles 
Conflicts:
	res/layout/uploader_layout.xml
	res/layout/uploader_list_item_layout.xml
	src/com/owncloud/android/ui/activity/Uploader.java
 2015-09-02 16:45:33 +02:00
masensio
a0707428ff Merge remote-tracking branch 'origin/master' into text_file_preview_pr_707_with_develop 
Conflicts:
	res/layout/file_preview.xml
	src/com/owncloud/android/ui/activity/FileDisplayActivity.java
 2015-09-02 13:23:42 +02:00
masensio
b81de1d547 Merge branch 'master' into create_folder_button_on_action_bar_for_uploader 
Conflicts:
	res/layout/uploader_layout.xml
 2015-08-25 14:53:42 +02:00
tobiasKaminsky
8e3787909f Merge branch 'develop' of github.com:owncloud/android into svgTransparentBackground 2015-08-21 17:48:58 +02:00
Andy Scherzinger
fd39e9168b replaced the icons and header coloring 2015-08-21 17:32:24 +02:00