Commit graph

7207 commits

Author SHA1 Message Date
Mario Đanić
e21c8dcff9 Merge pull request #679 from nextcloud/branding
Branding
2017-03-22 21:21:50 +01:00
Mario Danic
adfb581ef6 Merge branch 'master' into branding 2017-03-22 21:16:12 +01:00
tobiasKaminsky
71ea26df31
remove firebase from branding branch and put it into branch "analytics" 2017-03-22 20:18:37 +01:00
Nextcloud bot
aab88d2f10
[tx-robot] updated from transifex 2017-03-22 01:19:41 +00:00
AndyScherzinger
02e94fb21a
Merge branch 'master' of https://github.com/nextcloud/android into branding 2017-03-21 16:48:42 +01:00
Nextcloud bot
e4da41ecfe
[tx-robot] updated from transifex 2017-03-21 01:19:24 +00:00
Mario Danic
a046fead8f Fix favorites toggle 2017-03-20 00:43:13 +01:00
Mario Danic
62d39e7654 Fix a few favorite things 2017-03-20 00:23:34 +01:00
Mario Danic
d887c08897 Fix loading 2017-03-20 00:18:16 +01:00
Mario Danic
3579c02cee Fix recently modified sort 2017-03-20 00:06:54 +01:00
Mario Danic
171544c6bb Progress on search 2017-03-19 23:47:56 +01:00
Mario Danic
58e1208c51 Store favorites in database 2017-03-19 23:02:36 +01:00
Mario Danic
705ea85060 Work a bit on favorites 2017-03-19 22:12:44 +01:00
AndyScherzinger
ca0f1bbb2d
partial click fix 2017-03-19 14:05:50 +01:00
Mario Danic
59c5eccf6a Grid image favourite focus 2017-03-19 11:18:38 +01:00
Nextcloud bot
81140fae0d
[tx-robot] updated from transifex 2017-03-19 01:19:40 +00:00
Nextcloud bot
0750679f3e
[tx-robot] updated from transifex 2017-03-18 01:19:12 +00:00
Mario Danic
85a37b563f Revert "Update branding setup"
This reverts commit d7161474a2.
2017-03-17 19:09:17 +01:00
Mario Danic
f1dcd38faf Fix gradle 2017-03-17 18:35:17 +01:00
Mario Danic
dd3f303505 Merge branch 'branding' into favourites 2017-03-17 18:28:24 +01:00
Mario Danic
d7161474a2 Update branding setup 2017-03-17 18:28:14 +01:00
Mario Danic
d4af7441fc Merge branch 'branding' into favourites
# Conflicts:
#	build.gradle
#	gradle/wrapper/gradle-wrapper.properties
2017-03-17 18:26:26 +01:00
Mario Danic
105f609a3f Properly remove add account 2017-03-17 17:13:25 +01:00
AndyScherzinger
4077980ea0
Merge branch 'master' of https://github.com/nextcloud/android into branding 2017-03-16 23:09:58 +01:00
Mario Danic
e0a0c503b7 Fix other build 2017-03-16 20:36:11 +01:00
Mario Danic
de29418a76 Fix the build 2017-03-16 18:33:32 +01:00
Mario Danic
8a04689e92 Fix sharing 2017-03-16 18:04:21 +01:00
Nextcloud bot
1f159b65f3
[tx-robot] updated from transifex 2017-03-16 13:59:01 +00:00
Nextcloud bot
8dc5e2a6ac
[tx-robot] updated from transifex 2017-03-16 13:52:59 +00:00
Nextcloud bot
89dbf807a2
[tx-robot] updated from transifex 2017-03-16 13:26:06 +00:00
Nextcloud bot
3450454a79
[tx-robot] updated from transifex 2017-03-16 12:38:06 +00:00
Nextcloud bot
f1ac1c683c
[tx-robot] updated from transifex 2017-03-16 01:19:06 +00:00
Nextcloud bot
3c2c2c9e4f
[tx-robot] updated from transifex 2017-03-15 01:19:16 +00:00
Mario Danic
3c68e865e2 Fix layout issues 2017-03-15 01:18:14 +01:00
Mario Danic
926001bbe7 Hide videos if search isn’t supported 2017-03-15 00:17:17 +01:00
Mario Danic
274aa7e9a8 Fix UI issues 2017-03-15 00:12:17 +01:00
Mario Đanić
f4e17c6941 Merge pull request #732 from M1dgard/remove_newl_tabs
Remove tabs and line breaks from string source
2017-03-15 00:10:47 +01:00
AndyScherzinger
7c1e06bbc8
Merge branch 'favourites' of https://github.com/nextcloud/android into favourites
# Conflicts:
#	src/main/res/layout/grid_item.xml
#	src/main/res/layout/list_item.xml
2017-03-14 23:10:54 +01:00
Mario Danic
3c472d7ccc Fix loading view 2017-03-14 23:06:40 +01:00
Mario Danic
11c199eb2b Add favorite buttons 2017-03-14 23:06:40 +01:00
Mario Danic
5b77f4b702 Fix menu items 2017-03-14 23:06:40 +01:00
Mario Danic
66cf030b39 Sort favorites and recently modified 2017-03-14 23:06:40 +01:00
Mario Danic
cf8a72f992 Continue work 2017-03-14 23:06:40 +01:00
AndyScherzinger
022fc5f712 empty list error icon 2017-03-14 23:06:40 +01:00
AndyScherzinger
66904769a5 empty list video/image icons 2017-03-14 23:06:40 +01:00
AndyScherzinger
fd326c0cb9 menu shared icon 2017-03-14 23:06:40 +01:00
AndyScherzinger
07d308a9a9 updated vector 2017-03-14 23:06:40 +01:00
AndyScherzinger
d79c90ac89 shared icon 2017-03-14 23:06:40 +01:00
AndyScherzinger
0252cb4091 recent icon 2017-03-14 23:06:40 +01:00
AndyScherzinger
67061c89fc home icon 2017-03-14 23:06:40 +01:00