Commit graph

2211 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
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
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