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