Commit graph

2279 commits

Author SHA1 Message Date
Tobias Kaminsky
be6f189f30 Merge pull request #235 from nextcloud/fixRemoteFolderSize
Restore display of remote folder size
2016-09-03 20:26:08 +02:00
tobiasKaminsky
77f9902f17 Merge remote-tracking branch 'remotes/origin/master' into uploadWhenCharging 2016-09-03 20:10:51 +02:00
Nextcloud bot
d75f5e7bfc
[tx-robot] updated from transifex 2016-09-03 00:33:49 +00:00
Nextcloud bot
14846586b8
[tx-robot] updated from transifex 2016-09-02 00:33:53 +00: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
303b05a3a6 Merge pull request #204 from nextcloud/quotaDisplay
Display quota if configured/available in navigation drawer
2016-09-01 11:03:14 +02:00
Nextcloud bot
2326d4b32a
[tx-robot] updated from transifex 2016-09-01 00:34:00 +00:00
Andy Scherzinger
457027a196 fixed the background color 2016-08-18 15:55:11 +02:00
Andy Scherzinger
0f80bdc894 CR changes 2016-08-18 15:55:11 +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
Nextcloud bot
c2f3519648
[tx-robot] updated from transifex 2016-08-17 00:33:47 +00: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
1c874aafec add background image to drawer header 2016-08-14 22:32:41 +02:00
Nextcloud bot
53c360e149
[tx-robot] updated from transifex 2016-08-12 00:33:49 +00:00
Nextcloud bot
283b5cb77b
[tx-robot] updated from transifex 2016-08-09 00:33:50 +00:00
Nextcloud bot
ffd198dc79
[tx-robot] updated from transifex 2016-08-06 00:33:48 +00:00
Nextcloud bot
f0e1f77fc0
[tx-robot] updated from transifex 2016-08-05 00:33:49 +00:00
Nextcloud bot
6e78cc7e33
[tx-robot] updated from transifex 2016-08-04 00:33:48 +00:00
Andy Scherzinger
5518e8257e hide non-primary action menu items in overflow menu 2016-08-03 19:20:44 +02:00
Andy Scherzinger
b869538846 added description and went for ifRoom 2016-08-03 19:20:44 +02:00
Andy Scherzinger
14be68d4b1 fix UI behavior for filtering in upload view 2016-08-03 19:20:44 +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
Nextcloud bot
a05957125c
[tx-robot] updated from transifex 2016-08-03 00:33:53 +00:00
Nextcloud bot
9bdf13e801
[tx-robot] updated from transifex 2016-08-02 00:33:56 +00:00
Andy Scherzinger
9ce3297f65 Merge pull request #162 from nextcloud/renameInstantUploadPath
rename instant upload path
2016-08-01 14:47:07 +02:00
Nextcloud bot
b5cf7ab074
[tx-robot] updated from transifex 2016-08-01 00:33:52 +00:00
Nextcloud bot
7c2c537bad
[tx-robot] updated from transifex 2016-07-31 00:33:50 +00: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
Nextcloud bot
6bf6981a41
[tx-robot] updated from transifex 2016-07-30 00:33:42 +00:00
Nextcloud bot
9e406be4ff
[tx-robot] updated from transifex 2016-07-29 00:33:48 +00:00
tobiasKaminsky
eff2aa1971 rename instant upload path 2016-07-28 19:09:46 +02:00
Nextcloud bot
0626040e7b
[tx-robot] updated from transifex 2016-07-27 00:33:55 +00:00
Nextcloud bot
6c887b41b4
[tx-robot] updated from transifex 2016-07-26 00:33:52 +00:00
Nextcloud bot
5cfaa5ec02
[tx-robot] updated from transifex 2016-07-25 00:33:45 +00:00
Nextcloud bot
8876f52c4d
[tx-robot] updated from transifex 2016-07-24 00:33:49 +00:00
Nextcloud bot
ca0e550059
[tx-robot] updated from transifex 2016-07-23 00:33:47 +00:00
Nextcloud bot
00d4403326
[tx-robot] updated from transifex 2016-07-22 00:33:50 +00:00
Andy Scherzinger
e865658f62 corrected paddings/margin to material design 16/8 dp 2016-07-21 13:45:43 +02:00
Andy Scherzinger
55c0dcc3b0 Merge pull request #61 from nextcloud/multiSelectNew
Multi Select
2016-07-21 13:02:27 +02:00
Nextcloud bot
9ef0c18e81
[tx-robot] updated from transifex 2016-07-21 00:33:56 +00:00
Andy Scherzinger
62c918f59a Merge 'master' including conflict fixing
Conflicts:
	src/com/owncloud/android/ui/adapter/FileListListAdapter.java
	src/com/owncloud/android/ui/fragment/OCFileListFragment.java
