mirrors/nextcloud-android
1
0
Fork 0
mirror of https://github.com/nextcloud/android.git synced 2024-12-22 16:54:33 +03:00
Code Issues Projects Releases Packages Wiki Activity
26099 commits 221 branches 1589 tags 640 MiB
Commit graph

1803 commits

Author SHA1 Message Date
Tobias Kaminsky
4665fee915
Merge 6256d21aa6 into cd315095d1 2018-05-24 12:35:28 +00:00
tobiasKaminsky
6256d21aa6
Remove analytics 
Signed-off-by: tobiasKaminsky <tobias@kaminsky.me>
 2018-05-24 14:34:08 +02:00
Tobias Kaminsky
5d41f14fbd daily dev 20180524 2018-05-24 00:32:37 +02:00
tobiasKaminsky
6a574d213a
bump test/espresso lib versions 
Signed-off-by: tobiasKaminsky <tobias@kaminsky.me>
 2018-05-23 08:51:35 +02:00
tobiasKaminsky
76d3747748
Add support for integration tests 
Signed-off-by: tobiasKaminsky <tobias@kaminsky.me>
 2018-05-23 08:51:35 +02:00
Tobias Kaminsky
001f13d884 daily dev 20180523 2018-05-23 00:32:17 +02:00
Tobias Kaminsky
c12e49ee94 daily dev 20180522 2018-05-22 00:32:11 +02:00
Tobias Kaminsky
de83abfdaa Merge branch 'master' of git://github.com/nextcloud/android 2018-05-22 00:30:09 +02:00
eho
0128bd8bda gradle: Added android-gif library dependency. 
- Library used for displaying animated gif's.
 2018-05-20 19:46:13 +02:00
Tobias Kaminsky
763a9c0839 daily dev 20180520 2018-05-20 00:32:02 +02:00
ardevd
d51f1206a3
Merge c52f8e25b3 into 9430466823 2018-05-19 16:23:58 +00:00
Tobias Kaminsky
1885ff0238 daily dev 20180519 2018-05-19 00:32:09 +02:00
Tobias Kaminsky
5cbb12bb9d Merge branch 'master' of git://github.com/nextcloud/android 2018-05-19 00:30:09 +02:00
eho
ea905884d6 gradle: Added PhotoView dependency. 
Latest version is 2.1.3.
 2018-05-18 20:01:40 +02:00
tobiasKaminsky
5e6af05bc7
lib refers always to master 
Signed-off-by: tobiasKaminsky <tobias@kaminsky.me>
 2018-05-18 09:15:16 +02:00
Tobias Kaminsky
3a9b00d201 daily dev 20180517 2018-05-17 00:31:55 +02:00
Tobias Kaminsky
9680820397 daily dev 20180516 2018-05-16 07:35:49 +02:00
tobiasKaminsky
19edfb183a
filter activity by file Id 
Signed-off-by: tobiasKaminsky <tobias@kaminsky.me>
 2018-05-09 11:33:51 +02:00
tobiasKaminsky
6a5476e0e2
remove buildToolsVersion 
Signed-off-by: tobiasKaminsky <tobias@kaminsky.me>
 2018-05-02 17:06:03 +02:00
Tobias Kaminsky
2963e1325e daily dev 20180427 2018-04-27 00:32:12 +02:00
Tobias Kaminsky
595e2cfdb4 daily dev 20180425 2018-04-25 00:33:43 +02:00
Andy Scherzinger
6e5e4832b1
Bump Android gradle plugin 2018-04-24 11:18:52 +02:00
Tobias Kaminsky
b39e2fa163 daily dev 20180424 2018-04-24 00:32:00 +02:00
Tobias Kaminsky
574401f9ca daily dev 20180423 2018-04-23 08:06:48 +02:00
Andy Scherzinger
71e108dcae
Merge pull request #2413 from nextcloud/nameAPK 
renames apk to include versionCode
 2018-04-22 19:46:12 +02:00
AndyScherzinger
f68dcf080e
Resolves #2415 - adding a bottom sheet instead of mini FABs, also replacing fab lib with Android support lib fab 2018-04-19 09:46:17 +02:00
Tobias Kaminsky
642c9d2c44 daily dev 20180419 2018-04-19 00:32:05 +02:00
Tobias Kaminsky
90a594643f daily dev 20180417 2018-04-17 00:32:02 +02:00
Tobias Kaminsky
bbe3f9cb62 daily dev 20180414 2018-04-14 00:32:04 +02:00
Tobias Kaminsky
4f4040c38c daily dev 20180412 2018-04-12 00:32:03 +02:00
Tobias Kaminsky
b69731d5d6 daily dev 20180411 2018-04-11 00:35:55 +02:00
AndyScherzinger
1f35091508
again upgrade gradle versions 2018-04-10 11:37:08 +02:00
AndyScherzinger
179f5adfe6
revert gms upgrade 2018-04-10 11:37:08 +02:00
AndyScherzinger
d6b08e366e
fix lint warnings 2018-04-10 11:37:07 +02:00
AndyScherzinger
54eb9bb9a4
update to Android Studio 3.1 tooling including build fixes 2018-04-10 11:37:04 +02:00
Tobias Kaminsky
8de4650c35 daily dev 20180410 2018-04-10 00:34:42 +02:00
Tobias Kaminsky
5abb0d5c8f daily dev 20180409 2018-04-09 00:34:41 +02:00
Tobias Kaminsky
adec52dcb7 daily dev 20180404 2018-04-04 00:34:31 +02:00
Tobias Kaminsky
5ed082219b daily dev 20180330 2018-03-30 00:34:38 +02:00
tobiasKaminsky
2fda96d655
renames apk to include versionCode, eg.: 
gplay-release-30010051.apk
generic-debug-30010051.apk
 2018-03-29 17:43:08 +02:00
