Commit graph

46 commits

Author SHA1 Message Date
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