📱 Nextcloud Android app
Find a file
masensio e5e5b3638c Merge branch 'develop' into reliable_uploads
Conflicts:
	SETUP.md
	owncloud-android-library
	res/menu/main_menu.xml
	res/values/strings.xml
	src/com/owncloud/android/db/DbHandler.java
	src/com/owncloud/android/db/ProviderMeta.java
	src/com/owncloud/android/files/FileMenuFilter.java
	src/com/owncloud/android/files/FileOperationsHelper.java
	src/com/owncloud/android/files/services/FileDownloader.java
	src/com/owncloud/android/files/services/FileUploader.java
	src/com/owncloud/android/operations/SynchronizeFileOperation.java
	src/com/owncloud/android/operations/UploadFileOperation.java
	src/com/owncloud/android/ui/activity/ComponentsGetter.java
	src/com/owncloud/android/ui/activity/ConflictsResolveActivity.java
	src/com/owncloud/android/ui/activity/FileActivity.java
	src/com/owncloud/android/ui/activity/FileDisplayActivity.java
	src/com/owncloud/android/ui/activity/Preferences.java
	src/com/owncloud/android/ui/activity/UploadFilesActivity.java
	src/com/owncloud/android/ui/activity/Uploader.java
	src/com/owncloud/android/ui/adapter/FileListListAdapter.java
	src/com/owncloud/android/ui/fragment/ExtendedListFragment.java
	src/com/owncloud/android/ui/fragment/FileDetailFragment.java
	src/com/owncloud/android/ui/preview/PreviewImageActivity.java
2015-08-18 15:14:37 +02:00
.settings OC-216: Hide Refresh Button. OC-65 2013-06-03 12:43:42 +02:00
.tx Update transifex strings 2013-10-17 18:07:13 +02:00
automationTest update -gitignore and readme 2015-06-08 15:02:29 +02:00
doc xml wasn't readable... hopefully now 2013-04-18 00:12:25 +02:00
gradle/wrapper Merge branch 'develop2' into imageGrid2 2015-01-19 21:02:37 +01:00
libs Enforce to add empty folders lost by git 2015-05-26 14:00:41 +02:00
oc_jb_workaround Update build.gradle to 1.2.3 2015-08-03 15:07:20 +02:00
owncloud-android-library@dbc8c325d7 Merge branch 'develop' 2015-08-07 10:17:03 +02:00
res Merge branch 'develop' into reliable_uploads 2015-08-18 15:14:37 +02:00
src Merge branch 'develop' into reliable_uploads 2015-08-18 15:14:37 +02:00
tests Update year in license 2015-03-05 13:27:45 +01:00
third_party/touch-image-view Added exploded appcompat-v7 AAR to allow building from Ant and Eclipse 2015-05-26 13:31:50 +02:00
user_manual Update version number 2015-01-27 16:35:45 -08:00
.classpath undo classpath change 2014-11-25 21:16:30 +01:00
.gitignore Merge branch 'develop' of github.com:owncloud/android into reliable_uploads 2014-12-01 07:43:56 +01:00
.gitmodules Updated documents and .gitmodules with new policy: PRs should go to master, no more to develop 2015-08-07 09:15:14 +02:00
.project junit for android app 2012-09-30 01:14:38 +02:00
.travis.yml Merge remote-tracking branch 'origin/develop' into navigationDrawer_basic 2015-06-15 14:07:49 +02:00
AndroidManifest.xml Merge branch 'develop' into reliable_uploads 2015-08-18 15:14:37 +02:00
build.gradle Update buildTools version to 22.0.1 2015-08-04 11:14:51 +02:00
build.xml add buildscripts for environment setup and building with ant 2012-06-25 19:46:14 +02:00
CHANGELOG.md Update CHANGELOG.MD 2015-07-06 11:48:52 +02:00
CONTRIBUTING.md Updated documents and .gitmodules with new policy: PRs should go to master, no more to develop 2015-08-07 09:15:14 +02:00
gradlew Commit for the PR 2014-10-28 16:09:34 +01:00
gradlew.bat Commit for the PR 2014-10-28 16:09:34 +01:00
issue_template.md Added CONTRIBUTING.md and THIRD_PARTY.txt 2013-03-25 15:08:40 +01:00
LICENSE.txt Copyright note fixes 2013-04-17 12:26:13 +02:00
pom.xml Commit for the PR 2014-10-28 16:09:34 +01:00
proguard.cfg adjusting design to holo, stability for account setup 2012-05-13 16:13:13 +02:00
project.properties Added exploded appcompat-v7 AAR to allow building from Ant and Eclipse 2015-05-26 13:31:50 +02:00
README.md Updated documents and .gitmodules with new policy: PRs should go to master, no more to develop 2015-08-07 09:15:14 +02:00
settings.gradle Update gradle - remove actionSherlock 2015-05-21 16:43:34 +02:00
SETUP.md Updated documents and .gitmodules with new policy: PRs should go to master, no more to develop 2015-08-07 09:15:14 +02:00
setup_env.bat Fixed setup_env.sh 2015-05-26 13:45:35 +02:00
setup_env.sh Trying different options to update support library project (fixing Travis build) 2015-06-15 13:19:50 +02:00
THIRD_PARTY.txt Update THIRD_PARTY License 2015-05-27 14:23:38 +02:00

#This is the Android client for ownCloud

The app performs file synchronization with an ownCloud server. Other ownCloud features may be added in the future, but they are not a priority right now.

Build Status on

Git master: Build Status

Git stable: Build Status

Development

Project Setup

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

Contributing

Please see Contribution Guidelines. Fork this repository and contribute back using pull requests. All pull requests should be based on, and targeted to, the 'master' branch.