152 commits

Author	SHA1	Message	Date
tobiasKaminsky	d4e0f3bdb1	Merge branch 'develop2' into imageGrid2 ... Conflicts: owncloud-android-library res/layout/list_fragment.xml res/values-fr/strings.xml src/com/owncloud/android/datamodel/ThumbnailsCacheManager.java src/com/owncloud/android/ui/adapter/FileListListAdapter.java src/com/owncloud/android/ui/adapter/LocalFileListAdapter.java src/com/owncloud/android/ui/fragment/ExtendedListFragment.java src/com/owncloud/android/ui/fragment/LocalFileListFragment.java src/com/owncloud/android/ui/fragment/OCFileListFragment.java	2015-01-19 21:02:37 +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