tobiasKaminsky
e515afc339
bump to 3.1.0 RC2 2018-03-29 17:15:53 +02:00
Tobias Kaminsky
452e5ea690 daily dev 20180329 2018-03-29 00:34:45 +02:00
Tobias Kaminsky
7f2c9910b7 daily dev 20180324 2018-03-24 00:34:43 +01:00
Tobias Kaminsky
74c599d378
Merge pull request #2399 from nextcloud/310rc1 
3.1.0RC1
 2018-03-23 13:05:47 +01:00
tobiasKaminsky
34836de79d
3.1.0RC1 
Signed-off-by: tobiasKaminsky <tobias@kaminsky.me>
 2018-03-23 12:24:48 +01:00
tobiasKaminsky
6d7cc6b869
Replace ListView with RecyclerView 
Signed-off-by: tobiasKaminsky <tobias@kaminsky.me>
 2018-03-23 11:49:02 +01:00
Tobias Kaminsky
f8a5c0c0e1 daily dev 20180323 2018-03-23 00:34:24 +01:00
Andy Scherzinger
c1c0a4b5ae
Update build.gradle 2018-03-22 14:51:39 +01:00
Andy Scherzinger
62db03668a
Update build.gradle 2018-03-22 14:49:01 +01:00
Tobias Kaminsky
93c270250a
Merge pull request #2369 from nextcloud/noBlockingSync 
No blocking sync dialog
 2018-03-22 12:07:06 +01:00
Tobias Kaminsky
36d8bfa7cc daily dev 20180322 2018-03-22 00:34:35 +01:00
Tobias Kaminsky
4f38369812 daily dev 20180321 2018-03-21 00:34:40 +01:00
tobiaskaminsky
8e94b271d1
also use snapshot for lint 
Signed-off-by: tobiaskaminsky <tobias@kaminsky.me>
 2018-03-20 14:25:52 +01:00
tobiasKaminsky
cff5e5abc6
minor version was on wrong location: 
30400301 instead of 30040301

Signed-off-by: tobiasKaminsky <tobias@kaminsky.me>
 2018-03-20 12:53:56 +01:00
Mario Danic
18ac087a15
Update android job 
Signed-off-by: Mario Danic <mario@lovelyhq.com>
 2018-03-20 08:35:47 +01:00
tobiaskaminsky
4fdacf5fbb
30s timeout for checking if eTag changed 
show conflict

Signed-off-by: tobiaskaminsky <tobias@kaminsky.me>
 2018-03-20 08:15:40 +01:00
Tobias Kaminsky
e0dff302ca daily dev 20180320 2018-03-20 00:34:43 +01:00
Tobias Kaminsky
69f17a2dc0 daily dev 20180316 2018-03-16 00:34:42 +01:00
tobiasKaminsky
9cf911b5c2
move lib implementation to flavors 
Signed-off-by: tobiasKaminsky <tobias@kaminsky.me>
 2018-03-15 16:09:43 +01:00
Tobias Kaminsky
2169ce413f daily dev 20180315 2018-03-15 00:34:29 +01:00
Tobias Kaminsky
6a4b3e7f7b daily dev 20180314 2018-03-14 00:34:34 +01:00
Tobias Kaminsky
9806e71d3c daily dev 20180313 2018-03-13 00:35:06 +01:00
Tobias Kaminsky
535281aa87 daily dev 20180309 2018-03-09 00:34:28 +01:00
Tobias Kaminsky
7830c8031b daily dev 20180306 2018-03-06 00:34:31 +01:00
Tobias Kaminsky
2f856d5bc1 daily dev 20180303 2018-03-03 00:34:32 +01:00
tobiasKaminsky
3ce4280931
fix failing operations (create folder, download file) due to user agent change 
fix upload of fresh ones into folders where parent does not exist yet

Signed-off-by: tobiasKaminsky <tobias@kaminsky.me>
 2018-03-02 09:25:48 +01:00
Tobias Kaminsky
ff3f61a648 daily dev 20180302 2018-03-02 00:34:20 +01:00
Tobias Kaminsky
12ff981652 daily dev 20180301 2018-03-01 00:34:22 +01:00
Tobias Kaminsky
36ddbc1aa1 daily dev 20180227 2018-02-27 00:34:57 +01:00
Tobias Kaminsky
9d001a2a16 daily dev 20180224 2018-02-24 00:34:27 +01:00
Tobias Kaminsky
48b94138b7 daily dev 20180221 2018-02-21 07:24:34 +01:00
Mario Đanić
122ff445c4
Merge pull request #2148 from nextcloud/gradleVersionCalc 
Add nicer variable based versioning calculation
 2018-02-20 11:54:48 +01:00
