📱 Nextcloud Android app
Find a file
David A. Velasco c3ca5b5a4f Merge branch 'develop' into loggingtool
Conflicts:
	AndroidManifest.xml
	res/menu/main_menu.xml
	src/com/owncloud/android/datamodel/OCFile.java
	src/com/owncloud/android/files/services/FileDownloader.java
	src/com/owncloud/android/files/services/InstantUploadService.java
	src/com/owncloud/android/operations/SynchronizeFileOperation.java
	src/com/owncloud/android/operations/UploadFileOperation.java
	src/com/owncloud/android/ui/activity/FileDetailActivity.java
	src/com/owncloud/android/ui/activity/FileDisplayActivity.java
	src/com/owncloud/android/ui/activity/UploadFilesActivity.java
	src/com/owncloud/android/ui/fragment/FileDetailFragment.java
	src/com/owncloud/android/ui/fragment/OCFileListFragment.java
	src/eu/alefzero/webdav/ChunkFromFileChannelRequestEntity.java
	src/eu/alefzero/webdav/FileRequestEntity.java
	src/eu/alefzero/webdav/WebdavClient.java
2013-04-15 13:12:04 +02:00
.settings setting paths for file scheme 2012-05-17 22:42:03 +02:00
.tx Updated translation files 2013-03-11 13:54:23 +01:00
actionbarsherlock@9598f2bb2c Updated copyright in source files 2013-02-07 18:45:10 +01:00
doc Create CodeStyleFormatter.xml 2013-04-09 17:49:37 +03:00
libs jackrabbit lib 2012-04-29 00:14:35 +02:00
oc_jb_workaround Replaced GPL v3 with GPL v2; PLEASE, note that GPL v2 still allows the code is used under the terms of later versions of GPL, depending upon the will of the user, so no right is being diminished 2013-02-08 09:22:46 +01:00
res Merge branch 'develop' into loggingtool 2013-04-15 13:12:04 +02:00
src Merge branch 'develop' into loggingtool 2013-04-15 13:12:04 +02:00
tests Replaced GPL v3 with GPL v2; PLEASE, note that GPL v2 still allows the code is used under the terms of later versions of GPL, depending upon the will of the user, so no right is being diminished 2013-02-08 09:22:46 +01:00
third_party force update support library for outdated actionbarsherlock library 2012-10-06 11:58:11 +02:00
.classpath let tests run on emulator 2.2 2012-09-30 14:01:36 +02:00
.gitignore missing files 2011-09-04 13:46:28 +02:00
.gitmodules Added submodule: actionbarsherlock 2012-02-05 22:41:01 +01:00
.project junit for android app 2012-09-30 01:14:38 +02:00
AndroidManifest.xml Merge branch 'develop' into loggingtool 2013-04-15 13:12:04 +02:00
build.xml add buildscripts for environment setup and building with ant 2012-06-25 19:46:14 +02:00
CONTRIBUTING.md Added CONTRIBUTING.md and THIRD_PARTY.txt 2013-03-25 15:08:40 +01:00
issue_template.md Added CONTRIBUTING.md and THIRD_PARTY.txt 2013-03-25 15:08:40 +01:00
LICENSE.txt Added GPL v2 license text 2013-02-08 09:23:22 +01:00
pom.xml Added pom for building via maven. Actionbarsherlock and android resources gets resolved as maven dependencies, and the apk is built via android-maven-plugin. 2013-02-02 15:00:36 +01:00
proguard.cfg adjusting design to holo, stability for account setup 2012-05-13 16:13:13 +02:00
project.properties Added dialog in the main app to advise users about the workaround app 2013-01-30 13:46:15 +01:00
README.md setup_env.bat included and improved setup text a bit 2013-03-13 22:32:44 +01:00
SETUP.md setup_env.bat included and improved setup text a bit 2013-03-13 22:32:44 +01:00
setup_env.bat setup_env.bat included and improved setup text a bit 2013-03-13 22:32:44 +01:00
setup_env.sh force update support library for outdated actionbarsherlock library 2012-10-06 11:58:11 +02:00
THIRD_PARTY.txt Added CONTRIBUTING.md and THIRD_PARTY.txt 2013-03-25 15:08:40 +01:00

This is the android client for owncloud.

Make sure you read SETUP.md when you start working on this project.