Commit graph

722 commits

Author SHA1 Message Date
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