Commit graph

2381 commits

Author SHA1 Message Date
AndyScherzinger
bf326394ef
move to new project structure 2017-03-26 15:56:31 +02:00
tobiasKaminsky
2cbdddffc3
add image for downloading nightly
fix url
2017-03-26 15:56:25 +02:00
tobiasKaminsky
354e008665
showing introduction screen is now customizable by setup.xml, enabled by default 2017-03-26 15:32:40 +02:00
Andy Scherzinger
7a899b0737 Merge pull request #753 from nextcloud/login-branding
Login branding
2017-03-26 15:28:39 +02:00
Nextcloud bot
321d316d4b
[tx-robot] updated from transifex 2017-03-26 04:08:59 +00:00
AndyScherzinger
22a2f92909
id 2017-03-26 01:34:11 +01:00
AndyScherzinger
53e67c431e
fix codacy warnings and formatting 2017-03-26 01:34:11 +01:00
Mario Danic
96e8e16829
Remove hint from land 2017-03-26 01:34:10 +01:00
Mario Danic
e6adc4fd95
Add support for various server types 2017-03-26 01:34:10 +01:00
Mario Danic
bd16eb7146
Partly works 2017-03-26 01:34:10 +01:00
AndyScherzinger
d84ff3917c
Merge branch 'master' of https://github.com/nextcloud/android into favourites
# Conflicts:
#	build.gradle
2017-03-26 01:20:57 +01:00
AndyScherzinger
bfe6dbe80a
move files for new project structure 2017-03-26 00:51:28 +01:00
Mario Danic
f4ab569226
Implement user information magic 2017-03-26 00:51:09 +01:00
Mario Danic
38f1cc0e28
First bits of user info code 2017-03-26 00:51:07 +01:00
Mario Danic
a8ed34fe97 Fix list view clicks 2017-03-24 19:12:37 +01:00
Mario Danic
0d24f87717 Merge branch 'master' into favourites
# Conflicts:
#	src/main/java/com/owncloud/android/ui/fragment/OCFileListFragment.java
2017-03-24 09:44:50 +01:00
Mario Danic
adfb581ef6 Merge branch 'master' into branding 2017-03-22 21:16:12 +01:00
AndyScherzinger
02e94fb21a
Merge branch 'master' of https://github.com/nextcloud/android into branding 2017-03-21 16:48:42 +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
Mario Danic
85a37b563f Revert "Update branding setup"
This reverts commit d7161474a2.
2017-03-17 19:09: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
AndyScherzinger
4077980ea0
Merge branch 'master' of https://github.com/nextcloud/android into branding 2017-03-16 23:09:58 +01:00
Mario Danic
8a04689e92 Fix sharing 2017-03-16 18:04:21 +01:00
Mario Danic
3c68e865e2 Fix layout issues 2017-03-15 01:18:14 +01:00
Mario Danic
274aa7e9a8 Fix UI issues 2017-03-15 00:12:17 +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
11c199eb2b Add favorite buttons 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
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
Mario Danic
c29075ee47 Progress on all fronts 2017-03-14 23:06:40 +01:00
Mario Danic
49c01f1d74 Significant progress on various things 2017-03-14 23:06:40 +01:00
Mario Danic
beba6ca11e Some progress on search 2017-03-14 23:05:51 +01:00
AndyScherzinger
565aa84655 empty view star icon 2017-03-14 23:05:51 +01:00
AndyScherzinger
8a2b838f4e missing xxhdpi favorite icon 2017-03-14 23:05:51 +01:00
AndyScherzinger
b1a2934bec xxxhdpi favorite icons 2017-03-14 23:05:51 +01:00
AndyScherzinger
fcc5a816f8 grey star icon (80% opacity) 2017-03-14 23:05:51 +01:00
Mario Danic
f0249be463 Fix search users 2017-03-14 22:59:35 +01:00
AndyScherzinger
712b2f98dc
fix click event hadling via setting focusable attribute right 2017-03-14 22:45:59 +01:00
Mario Danic
aa53f63197
Add favorite buttons 2017-03-14 21:59:28 +01:00
Mario Danic
3058682268
Continue work 2017-03-14 21:59:27 +01:00
AndyScherzinger
4af76bccee
empty list error icon 2017-03-14 21:59:26 +01:00
AndyScherzinger
ba9d8da85f
empty list video/image icons 2017-03-14 21:59:26 +01:00
AndyScherzinger
ad5de57454
menu shared icon 2017-03-14 21:59:26 +01:00
AndyScherzinger
5b4624025a
shared icon 2017-03-14 21:59:25 +01:00
AndyScherzinger
8e0810b9d9
recent icon 2017-03-14 21:59:25 +01:00
AndyScherzinger
eed3995721
home icon 2017-03-14 21:59:24 +01:00
Mario Danic
b0700a38e9
Progress on all fronts 2017-03-14 21:59:23 +01:00
Mario Danic
b0835b981f
Significant progress on various things 2017-03-14 21:59:22 +01:00
Mario Danic
bb3dfac2d4
Some progress on search 2017-03-14 21:59:21 +01:00
AndyScherzinger
4a14fdc33b
empty view star icon 2017-03-14 21:59:21 +01:00
AndyScherzinger
1415efe7f2
missing xxhdpi favorite icon 2017-03-14 21:59:20 +01:00
AndyScherzinger
4218c02522
xxxhdpi favorite icons 2017-03-14 21:59:20 +01:00
AndyScherzinger
3a345a5e5a
grey star icon (80% opacity) 2017-03-14 21:59:20 +01:00
AndyScherzinger
2fbc7d05cf
Merge branch 'master' of https://github.com/nextcloud/android into branding 2017-03-14 21:56:31 +01:00
Mario Danic
1732f7dc73 Some work on Firebase integration 2017-03-06 09:58:50 +01:00
Mario Danic
21e8f5530b Merge branch 'master' into branding 2017-03-06 08:10:16 +01:00
Mario Danic
0ffb67c506 Merge branch 'branding' into bring-branding-to-master
# Conflicts:
#	.drone.yml
#	build.gradle
#	src/main/java/com/owncloud/android/services/SyncedFolderJobService.java
#	src/main/java/com/owncloud/android/services/observer/SyncedFolderObserver.java
#	src/main/java/com/owncloud/android/utils/RecursiveFileObserver.java
2017-03-05 21:09:36 +01:00
Mario Danic
72349b5ef9 Merge branch 'master' into branding 2017-03-02 12:46:00 +01:00
Mario Danic
5b4b8bd20f Remove enable_analytics magic 2017-03-02 12:40:25 +01:00
Mario Danic
27e486458a Put quota text back to its place 2017-03-02 12:36:28 +01:00
Mario Danic
364d82c0c0 Clean up things 2017-02-27 11:10:34 +01:00
Mario Danic
6b1cf6895d Merge branch 'master' into branding 2017-02-27 10:17:00 +01:00
Mario Danic
ad357ef071 Add missing string to main strings 2017-02-25 10:16:38 +01:00
Mario Danic
1052986243 Fix authorities 2017-02-25 03:43:08 +01:00
Mario Danic
088e345ea5 custom variables 2017-02-25 02:44:32 +01:00
Mario Danic
10102c0f2d Remove currently unused variable 2017-02-25 02:44:32 +01:00
Mario Danic
dba8c4ed6e Move things around 2017-02-25 02:44:31 +01:00
Mario Danic
40913110f0 Rename the variable 2017-02-25 02:44:31 +01:00
Mario Danic
cc9ff688e7 Remove 1 (one!) new entry into setup.xml 2017-02-25 02:44:31 +01:00
Mario Danic
c7eed23de9 Add Google Firebase analytics 2017-02-25 02:44:31 +01:00
Mario Danic
0110e54ebe Add new customization options 2017-02-25 02:44:31 +01:00
Mario Danic
16f1243da6 Fix project structure and prepare for branding 2017-02-25 02:44:31 +01:00