2016-07-20 15:26:59 +02:00
Andy Scherzinger
1876746481 Merge pull request #36 from nextcloud/video_thumbnail
Video thumbnail
2016-07-20 15:20:26 +02:00
Andy Scherzinger
2af26edb0b Merge branch 'master' of https://github.com/nextcloud/android into multiSelectNew
Conflicts:
	res/values-ca/strings.xml
	res/values-he/strings.xml
	res/values-hu-rHU/strings.xml
	res/values-ja-rJP/strings.xml
	res/values-ko/strings.xml
	res/values-lb/strings.xml
	res/values-lt-rLT/strings.xml
	res/values-pl/strings.xml
	res/values-pt-rPT/strings.xml
	res/values-th-rTH/strings.xml
	res/values-tr/strings.xml
2016-07-20 13:19:41 +02:00
Andy Scherzinger
ecf1f9e3da proper status bar coloring for multi select mode, cleanup logging 2016-07-20 13:09:56 +02:00
Nextcloud bot
22b9ad807c
[tx-robot] updated from transifex 2016-07-20 00:33:48 +00:00
Nextcloud bot
7f9cf817a7
[tx-robot] updated from transifex 2016-07-19 00:33:47 +00:00
Andy Scherzinger
2bfb1b6903 fixed overlay bug with toolbar 2016-07-18 17:38:02 +02:00
Nextcloud bot
5ef50c6658
[tx-robot] updated from transifex 2016-07-18 13:28:56 +00:00
tobiasKaminsky
e714707754 textPreview is selectable 2016-07-16 09:08:52 +02:00
tobiasKaminsky
ff32763024 update to master 2016-07-15 20:15:59 +02:00
tobiasKaminsky
98a679548a Merge remote-tracking branch 'remotes/origin/master' into multiSelectNew 2016-07-15 18:32:56 +02:00
tobiasKaminsky
411e5392bc Merge remote-tracking branch 'remotes/origin/master' into video_thumbnail 2016-07-15 18:05:05 +02:00
Andy Scherzinger
fca1e0d2fd added line breaks according to CR 2016-07-14 23:31:48 +02:00
Andy Scherzinger
956edc5e7a use nextcloud trashbin icon 2016-07-14 23:31:47 +02:00
Bartosz Przybylski
6ad28b5250 change close icon to delete icon 2016-07-14 23:31:47 +02:00
Bartosz Przybylski
098cf7dd46 Add confirmation dialog on account deletion 2016-07-14 23:31:46 +02:00
Andy Scherzinger
f1e2f1151b recovered icon after rebase 2016-07-14 22:45:29 +02:00
Andy Scherzinger
1119702fe2 cleanup iconwork 2016-07-14 22:43:19 +02:00
Andy Scherzinger
55e088e33a renamed icon, fixed string ref for Uploads drawer item 2016-07-14 22:43:19 +02:00
Andy Scherzinger
9c76e2828c proper on device icon 2016-07-14 22:42:24 +02:00
Andy Scherzinger
d1f9cae7f4 cleanup, accounts is handled differently with latest implementation (housekeeping here) 2016-07-14 22:42:23 +02:00
Andy Scherzinger
a33a03a928 adaption after rebase to switch between all/offline files 2016-07-14 22:42:23 +02:00
Andy Scherzinger
2a7ce555b9 fixed icon (+naming) to use resolution depended icon and don't scale 2016-07-14 22:42:20 +02:00
Andy Scherzinger
6e2a6326f0 download icon 2016-07-14 22:42:20 +02:00
tobiasKaminsky
a1d3a10146 add missing file 2016-07-14 22:42:19 +02:00
tobiasKaminsky
9d74b7e223 enabled all occurrences. 2016-07-14 22:42:18 +02:00
Andy Scherzinger
d00893c66a Merge pull request #124 from nextcloud/sortInUploadFilesActivity
Sort in upload files activity
2016-07-14 22:38:04 +02:00
Andy Scherzinger
19b711f2d8 cleanup menus 2016-07-14 14:48:22 +02:00
tobiasKaminsky
4c20679538 add sort to UploadFileActiviy 2016-07-14 14:31:46 +02:00
Andy Scherzinger
ef031c6c65 further icon fixed and completion of all custom/internal icons, so no references to OS version specific icon works anymore 2016-07-14 14:12:34 +02:00
Andy Scherzinger
61855fa179 added missing sort variant icon sizes 2016-07-14 12:59:44 +02:00
Andy Scherzinger
8f6c7eeb1d icon housekeeping: mdpi->24dp sizing, added missing warning icon 2016-07-14 10:58:23 +02:00
Andy Scherzinger
758bf3ba05 icon housekeeping: hdpi->24dp sizing, removal of unused icon work 2016-07-14 10:52:27 +02:00
tobiasKaminsky
6c1deae1a2 use size computed by server 2016-07-13 11:04:43 +02:00
David A. Velasco
5fdd54fc11 Added set/unset available offline action icons for tablets ignoring 'showAsAction=never' when action is the only one in the overflow menu 2016-07-12 19:26:43 +02:00
David A. Velasco
899bfd414a Updated download action icon to diff from available offline status 2016-07-12 19:26:43 +02:00
David A. Velasco
c86b0c5c6b No legacy icon in action bar 2016-07-12 15:31:49 +02:00
David A. Velasco
25f623be8f New 'move' icon; fixed hdpi, mdpi icons 2016-07-12 15:31:48 +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
David A. Velasco
fae65e5b1e Revert changes in translated string resources.
This reverts part of commit f44c74033527c2c3b36b552cca7519e7ec3b13ce.
2016-07-09 19:47:25 +02:00
Nextcloud bot
6a3e94e12a
[tx-robot] updated from transifex 2016-07-07 20:44:54 +00:00
Jan-Christoph Borchardt
a4dabfb3df Merge pull request #89 from nextcloud/launcherIcon
New launcher icon
2016-07-04 15:21:08 +02:00
Andy Scherzinger
fdf0e0510e fixed Google Play link 2016-07-02 19:59:30 +02:00
Andy Scherzinger
bd11c2052a fixed padding 2016-07-02 19:05:08 +02:00
Andy Scherzinger
339d37fe7a revamped launcher icon 2016-07-02 19:05:07 +02:00
tobiasKaminsky
1edc488995 Merge remote-tracking branch 'remotes/origin/master' into video_thumbnail 2016-07-02 17:49:16 +02:00
tobiasKaminsky
77573a3535 new feedback email address
url help adjusted
2016-07-01 17:46:25 +02:00
Andy Scherzinger
ab136a14a3 Merge branch 'multiSelect' of https://github.com/owncloud/android into multiSelectNew
Conflicts:
	build.gradle
	oc_jb_workaround/build.gradle
	owncloud-android-library
	res/layout/uploader_layout.xml
	res/layout/uploader_list_item_layout.xml
	res/menu/file_actions_menu.xml
	res/values/setup.xml
	src/com/owncloud/android/authentication/AuthenticatorActivity.java
	src/com/owncloud/android/db/PreferenceManager.java
	src/com/owncloud/android/files/FileMenuFilter.java
	src/com/owncloud/android/files/FileOperationsHelper.java
	src/com/owncloud/android/ui/activity/FolderPickerActivity.java
	src/com/owncloud/android/ui/adapter/FileListListAdapter.java
	src/com/owncloud/android/ui/fragment/ExtendedListFragment.java
2016-06-30 15:11:34 +02:00
Andy Scherzinger
5d7c1f31e7 new open in app icon during multi select 2016-06-30 10:53:57 +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
d6e31a20d5 fix progressbar within toolbar 2016-06-25 16:27:27 +02:00