Tobias Kaminsky
6b937c3d5f daily dev 20180220 2018-02-20 00:34:26 +01:00
AndyScherzinger
4679161d64
auto generate app name 2018-02-19 13:49:03 +01:00
AndyScherzinger
0d382d0214
secure withspace for non-stable release names 2018-02-19 13:49:03 +01:00
AndyScherzinger
42be3edf77
add nicer variable based versioning calculation 2018-02-19 13:49:02 +01:00
Tobias Kaminsky
ba3af697c4 daily dev 20180217 2018-02-17 00:34:16 +01:00
Tobias Kaminsky
579f305e07 daily dev 20180215 2018-02-15 00:34:29 +01:00
tobiasKaminsky
33529d045c
bump lib version 
Signed-off-by: tobiasKaminsky <tobias@kaminsky.me>
 2018-02-14 07:50:56 +01:00
Tobias Kaminsky
699024cb30 daily dev 20180214 2018-02-14 00:34:28 +01:00
Tobias Kaminsky
b2548f34d4 daily dev 20180213 2018-02-13 00:34:23 +01:00
Andy Scherzinger
9ee7be7125
Merge pull request #2118 from nextcloud/bump3_0 
Bump to 3.0
 2018-02-12 09:38:54 +01:00
Tobias Kaminsky
d06113abeb daily dev 20180210 2018-02-10 00:58:11 +01:00
Tobias Kaminsky
46df218d49
Update build.gradle 2018-02-09 15:25:35 +01:00
Tobias Kaminsky
614b0133ac
Update build.gradle 2018-02-09 15:25:06 +01:00
tobiasKaminsky
0fd69c08e7
bump to 3.0 
Signed-off-by: tobiasKaminsky <tobias@kaminsky.me>
 2018-02-08 08:26:29 +01:00
Tobias Kaminsky
40c393bdbf daily dev 20180208 2018-02-08 01:55:25 +01:00
Tobias Kaminsky
8342ef5dcc daily dev 20180207 2018-02-07 00:56:34 +01:00
Tobias Kaminsky
8aac87540f daily dev 20180204 2018-02-04 00:59:24 +01:00
Tobias Kaminsky
93a6fd4ce7 daily dev 20180201 2018-02-01 01:08:42 +01:00
tobiasKaminsky
3a7f5fc47c
3.0.0 RC3 
Signed-off-by: tobiasKaminsky <tobias@kaminsky.me>
 2018-01-31 09:57:47 +01:00
Tobias Kaminsky
6dc5815276 daily dev 20180131 2018-01-31 00:55:05 +01:00
Tobias Kaminsky
1edd87fcc8 daily dev 20180130 2018-01-30 01:14:30 +01:00
tobiasKaminsky
601138099a
bump version 
fix webpage -> website

Signed-off-by: tobiasKaminsky <tobias@kaminsky.me>
 2018-01-29 16:50:02 +01:00
Mario Danic
676d7d5d31
Update dependencies 
Signed-off-by: Mario Danic <mario@lovelyhq.com>
 2018-01-29 08:57:07 +01:00
Mario Danic
091eb0b9d0 Update android job 
Signed-off-by: Mario Danic <mario@lovelyhq.com>
 2018-01-28 21:32:13 +01:00
Tobias Kaminsky
8b4848cccd daily dev 20180127 2018-01-27 01:04:58 +01:00
Tobias Kaminsky
608621bb80 daily dev 20180126 2018-01-26 01:05:32 +01:00
Tobias Kaminsky
9d288532a6 daily dev 20180125 2018-01-25 01:05:48 +01:00
Tobias Kaminsky
80a14c3381 daily dev 20180124 2018-01-24 01:15:34 +01:00
tobiasKaminsky
54b4da00d0
bump library 2018-01-23 15:48:21 +01:00
Tobias Kaminsky
3136661962 daily dev 20180123 2018-01-23 01:03:50 +01:00
tobiasKaminsky
fdc9abcd34
remove modified flavor 
Signed-off-by: tobiasKaminsky <tobias@kaminsky.me>
 2018-01-22 17:33:28 +01:00
Tobias Kaminsky
d612f90ccb daily dev 20180121 2018-01-21 00:58:05 +01:00
Tobias Kaminsky
4a3424285c daily dev 20180120 2018-01-20 01:04:32 +01:00
Tobias Kaminsky
9b9914b2ed daily dev 20180119 2018-01-19 01:09:58 +01:00
Andy Scherzinger
d2a954b29b
Update build.gradle 2018-01-18 22:25:25 +01:00
AndyScherzinger
02a67c6f94
bump uiautomator 2018-01-18 21:37:55 +01:00
Tobias Kaminsky
fe3c9c2bb0 daily dev 20180118 2018-01-18 00:59:05 +01:00
Tobias Kaminsky
24eab27ebb daily dev 20180117 2018-01-17 01:03:38 +01:00
Tobias Kaminsky
d403609a8f daily dev 20180116 2018-01-16 01:18:26 +01:00
tobiasKaminsky
e28a4ab745
Version bump & changelog 
Signed-off-by: tobiasKaminsky <tobias@kaminsky.me>
 2018-01-15 14:13:45 +01:00
tobiaskaminsky
f54bfa1c90
needs gson 
Signed-off-by: tobiaskaminsky <tobias@kaminsky.me>
 2018-01-15 09:57:04 +01:00
