Commit graph

216 commits

Author SHA1 Message Date
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
Mario Danic
d0e810777f
Add comments and stuff 2017-03-26 00:51:14 +01:00
Mario Danic
3a699326fd
Fix an issue with new support lib 2017-03-26 00:51:13 +01:00
Mario Danic
2ba88eed79
First bits of user info code 2017-03-26 00:51:11 +01:00
Mario Danic
acc5912e22
Don’t cache changing deps 2017-03-26 00:51:11 +01:00
Mario Danic
d3c9381455
Add comments and stuff 2017-03-26 00:51:10 +01:00
Mario Danic
b5bf9200a9
Fix an issue with new support lib 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
1815ace4d1
Don’t cache changing deps 2017-03-26 00:51:07 +01:00
AndyScherzinger
5f0944ab78
Merge branch 'master' of https://github.com/nextcloud/android into favourites
# Conflicts:
#	build.gradle
2017-03-26 00:50:02 +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
c6d6fc82f0 Update android job 2017-03-23 20:58:55 +01:00
tobiasKaminsky
71ea26df31
remove firebase from branding branch and put it into branch "analytics" 2017-03-22 20:18:37 +01:00
Mario Danic
705ea85060 Work a bit on favorites 2017-03-19 22:12:44 +01:00
Mario Danic
f1dcd38faf Fix gradle 2017-03-17 18:35:17 +01:00
Mario Danic
8a04689e92 Fix sharing 2017-03-16 18:04:21 +01:00
Mario Danic
274aa7e9a8 Fix UI issues 2017-03-15 00:12:17 +01:00
Mario Danic
f0249be463 Fix search users 2017-03-14 22:59:35 +01:00
Mario Danic
9f94104eed
Save current search type 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
Mario Danic
3fa0c5ca32
Refactor available offline 2017-03-14 21:59:19 +01:00
Mario Danic
b7e41eeff1 Fix gradle and supresswarnings issue 2017-03-05 21:20:54 +01:00
Mario Danic
2d3139f8bf Should revert compile sdk 2017-03-05 21:15:54 +01:00
Mario Danic
e68420002c Wrapper 2017-03-05 21:14:15 +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
657dbcd03e Fix quota crash 2017-03-03 18:52:10 +01:00
AndyScherzinger
c5f748dffb
use latest lib version 2017-03-03 16:18:05 +01:00
Mario Danic
9d45479f0f
Update android job 2017-03-03 11:08:08 +01:00
Mario Danic
01e9a3568e
Update dependency 2017-03-03 11:08:08 +01:00
Mario Danic
4c86922597
Revert "Use stable android-job lib"
This reverts commit 1c28fc69bad34cd781dfe655fa051a622d7b2e62.
2017-03-03 11:08:07 +01:00
Mario Danic
e245b1f91d
Revert "Remove play services"
This reverts commit d860d942ede22fb53d6d610a99d3e71ad18a7be7.
2017-03-03 11:08:04 +01:00
Mario Danic
56a9998efb
Remove play services 2017-03-03 11:08:04 +01:00
Mario Danic
96cfa5d16f
Use stable android-job lib 2017-03-03 11:08:03 +01:00
Mario Danic
4d6cc118b2
Update gradle 2017-03-03 11:07:58 +01:00
Mario Danic
3860b94d07
Add multidex magic 2017-03-03 11:07:58 +01:00
Mario Danic
140f2d9b7b
Remove obsolete stuff 2017-03-03 11:07:57 +01:00
Mario Danic
717e4b2096
Stuff 2017-03-03 11:07:56 +01:00
Mario Danic
9ce087e94f
Update support lib 2017-03-03 11:07:55 +01:00
Mario Danic
048b7f7bb3
Use android-job for scheduling 2017-03-03 11:07:53 +01:00
Mario Danic
b5a2adf44b
Introduce rewritten auto upload 2017-03-03 11:07:28 +01:00
Mario Danic
e4e5a249ba Fix build(?) 2017-02-25 03:00:36 +01:00
Mario Danic
79c6085c84 Revert "Attempt to fix a build"
This reverts commit 06562dc4d50a8bef4c202c17a0cbdaaeaabe4015.
2017-02-25 02:44:31 +01:00
Mario Danic
352ee32f1d Attempt to fix a build 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
4d1a0a60c8 Add required gs 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
AndyScherzinger
e2a3da33ba
lib version 1.0.11 2017-02-05 22:17:17 +01:00
Mario Danic
75ba848999
Use master snapshot 2017-02-05 22:17:17 +01:00
Mario Danic
ba5dae93b4
Quick fix to work with new library updates 2017-02-05 22:17:13 +01:00
AndyScherzinger
ff8e861604
fix quota display 2017-01-20 10:45:39 +01:00
AndyScherzinger
a3009ed0a6
Nc lib 1.0.9 2016-11-28 17:38:55 +01:00
Iskra Delta
97da0cbc94
FindBugs appeased 2016-11-10 10:19:52 +01:00
AndyScherzinger
c30920ed59
bump lib to 1.0.8 2016-11-02 23:34:52 +01:00
AndyScherzinger
0eb73194fc
revert to build v24 to to lack of drone CI support 2016-11-02 23:34:51 +01:00
AndyScherzinger
aeba303cce
bump to 2.2.2 and v25 2016-11-02 23:34:51 +01:00
AndyScherzinger
41badb3bdc
update support library 2016-11-02 23:34:51 +01:00
Andy Scherzinger
616a2ff8bb
fix android-lib reference 2016-11-02 23:34:50 +01:00
Andy Scherzinger
30ac692219
change emulator ready detection again, disable running sample instrumented unit test (failing at the moment)
updated wait_for_emulator.sh for actual travis cookbook revision 62039b2046/ci_environment/android-sdk/files/default/android-wait-for-emulator

try emulator 24

bump support lib to 24.2.0
2016-11-02 23:34:29 +01:00