Andy Scherzinger
|
e0a283a876
|
rebase changes with master
|
2016-06-13 21:50:08 +02:00 |
|
Andy Scherzinger
|
593e3e900f
|
proper padding for the choose upload folder buttons
|
2016-06-13 21:50:07 +02:00 |
|
Andy Scherzinger
|
acdd68d775
|
fix background color
|
2016-06-13 21:50:06 +02:00 |
|
Andy Scherzinger
|
74fa10964a
|
implementation of #1193 - optimizing the uploader layout and taking user configured sorting into account
|
2016-06-13 21:50:05 +02:00 |
|
Andy Scherzinger
|
cd0082c5e4
|
proper padding for the choose upload folder buttons
|
2016-06-13 21:49:59 +02:00 |
|
Andy Scherzinger
|
a3359d0a48
|
fix background color
|
2016-06-13 21:49:57 +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
|
e2ec8498b8
|
replaced login icon, reworked login now using card views
|
2016-06-11 18:09:54 +02:00 |
|
jabarros
|
e11eecd2b5
|
Change favorite icon to available offline new one
|
2016-06-01 17:07:13 +02:00 |
|
jabarros
|
a9a944799e
|
Added and changed synchronizing, sync error and successfully synced icons
|
2016-06-01 17:07:13 +02:00 |
|
Sudhir Khanger
|
86a97bf6c3
|
use 4 spaces instead of indents
|
2016-04-29 18:42:51 +02:00 |
|
Sudhir Khanger
|
2cc56ebed3
|
code reformat
|
2016-04-29 18:42:51 +02:00 |
|
Sudhir Khanger
|
dcbe446607
|
capitalize first letter of the folder name
|
2016-04-29 18:42:51 +02:00 |
|
Juan Carlos González Cabrero
|
ac41c8f0f4
|
Remove useless option for colorHint in elements which not need it
|
2016-04-29 12:35:53 +02:00 |
|
Juan Carlos González Cabrero
|
7aa63adbd2
|
Indent button tag
|
2016-04-29 12:35:53 +02:00 |
|
Juan Carlos González Cabrero
|
33b03a8b29
|
Move link of 'new to ownCloud' to the bottom
|
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 |
|
jabarros
|
d387df5ff6
|
Modify share file layout in order to sort 'Share link' settings
|
2016-04-28 11:26:06 +02:00 |
|
jabarros
|
4899d0b851
|
Update UI to hide sections that are disabled according to setup variables
|
2016-04-28 11:26:06 +02:00 |
|
Juan Carlos González Cabrero
|
3fc331b184
|
Modify bottom padding on search view
|
2016-04-21 11:31:48 +02:00 |
|
Andy Scherzinger
|
2eb6303b96
|
#1581 fixed mini fab order in the fab/speed-dial
|
2016-04-21 11:31:48 +02:00 |
|
David A. Velasco
|
01cfbdd166
|
Set dimensions of SamlWebViewDialog to match parent for improved compatibility with adaptive web authenticators
|
2016-04-14 11:25:25 +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 |
|
David A. Velasco
|
9de0ff8cd8
|
Fixed vertical spacing of cells in uploads view
|
2016-03-30 11:07:34 +02:00 |
|
Andy Scherzinger
|
5feba6a567
|
code review + fixed alignments
|
2016-03-22 13:29:23 +01:00 |
|
Andy Scherzinger
|
c96be51151
|
fixed headline for edit share fragment
|
2016-03-22 13:29:23 +01:00 |
|
Andy Scherzinger
|
d893654bc1
|
Fix Headline in share edit and user search
|
2016-03-22 13:29:23 +01:00 |
|
Andy Scherzinger
|
7fe4de73f3
|
search view using AppCompat implementation + layout optimizations
|
2016-03-22 13:29:23 +01:00 |
|
Andy Scherzinger
|
e195cdadd8
|
redone layouting ans AppCompat switch implementation
|
2016-03-22 13:29:23 +01:00 |
|
Andy Scherzinger
|
188be20b4d
|
fixed padding for the password dialog
|
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
|
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 |
|