tobiasKaminsky
28d5133473
use library 
Signed-off-by: tobiasKaminsky <tobias@kaminsky.me>
 2018-01-15 09:06:59 +01:00
tobiaskaminsky
12a6050867
add gson 
Signed-off-by: tobiaskaminsky <tobias@kaminsky.me>
 2018-01-15 09:06:55 +01:00
tobiasKaminsky
4ed6f1d3e1
temporary use lib branch 
Signed-off-by: tobiasKaminsky <tobias@kaminsky.me>
 2018-01-15 09:06:44 +01:00
tobiasKaminsky
23ab9bff67
revert versionCode/number to master 
Signed-off-by: tobiasKaminsky <tobias@kaminsky.me>
 2018-01-15 08:12:00 +01:00
tobiasKaminsky
de6e352ea1
bump library 
add gson

Signed-off-by: tobiasKaminsky <tobias@kaminsky.me>
 2018-01-15 08:11:57 +01:00
tobiaskaminsky
4281a02314
do not use linked library 2018-01-15 08:11:56 +01:00
tobiaskaminsky
54ea7d9bcf
use nextcloud user agent for E2e calls 2018-01-15 08:11:56 +01:00
tobiasKaminsky
32b5a02e76
use e2e library branch also for lint (will both be reverted once PR in library is merged) 2018-01-15 08:11:54 +01:00
Jan-Christoph Borchardt
6caf0834ce
First release of E2E 2018-01-15 08:11:53 +01:00
tobiasKaminsky
0373182d36
use e2e library branch also for lint (will both be reverted once PR in library is merged) 2018-01-15 08:11:52 +01:00
tobiasKaminsky
8361848583
versionCode/versionName 2018-01-15 08:11:51 +01:00
Jan-Christoph Borchardt
b6e84b66fd
First release of E2E 2018-01-15 08:11:49 +01:00
Tobias Kaminsky
34c8f1688f daily dev 20180114 2018-01-14 00:51:05 +01:00
Tobias Kaminsky
71d3a989b9 daily dev 20180113 2018-01-13 00:55:30 +01:00
Tobias Kaminsky
fae18e886a daily dev 20180112 2018-01-12 00:52:56 +01:00
Tobias Kaminsky
b6dde61c28 daily dev 20180111 2018-01-11 00:52:49 +01:00
Tobias Kaminsky
5fd4ddc1bc daily dev 20180110 2018-01-10 00:52:17 +01:00
Tobias Kaminsky
22a1a668d5 daily dev 20180109 2018-01-09 00:48:33 +01:00
tobiasKaminsky
1da1f11ea5
change sdk versions 2018-01-08 09:21:51 +01:00
Tobias Kaminsky
82cbe524c0 daily dev 20180108 2018-01-08 08:13:48 +01:00
Tobias Kaminsky
313354aa4c daily dev 20180106 2018-01-06 00:49:38 +01:00
Tobias Kaminsky
b41962da42
Merge branch 'master' into screenshots 2018-01-05 09:15:10 +01:00
Tobias Kaminsky
6d026d30a8 daily dev 20180105 2018-01-05 00:49:19 +01:00
tobiaskaminsky
36253ccec2
Screenshots with fastlane screengrab 2018-01-02 09:37:20 +01:00
Tobias Kaminsky
736abe3770 daily dev 20171230 2017-12-30 00:55:36 +01:00
Tobias Kaminsky
40b879d5a5 daily dev 20171228 2017-12-28 00:51:56 +01:00
Tobias Kaminsky
261f032610 daily dev 20171223 2017-12-23 00:50:47 +01:00
Tobias Kaminsky
bf45f6b9a9 daily dev 20171220 2017-12-20 00:53:12 +01:00
Tobias Kaminsky
8fb08b66e2 daily dev 20171219 2017-12-19 00:48:03 +01:00
Tobias Kaminsky
697397ac26 daily dev 20171216 2017-12-16 00:56:33 +01:00
Tobias Kaminsky
e16e55acf2 daily dev 20171213 2017-12-13 00:46:12 +01:00
tobiasKaminsky
4f21d1a0ad
dev version: use always latest library 2017-12-12 11:51:59 +01:00
Tobias Kaminsky
d69fd2a981 daily dev 20171212 2017-12-12 00:49:16 +01:00
Tobias Kaminsky
4ab3d540e5 daily dev 20171211 2017-12-11 00:48:57 +01:00
Tobias Kaminsky
76495fd01c daily dev 20171209 2017-12-09 00:44:11 +01:00
Tobias Kaminsky
3e0aef488c daily dev 20171208 2017-12-08 11:30:38 +01:00
tobiaskaminsky
303ef83c4e
use latest stable lib 2017-12-06 14:07:29 +01:00
tobiaskaminsky
626f2b68a2
use own route for NC13 and parse status.php for NC12 2017-12-06 13:13:03 +01:00
AndyScherzinger
7159838b41
fix lint warnings 2017-12-04 19:08:11 +01:00
AndyScherzinger
7aaf4954bc
Update android gradle to 3.0.1 2017-12-04 19:08:10 +01:00
Mario Danic
d12af2a342
Update Android job 
Signed-off-by: Mario Danic <mario@lovelyhq.com>
 2017-12-04 19:08:00 +01:00
