Commit graph

174 commits

Author SHA1 Message Date
tobiasKaminsky
66cbc31bd7
comment gms again 2017-05-15 10:57:51 +02:00
tobiasKaminsky
6f3c3b5579
remove all "string empty" 2017-05-15 10:27:43 +02:00
AndyScherzinger
3612523c12
Merge branch 'master' of https://github.com/nextcloud/android into lintConfig 2017-05-13 16:31:08 +02:00
AndyScherzinger
da4cebafd3
fix rebase 2017-05-13 14:11:18 +02:00
AndyScherzinger
f9719dc374
use lib master since lib pr got merged 2017-05-13 14:11:17 +02:00
AndyScherzinger
06a82e45f0
bump lib to v1.0.17 2017-05-13 13:52:34 +02:00
AndyScherzinger
0f7e51fc37
temp gradle dependency to library PR 2017-05-13 13:48:41 +02:00
tobiasKaminsky
6719fba5b9
disable 'MissingTranslation' as this is handled by transifex 2017-05-13 08:52:56 +02:00
AndyScherzinger
371ea460f1
bump lib version to 1.0.16 2017-05-12 15:51:59 +02:00
AndyScherzinger
bdc376d573
use temp jitpack snapshot for our lib 2017-05-12 15:45:53 +02:00
AndyScherzinger
8f07e4f201
add maintenance mode lib change 2017-05-12 15:45:47 +02:00
Mario Danic
7f1739f5f7 Improve push / remove push registration 2017-05-02 13:53:19 +02:00
tobiasKaminsky
50ffaaa993
- rename zstore to gplay
- only one build.gradle, but with commented lines for gplay/modified
2017-04-28 09:26:16 +02:00
Mario Danic
9130635fa1 Progress on Analytics magic 2017-04-26 21:58:00 +02:00
tobiasKaminsky
726a02f39c Revert "remove firebase from branding branch and put it into branch "analytics""
This reverts commit 71ea26df31.
2017-04-26 21:57:59 +02:00
tobiasKaminsky
197ccb7094
bump library
unify build.gradle files
2017-04-21 08:02:49 +02:00
AndyScherzinger
cf7ccdfc65
Merge branch 'master' of https://github.com/nextcloud/android into contactBackupRestore
# Conflicts:
#	src/main/res/values/strings.xml
2017-04-19 23:38:31 +02:00
AndyScherzinger
79a0a380eb
move to master snapshot of library 2017-04-19 18:08:54 +02:00
AndyScherzinger
a04b3e63dc
cleanups 2017-04-19 17:09:45 +02:00
Mario Danic
8ef8a68a86
Fix a few things 2017-04-19 15:54:55 +02:00
Mario Danic
047bd3cc8e
Work a bit more on notifications 2017-04-19 15:54:55 +02:00
Andy Scherzinger
53678207f0
WiP use notifications library branch 2017-04-19 15:54:52 +02:00
AndyScherzinger
febf476534
enforce refresh of SNAPSHOT lib dependencies 2017-04-19 15:54:50 +02:00
tobiasKaminsky
35e683546c
contact backup & import 2017-04-18 08:23:55 +02:00
Mario Danic
3e133deab1 Remove play services 2017-04-11 00:00:35 +02:00
AndyScherzinger
b3430f54d3
lib version 1.0.14 2017-03-31 09:20:30 +02:00
AndyScherzinger
67fa10f8fa
support lib 25.0.0 2017-03-31 02:03:15 +02:00
AndyScherzinger
3d17ac886b
Merge branch 'master' of https://github.com/nextcloud/android into favourites
# Conflicts:
#	build.gradle
#	src/main/java/com/owncloud/android/ui/fragment/OCFileListFragment.java
#	src/main/res/menu/drawer_menu.xml
2017-03-31 01:57:38 +02:00
AndyScherzinger
279f783d6d
library 1.0.14 2017-03-31 01:04:11 +02:00
AndyScherzinger
ea6778a8fe
move to master snapshot of lib 2017-03-31 00:45:01 +02:00
AndyScherzinger
12b91c9064
set buildToolsVersion to "25.0.0" 2017-03-30 18:49:53 +02:00
Mario Danic
8099055fe9 Fix activity 2017-03-30 14:49:53 +02:00
alejandro
8a0974c656 Support for SVG icons with Glide and Android SVG 2017-03-29 12:04:35 -06:00
Mario Danic
cd17ac2c7a Start working on shared filter 2017-03-29 10:38:43 +02:00
alejandro
bdde0db091 WiP use activities library branch 2017-03-28 15:53:56 -06:00
Mario Danic
6fdb67b593 Fix a few issues 2017-03-27 09:29:16 +02: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
9e6faf28a5
added missing dependencies after rebase 2017-03-26 00:51:53 +01:00
AndyScherzinger
3831a59223
fix gradle, add missing cardview dependency 2017-03-26 00:51:29 +01:00
AndyScherzinger
bfe6dbe80a
move files for new project structure 2017-03-26 00:51:28 +01:00
AndyScherzinger
21d3df96e0
fix gradle after rebase 2017-03-26 00:51:28 +01:00
AndyScherzinger
f194025a2c
polished user info UI 2017-03-26 00:51:24 +01:00
Mario Danic
b2c27d38e2
Add comments and stuff 2017-03-26 00:51:24 +01:00
Mario Danic
51cd2672bf
Fix an issue with new support lib 2017-03-26 00:51:23 +01:00
Mario Danic
708b48c785
First bits of user info code 2017-03-26 00:51:20 +01:00
Mario Danic
9745b152e7
Don’t cache changing deps 2017-03-26 00:51:20 +01:00
Mario Danic
18918b515d
Add comments and stuff 2017-03-26 00:51:19 +01:00
Mario Danic
badef118ef
Fix an issue with new support lib 2017-03-26 00:51:19 +01:00
Mario Danic
5339fd7587
First bits of user info code 2017-03-26 00:51:14 +01:00
Mario Danic
3662aaa80f
Don’t cache changing deps 2017-03-26 00:51:14 +01:00