2984 commits

This branch

This branch

All branches

Author	SHA1	Message	Date
masensio	ab8bf56a15	Detect if the account exists before the tranfer starts	2015-02-02 13:23:33 +01:00
David A. Velasco	7f23fa5a77	Merge pull request #844 from owncloud/delete_local_files ... Removal of media files is notified to MediaProvider directly - MediaScan API does not work properly in Android 4.x	2015-02-02 09:39:40 +01:00
masensio	c6124920d1	Changes from comments in PR 844	2015-02-02 09:34:43 +01:00
Jenkins for ownCloud	8bf624ff8f	[tx-robot] updated from transifex	2015-02-01 01:13:30 -05:00
Jenkins for ownCloud	2210ce961a	[tx-robot] updated from transifex	2015-01-31 01:13:34 -05:00
Jenkins for ownCloud	9d491f71ed	[tx-robot] updated from transifex	2015-01-30 01:13:31 -05:00
masensio	4354329b46	Fix bug: When renaming a folder, in the photos apps both folder are shown	2015-01-29 11:22:47 +01:00
Jenkins for ownCloud	16b36d0418	[tx-robot] updated from transifex	2015-01-29 01:13:38 -05:00
masensio	d19128e770	Merge branch 'develop' into delete_local_files	2015-01-28 10:37:08 +01:00
David A. Velasco	bcef916292	Removed commented code	2015-01-28 09:40:59 +01:00
masensio	d3b0747dde	Merge pull request #866 from owncloud/download_folder ... Download a folder	2015-01-28 09:31:25 +01:00
Jenkins for ownCloud	da67575522	[tx-robot] updated from transifex	2015-01-28 01:13:45 -05:00
Carla Schroder	b7664364d7	Update version number	2015-01-27 16:35:45 -08:00
Daniel Molkentin	0bb94f3c29	user manual: Fix incorrect line wrapping in config file	2015-01-27 23:41:33 +01:00
Daniel Molkentin	67ea45aa9f	Add means to build user manual via make	2015-01-27 23:40:53 +01:00
Daniel Molkentin	a9d12f3b1c	manual: omit ocdoc/* during doc generation	2015-01-27 23:35:45 +01:00
Carla Schroder	7d1839ee96	add submodule to user manual	2015-01-27 12:11:26 -08:00
Carla Schroder	ead95b9d9c	Add Android app manual to develop branch, and Allow building manual in owncloud themes	2015-01-27 12:07:43 -08:00
masensio	a69c04d8e9	Fix bug: audio are not refreshed when delete them from the app	2015-01-27 14:31:44 +01:00
David A. Velasco	0df1eeaac4	Fixed download of folder after updating credentials in the app	2015-01-27 13:50:14 +01:00
masensio	281a6b8e1a	Fix bug (Media Scan) Files are not refreshed when delete from the app)	2015-01-26 15:15:00 +01:00
David A. Velasco	e89e030077	Commented excess of logs	2015-01-26 13:37:46 +01:00
David A. Velasco	7d16de3c07	Fixed cancellation of SynchronizeOperationFolder	2015-01-26 13:32:54 +01:00
David A. Velasco	d860ae7cd4	Added indexed tree of synchronizing folders to SyncFolderHandler	2015-01-26 09:42:44 +01:00
Jenkins for ownCloud	97386bdb87	[tx-robot] updated from transifex	2015-01-26 01:13:30 -05:00
David A. Velasco	9093ef8f9f	Refactored SyncFolderHandler out of OperationsService	2015-01-23 09:34:45 +01:00
jabarros	7d21a9ec5d	Merge pull request #825 from owncloud/SettingsGreyedOut ... Instant Upload settings hide/show	2015-01-23 09:29:11 +01:00
David A. Velasco	a07937cb6f	Minimize refresh of list of files on reception of events from FileDownloader	2015-01-22 22:15:08 +01:00
David A. Velasco	265e32dee6	Added cancelation for subtrees	2015-01-22 20:01:41 +01:00
David A. Velasco	5b54915209	Added indexed tree of folders downloading anything	2015-01-22 17:06:09 +01:00
jabarros	68eb22929d	'Fixed. 'Upload pictures via WIFI only' is hidden when going to files and come back to settings	2015-01-22 13:49:31 +01:00
Jenkins for ownCloud	9fcb1612fe	[tx-robot] updated from transifex	2015-01-21 01:13:32 -05:00
David A. Velasco	e2a7138e0e	Merge pull request #851 from owncloud/download_folder_update_database ... Download folder update database	2015-01-20 13:07:50 +01:00
jabarros	dea36157e7	Update unsuccessful downloaded file	2015-01-20 13:00:37 +01:00
jabarros	d8ac7b2241	Merge branch 'download_folder__refactoring_observance_of_downloads_in_progress' into download_folder_update_database	2015-01-20 12:42:27 +01:00
jabarros	05c236ba62	Store file on db with 'downloading' state after adding it to pending downloads	2015-01-20 12:27:40 +01:00
David A. Velasco	d2883905c6	Revert changes for files uploading	2015-01-20 11:28:36 +01:00
jabarros	6674379a5f	Remove is_uploading field from database	2015-01-20 11:07:44 +01:00
David A. Velasco	49849786e5	Removed call to methods to check transfer state of files through binders and replaced with methods on OCFile	2015-01-20 09:42:58 +01:00
jabarros	d0cee8be85	Merge branch 'develop' into SettingsGreyedOut	2015-01-20 09:25:20 +01:00
Jenkins for ownCloud	99276bae85	[tx-robot] updated from transifex	2015-01-20 01:13:34 -05:00
jabarros	115268008e	Increase db number and added getters and setter for new 'uploading' and 'downloading' fields in OCFile	2015-01-19 14:41:34 +01:00
David A. Velasco	b6e4f0f4ae	Merge pull request #798 from LukeOwncloud/develop ... On downgrading upload db, delete and re-create	2015-01-19 13:44:30 +01:00
jabarros	3515ab160c	Added uploading and downloading fields into filelist table	2015-01-19 13:10:21 +01:00
jabarros	e98fc8b141	Merge branch 'develop' into download_folder	2015-01-19 12:49:28 +01:00
David A. Velasco	e99583ef68	Updated library reference	2015-01-19 11:29:43 +01:00
jabarros	9b653a1d9d	Merge branch 'develop' into delete_local_files	2015-01-19 11:03:05 +01:00
jabarros	0a8469ec1b	Merge pull request #843 from owncloud/update_Android_Gradle_plug_in ... Updated Android Gradle plug-in for compatibility with Android Studio 1.0...	2015-01-19 10:44:51 +01:00
jabarros	6022456fd5	Trigger Media Scan on parent folder when deleting a file or a folder from locally	2015-01-19 10:39:23 +01: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