Tobias Kaminsky
88aef982d7 daily dev 20171204 2017-12-04 08:30:44 +01:00
tobiaskaminsky
b35e2eaa92
auto detect encoding 2017-11-27 13:17:37 +01:00
tobiasKaminsky
86340913a8
versionDev as flavor 2017-11-27 12:15:38 +01:00
Tobias Kaminsky
e8c66578b3
Update build.gradle 2017-11-27 11:08:51 +01:00
tobiasKaminsky
66e0e835c1
no snapshot on library 2017-11-27 10:40:04 +01:00
Andy Scherzinger
c65b6b1ed9
move back to master-SNAPSHOT for lib to fix build 2017-11-27 08:47:31 +01:00
tobiasKaminsky
f9983558c9
Use text-color and element-color whenever possible (>=NC13) 2017-11-10 11:10:34 +01:00
AndyScherzinger
10d0c57e4f
update gradle android to 3.0.0 2017-10-25 23:18:10 +02:00
Marcus Hoffmann
c7e4bb0b01
remove all prebuilt jars 
This gets rid of all prebuilt jars in the repo.

* libs/disklrucache-2.0.2.jar doesn't seem to be used anymore, app builds
  fine when removing it.
* libs/touch-image-view.jar is indeed required but is not anywhere available
  via gradle. So instead we include the source of this long unmaintained
  library directly.
 2017-10-25 18:00:53 +02:00
AndyScherzinger
d56d79ce14
update libs to latest versions to satisfy lint 2017-10-25 11:02:53 +02:00
AndyScherzinger
40537edf10
bump android gradle to 3.0.0-rc2 2017-10-24 14:22:29 +02:00
Andy Scherzinger
225cd2fda6 Merge pull request #1671 from nextcloud/update-gradle 
Update gradle
 2017-10-18 15:25:13 +02:00
AndyScherzinger
f1c20398c6
centralize app's version code and name 2017-10-16 11:33:36 +02:00
Mario Danic
1506eaa587 Update gradle 
Signed-off-by: Mario Danic <mario@lovelyhq.com>
 2017-10-15 21:29:06 +02:00
AndyScherzinger
4b30fb44da
updating gradle-plugin to 3.0.0-beta7 including foced move to buildToolsVersion 26.0.2 2017-10-09 07:18:22 +02:00
tobiaskaminsky
8c272da8c8
bump lib 2017-09-22 12:49:45 +02:00
tobiaskaminsky
0aa2aaaab1
use result code to determinate if old login 2017-09-22 12:49:45 +02:00
Andy Scherzinger
e725f61b45
update to gradle:3.0.0-beta6 2017-09-19 10:41:58 +02:00
AndyScherzinger
3b0bd82fd9
update to gradle:3.0.0-beta5 2017-09-13 09:52:16 +02:00
Tobias Kaminsky
e6f1ff0bdf
Update build.gradle 
Bump lib version
 2017-09-11 08:54:17 +02:00
tobiaskaminsky
c80a5da0c6
bump lib 2017-09-11 08:54:17 +02:00
Mario Danic
d014d6b3cd
Fix for stuff 
Signed-off-by: Mario Danic <mario@lovelyhq.com>
 2017-09-11 08:54:16 +02:00
AndyScherzinger
761c9f8ce9
bump to com.github.nextcloud:android-library:1.0.28 fixing chunked upload file modification date 2017-09-06 09:19:20 +02:00
Mario Danic
b353fb254d
Use old lib 
Signed-off-by: Mario Danic <mario@lovelyhq.com>
 2017-09-06 09:19:19 +02:00
Mario Danic
f106872bbb
Fix sizing 
Signed-off-by: Mario Danic <mario@lovelyhq.com>
 2017-09-06 09:19:13 +02:00
AndyScherzinger
603fc616f7
update to gradle:3.0.0-beta4 2017-09-04 10:02:09 +02:00
tobiaskaminsky
853350221f
- use nullable 
- only add non-null object to list
 2017-08-31 13:03:40 +02:00
AndyScherzinger
077049d8ae
gradle update to beta 3 2017-08-25 12:55:50 +02:00
AndyScherzinger
be26905e36
fix push notifications for 12.0.2 2017-08-23 16:35:44 +02:00
Andy Scherzinger
efc0e0d119 Merge pull request #1368 from nextcloud/libBump 
bump to newest lib .25
 2017-08-18 09:57:57 +02:00
tobiaskaminsky
880d688340
bump to newest lib 2017-08-18 09:37:52 +02:00
tobiaskaminsky
b0738fff2c
use gcm on gplay, modified as dependency 2017-08-18 08:08:50 +02:00
tobiaskaminsky
7298e0d936
bump to beta 2 2017-08-14 08:47:12 +02:00
Mario Danic
9a79bf2f03 Quotes 
Signed-off-by: Mario Danic <mario@lovelyhq.com>
 2017-08-11 06:04:01 +02:00
Mario Danic
86322eda7a Fix typo 
Signed-off-by: Mario Danic <mario@lovelyhq.com>
 2017-08-11 05:57:10 +02:00
Mario Danic
82029e1de5 Version 
Signed-off-by: Mario Danic <mario@lovelyhq.com>
 2017-08-10 21:18:58 +02:00
