Commit graph

14 commits

Author SHA1 Message Date
Andy Scherzinger
986e99825e git ignore cleanup 2016-06-07 01:02:51 +02:00
Andy Scherzinger
4b89423f4c #1320 remove maven build capabilities 2016-04-25 13:20:36 +02:00
Luke Owncloud
99d82430c5 Merge branch 'develop' of github.com:owncloud/android into reliable_uploads
Conflicts:
	SETUP.md
	owncloud-android-library
	src/com/owncloud/android/datamodel/OCFile.java
2014-12-01 07:43:56 +01:00
Jorge Antonio Diaz-Benito Soriano
69013b0e8d Restore .gitignore and SETUP.md, remove files that were added 2014-11-25 20:46:44 +01:00
Jorge Antonio Diaz-Benito Soriano
65aeb8728b Update .gitignore and re-add missing files 2014-11-24 11:57:01 +01:00
Luke Owncloud
9d28e9e524 commenting, commenting, commenting! 2014-11-06 16:33:04 +01:00
Jorge Antonio Diaz-Benito Soriano
b22dc8bce6 Minor updates 2014-10-28 18:43:10 +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
David A. Velasco
02edfaeea0 Allow the upload of project.properties and ant.properties files 2013-11-13 12:04:07 +01:00
Luke Owncloud
a43fef7dbf enabled project for building with maven (eclipse building stays untouched)
added/updated compile instructions in setup.md
added some eclipse generated files to .gitignore
2013-10-21 09:29:05 +02:00
Luke Owncloud
c93b552db5 mc 2013-08-06 11:27:07 +02:00
Luke Owncloud
1b3c3a3ece added more detailed download and compile instructions.
fixed setup_env.bat
added target/ to .gitignore
2013-08-06 11:19:30 +02:00
Bartek Przybylski
0627629e7d missing files 2011-09-04 13:46:28 +02:00
Bartek Przybylski
154bb85cf1 initial commit 2011-08-19 22:37:35 +02:00