Commit graph

151 commits

Author SHA1 Message Date
AndyScherzinger
febf476534
enforce refresh of SNAPSHOT lib dependencies 2017-04-19 15:54:50 +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