Mario Danic
a93cb06810 Add firebase 
Signed-off-by: Mario Danic <mario@lovelyhq.com>
 2017-08-10 19:51:15 +02:00
AndyScherzinger
7d823beed5
android-library:1.0.24 2017-08-10 18:25:54 +02:00
AndyScherzinger
e30c6ba5ec
update test lib versions 2017-08-10 18:25:44 +02:00
AndyScherzinger
29f8b83df8
upgrade to gradle:3.0.0-beta1 2017-08-10 18:25:44 +02:00
AndyScherzinger
2e5444ceae
bumb support lib to 25.4.0 2017-08-10 18:25:43 +02:00
AndyScherzinger
2e4722ccb3
update to gradle gradle-4.1 & fixing deprecated gradle API calls 2017-08-08 13:00:05 +02:00
AndyScherzinger
cb35ef8d1d
update multidex version 2017-08-08 12:59:59 +02:00
AndyScherzinger
d7ed716468
fix further lint errors 2017-08-08 12:59:58 +02:00
Mario Danic
656d5c1ca9
Fix bugs 
Signed-off-by: Mario Danic <mario@lovelyhq.com>
 2017-08-08 12:59:55 +02:00
Mario Danic
a122f64226
Add google repo 
Signed-off-by: Mario Danic <mario@lovelyhq.com>
 2017-08-08 12:59:55 +02:00
Mario Danic
64c58a0306
Fix build 
Signed-off-by: Mario Danic <mario@lovelyhq.com>
 2017-08-08 12:59:54 +02:00
Mario Danic
3338bead87
Update lib version 
Signed-off-by: Mario Danic <mario@lovelyhq.com>
 2017-08-08 12:59:43 +02:00
Mario Danic
853d0bf197
Update library 
Signed-off-by: Mario Danic <mario@lovelyhq.com>
 2017-08-08 12:59:41 +02:00
Mario Danic
77618aa6a8
Update gradle 
Signed-off-by: Mario Danic <mario@lovelyhq.com>
 2017-08-08 12:59:41 +02:00
Mario Danic
157ceaba60
Bit of work on uploads 
Signed-off-by: Mario Danic <mario@lovelyhq.com>
 2017-08-08 12:59:39 +02:00
Mario Danic
8959a72f81
Revert gradle 
Signed-off-by: Mario Danic <mario@lovelyhq.com>
 2017-08-08 12:59:26 +02:00
AndyScherzinger
3180f4a088
gradle:3.0.0 fixes 2017-08-08 12:59:24 +02:00
AndyScherzinger
68622733a1
fix file display of custom folders 2017-08-08 12:59:19 +02:00
Mario Danic
cdf43866ea
Fix the build 
Signed-off-by: Mario Danic <mario@lovelyhq.com>
 2017-08-08 12:59:17 +02:00
Mario Danic
4efb17fd1d
Work a bit on locking 
Signed-off-by: Mario Danic <mario@lovelyhq.com>
 2017-08-08 12:59:10 +02:00
Mario Danic
5701d3bd13
Attempt to fix build 
Signed-off-by: Mario Danic <mario@lovelyhq.com>
 2017-08-08 12:59:08 +02:00
Mario Danic
e78d36d2b5
Fix issues 
Signed-off-by: Mario Danic <mario@lovelyhq.com>
 2017-08-08 12:59:07 +02:00
Mario Danic
1bdf7a8ece
Fix build 
Signed-off-by: Mario Danic <mario@lovelyhq.com>
 2017-08-08 12:59:07 +02:00
Mario Danic
70637ba987
Change to 1.8 
Signed-off-by: Mario Danic <mario@lovelyhq.com>
 2017-08-08 12:59:07 +02:00
Mario Danic
6496d7267a
Some work on a new job for AU 
Signed-off-by: Mario Danic <mario@lovelyhq.com>
 2017-08-08 12:59:06 +02:00
tobiasKaminsky
790652de3f
comment gms again 2017-07-28 12:24:10 +02:00
tobiasKaminsky
5c9870d3f3
split up play services to avoid support version conflict: All com.android.support libraries must use the exact same version specification (mixing versions can lead to runtime crashes). Found versions 25.0.0, 24.0.0. 2017-07-28 12:24:06 +02:00
AndyScherzinger
11f38044bb
use lib v1.0.22 2017-07-16 16:03:31 +02:00
tobiasKaminsky
ceb8d5fd63
use snapshot 2017-07-16 15:54:30 +02:00
tobiasKaminsky
4d571e7f82
use lib branch 2017-07-16 15:54:29 +02:00
tobiasKaminsky
d80ac412c0
use grey theme if no theming of elements is possible 2017-07-16 15:54:29 +02:00
tobiasKaminsky
db7f93fd14
use own FAB library to support colored FAB main button. 2017-06-14 07:56:55 +02:00
Andy Scherzinger
def4f5821c update lib to 1.0.21 2017-05-31 21:45:15 +02:00
alejandro
fba1d38100
Header was added in ActivitiesView 
RichSubject was Added
 2017-05-31 11:02:19 +02:00
Mario Đanić
343b65645c Merge pull request #1041 from nextcloud/authInNC12 
Multiple auth headers in NC12
 2017-05-29 23:50:23 +02:00
Mario Danic
afb610fc03 Update lib version 
Signed-off-by: Mario Danic <mario@lovelyhq.com>
 2017-05-29 23:28:36 +02:00
Mario Danic
c305d2e2e1 Updating to newest release 
Signed-off-by: Mario Danic <mario@lovelyhq.com>
 2017-05-29 23:03:13 +02:00
tobiasKaminsky
7dc5cc7a94
remove non existing reference to lint config 2017-05-24 11:36:24 +02:00
tobiasKaminsky
599256d9c9
parse multiple auth headers and pick "basic" if exists 2017-05-24 10:32:18 +02:00
tobiaskaminsky
ab59cd784e
use 1.0.18 2017-05-15 13:03:33 +02:00
tobiasKaminsky
aeba233894
use app specific log folder 2017-05-15 09:08:19 +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
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
Andy Scherzinger
eb10fb0015
bump Android SDK Build-Tools to 24.0.2 2016-11-02 23:34:28 +01:00
Andy Scherzinger
c2b813c8f7
no pre-dexing on travis (performance) 2016-11-02 23:34:28 +01:00
Andy Scherzinger
3115066215
Update build tools to 24.0.1, java7 compat 2016-11-02 23:34:28 +01:00
Andy Scherzinger
f133eaad07
rebase/merge 2016-11-02 23:34:28 +01:00
Andy Scherzinger
5f5f0ce029
lib1.0.4 2016-11-02 23:34:28 +01:00
Andy Scherzinger
609647e622
Revert "added jcenter repo" 
This reverts commit b54e954c96014babd176d8f50ba6b7a9e44dea38.
 2016-11-02 23:34:28 +01:00
Andy Scherzinger
3f2d376ff4
link to v24 version of the Nc lib 2016-11-02 23:34:27 +01:00
Andy Scherzinger
9ff3aff7bd
added jcenter repo 2016-11-02 23:34:27 +01:00
Andy Scherzinger
232e555cd3
bump to v24 incl. toolchain, jdk8 etc. 2016-11-02 23:34:25 +01:00
AndyScherzinger
3a8d29d79b
use latest 2.2.1 gradle/Android plugin 2016-11-01 23:35:17 +01:00
David A. Velasco
5a97d31392
Finish action mode when drawer starts to open, recover it when drawer is closed 
# Conflicts:
#	build.gradle
#	src/com/owncloud/android/ui/activity/DrawerActivity.java
#	src/com/owncloud/android/ui/fragment/OCFileListFragment.java
 2016-11-01 23:35:17 +01:00
Jubril Edu
af1a61960b Incorporated Checkstyle, findbugs, pmd and lint 2016-10-09 00:33:12 +01:00
Andy Scherzinger
7ab36d38dd update to latest Android plugin 2016-09-20 10:41:57 +02:00
Andy Scherzinger
de41f95d93 bump andrid lib to 1.0.7 2016-09-06 10:36:07 +02:00
Andy Scherzinger
b29744c004 show quota for server without quota-unlimited info capability 2016-08-31 19:05:50 +02:00
Andy Scherzinger
07c3ebdf84 update to Nc Android library 1.0.4 2016-08-18 15:55:11 +02:00
Andy Scherzinger
418790c3fa mavenCentral()-->jcenter() 2016-08-16 13:50:37 +02:00
Andy Scherzinger
6bf8b79831 gradle update to 2.14.1 and android plugin update to 2.1.3 for security fixes 2016-08-16 13:50:37 +02:00
Andy Scherzinger
f81cfb3cfd bump Nc Android lib version 2016-08-09 00:06:51 +02:00
Andy Scherzinger
9474658bcd bumped support lib to latest version of 23 2016-07-20 15:55:11 +02:00
Andy Scherzinger
5ee1e8adab Set fixed lib version 2016-06-24 00:18:45 +02:00
Andy Scherzinger
9222075066 version 1.0.0 2016-06-12 14:29:48 +02:00
Andy Scherzinger
e2ec8498b8 replaced login icon, reworked login now using card views 2016-06-11 18:09:54 +02:00
Andy Scherzinger
d176d2753b Update Android gradle plugin to 2.1.2 2016-06-09 10:49:36 +02:00
tobiasKaminsky
1147778794 allow nextcloud to be parallel to owncloud 2016-06-07 21:58:37 +02:00
Andy Scherzinger
8b525f7f8b right lib dependency 2016-06-07 14:18:54 +02:00
Andy Scherzinger
250c917fde remove android-lib submodule and use jitpack and gradle dependencies instead 2016-06-07 14:02:36 +02:00
Andy Scherzinger
80ef28b288 fixed lib reference in gradle 2016-06-07 01:53:31 +02:00
jabarros
cb630e5709 Setup Espresso environment 2016-05-24 12:53:41 +02:00
David A. Velasco
2dfd98cbdd Turn on device screen before Espress tests start 2016-05-24 12:53:41 +02:00
David A. Velasco
7a6335430d Normalized environment variables for end2end tests 2016-05-24 12:53:41 +02:00
jabarros
014547fca3 Modify gradle to get env vars to be passed to android tests directly 2016-05-24 12:53:41 +02:00
jabarros
822a62c513 Pass test vars as instrumentation runner argumments 2016-05-24 12:53:41 +02:00
jrecio
dde82c75c6 fix changes rebase 2016-05-24 12:53:41 +02:00
jabarros
a76bb109bc Setup Espresso environment 2016-05-24 12:53:41 +02:00
David A. Velasco
950dbe2013 Increased verbosity of logs for local unit tests 2016-05-24 12:53:41 +02:00
David A. Velasco
2cfcb2318c Run sample instrumented unit test in Travis 2016-05-24 12:53:41 +02:00
jabarros
bfbf3704de Encrypt connection parameters in AndroidTest and launch tests from travis (WIP) 2016-05-24 12:53:41 +02:00
jabarros
db88f7f1dd Initial text to check authentication (WIP) 2016-05-24 12:53:41 +02:00
jabarros
1fcd724d43 Setup Espresso environment 2016-05-24 12:53:41 +02:00
David A. Velasco
964560da8f Added dependencies for local unit tests to app build.gradle file 2016-05-24 12:53:41 +02:00
David A. Velasco
c1f616ce54 Updated build.gradle to find local unit tests 2016-05-24 12:53:41 +02:00
David A. Velasco
6a1e87e125 Fixed replacement of library version in a variable, and updated reference to library project after updating to gradle plugin for Android 2.1.0 2016-04-28 11:11:41 +02:00
Andy Scherzinger
37dbbe2a4f Update gradle android plugin to 2.1.0, keep support lib version in a variable for consistent references 2016-04-28 10:33:29 +02:00
Andy Scherzinger
1c569a0586 Android Studio 2.0 Upgrade simply leasing to actual build tools 23.0.3 and gradle 2.10 2016-04-26 16:47:05 +02:00
Andy Scherzinger
413707272a rebased to master: resolved conflicts (edits from fab implementation) 2016-02-25 19:38:24 +01:00
David A. Velasco
53df867a3c Removed dependency on org.apache.http.legacy.jar 2016-02-12 13:32:57 +01:00
Andy Scherzinger
4410bd9c60 add snackbar and check for write permission via API 2016-02-12 12:15:46 +01:00
Andy Scherzinger
288b92c61a marshmallow changes redone 2016-02-12 12:15:46 +01:00
Bartosz Przybylski
35c0d318c2 Force ant and android studio to use Java7 2015-12-22 11:40:07 +01:00
David A. Velasco
0c48a4686d Revert "Force ant and android studio to use Java7" 2015-12-22 11:09:16 +01:00
Bartosz Przybylski
149289b5dc Force ant and android studio to use Java7 2015-12-02 21:18:58 +01:00
masensio
00a221ea8f Remove android.support.widget components from the sharewith view. Waiting for introducing Floating button in the project 2015-10-30 16:25:54 +01:00
masensio
905b68b4ec Show the 'search' layout in phone and tablet 2015-10-30 15:23:03 +01:00
David A. Velasco
e6be60679f Merge branch 'master' into copy 
Conflicts FIXED:
	src/com/owncloud/android/ui/activity/FileDisplayActivity.java
	src/com/owncloud/android/ui/fragment/OCFileListFragment.java
	src/com/owncloud/android/ui/preview/FileDownloadFragment.java
	src/com/owncloud/android/ui/preview/PreviewImageFragment.java
	src/com/owncloud/android/ui/preview/PreviewMediaFragment.java
 2015-09-01 18:35:51 +02:00
Jorge Antonio Diaz-Benito Soriano
dcffd79b60 Tweaks for source 1.5 2015-08-18 15:55:00 +02:00
masensio
9d815b0187 Update buildTools version to 22.0.1 2015-08-04 11:14:51 +02:00
masensio
d77f1d7ec0 Update build.gradle to 1.2.3 2015-08-03 15:07:20 +02:00
AndyScherzinger
d474239b21 initial material design changes for the action bar 2015-07-26 01:49:27 +02:00
masensio
4f2f0ceb80 Add actionBar 2015-05-25 12:39:05 +02:00
masensio
5709757b11 Update gradle - remove actionSherlock 2015-05-21 16:43:34 +02:00
masensio
a496f08717 Remove actionbarsherlock , replace it with Android Support Library (v7) 2015-05-18 12:59:46 +02:00
masensio
d43fbbac6b [DEV] Remove actionbarsherlock , replace it with Android Support Library (v7) 2015-05-15 11:24:14 +02:00
David A. Velasco
e874789382 Updated Android Gradle plug-in for compatibility with Android Studio 1.0+ 2015-01-19 09:58:06 +01:00
Jorge Antonio Diaz-Benito Soriano
9316ce96ac Update Gradle plugin to 0.14 for compatibility with Android Studio 0.9.0 2014-11-01 16:08:15 +01:00
MMMarcy
2cad715525 Commit for the PR 
The pull request targets:

	1) Introduces Gradle support
	2) Updates maven support (even thou the apk generated is not
stable)
	3) Updates the setup_env.* scripts to support different building
tools
	4) Removes non UTF-8 characters
	5) Removes switches on R.id entries (not supported anymore from
ADT >= 14)
	6) Introduced a binary dependency (.aar) that replace the actionbarsherlock
sub-module

Remainders:

	1) Change the sub-module back to the owncloud android library
once the PR will be merge
 2014-10-28 16:09:34 +01:00