3041 commits

This branch

This branch

All branches

Author	SHA1	Message	Date
Luke Owncloud	1077a6de29	on downgrading upload db, delete and re-create	2014-12-11 08:32:38 +01:00
David A. Velasco	eab9d689c5	Fixed compilation error	2014-12-10 18:52:57 +01:00
David A. Velasco	11f6daf403	Fixed access to storage manager in SynchronizeFolderOperation	2014-12-10 18:31:26 +01:00
David A. Velasco	b309cafc15	Refactored OperationsService to hold two separated Handlers in two separated worker threads, one for SyncFolder, one for the rest	2014-12-10 18:30:05 +01:00
David A. Velasco	56eaed4529	Added construction of SynchronizeFolderOperation to OperationService	2014-12-10 18:28:43 +01:00
David A. Velasco	f89e06ec73	Merge pull request #795 from owncloud/download_folder_recursion ... Resolve recursion on new SyncFolderOperation creating new instances of S...	2014-12-10 18:21:05 +01:00
jabarros	d564ef443c	Resolve recursion on new SyncFolderOperation creating new instances of SynFolderOperation and running them	2014-12-10 16:23:46 +01:00
jabarros	c34646aed3	Merge branch 'fix_protocol_send_mail' into fix_logs_change_orientation	2014-12-10 14:13:32 +01:00
David A. Velasco	154188c38f	Hurry up release of source bitmap in rotations	2014-12-10 12:48:31 +01:00
David A. Velasco	77554b2b51	Cancel load task when fragment becomes invisible (fixes crash in rotations)	2014-12-10 12:46:34 +01:00
jabarros	f533fa8205	Merge pull request #794 from owncloud/download_folder__add_download_to_operationService ... Updated OperationService to attend requests for FileSyncFolderOperations...	2014-12-10 11:03:43 +01:00
David A. Velasco	5be1cb743f	Merge pull request #791 from owncloud/download_folder_SynchronizeFolderOperation ... Download folder synchronize folder operation	2014-12-10 11:03:00 +01:00
jabarros	114b07fe2c	Changes after CR	2014-12-10 10:06:10 +01:00
David A. Velasco	b0278c232e	Updated OperationService to attend requests for FileSyncFolderOperations without a Binder in the caller Context	2014-12-10 09:39:52 +01:00
jabarros	0df8f178de	Merge pull request #754 from owncloud/RadioListOnAccounts ... Account list is now a radiobutton list	2014-12-10 08:45:12 +01:00
Keith Abdulla	3d8174a73e	fix tab	2014-12-09 23:01:48 -08:00
Jenkins for ownCloud	d0ec8b4ea3	[tx-robot] updated from transifex	2014-12-10 01:13:40 -05:00
Keith Abdulla	1704c4f788	move subject message strings into strings.xml	2014-12-09 17:51:10 -08:00
jabarros	6ccf48b337	Request the download of all the files in a folder (non recursively)	2014-12-09 11:18:57 +01:00
jabarros	ee688193df	Create new SyncFolderOperation	2014-12-09 10:55:17 +01:00
jabarros	1e847c4ac8	Rename SynchronizeFolderOperation to RefreshFolderOperation and update references	2014-12-09 10:54:18 +01:00
David A. Velasco	34433e924d	Merge remote-tracking branch 'rhabbachi/feature/308_sync_folder' into download_folder	2014-12-09 10:39:14 +01:00
Jenkins for ownCloud	cd883c67f7	[tx-robot] updated from transifex	2014-12-08 01:13:29 -05:00
Jenkins for ownCloud	dac3ced86d	[tx-robot] updated from transifex	2014-12-07 01:13:35 -05:00
Keith Abdulla	4957791128	subject mail populated when user shares file/folder	2014-12-06 02:07:35 -08:00
Jenkins for ownCloud	940f0cc89c	[tx-robot] updated from transifex	2014-12-06 01:13:30 -05:00
jabarros	700d444977	Fix. Avoid load logs again when changing device orientation	2014-12-05 14:33:04 +01:00
jabarros	766b51f497	Remove unused imports and split long lines modified	2014-12-05 10:12:57 +01:00
Sam	c8af196f2a	Merge branch 'develop' of https://github.com/owncloud/android into multi2	2014-12-05 10:07:48 +01:00
jabarros	7d0723261a	Fixed. App crashes when previewing an image	2014-12-05 09:33:34 +01:00
Jenkins for ownCloud	c7c53c93ba	[tx-robot] updated from transifex	2014-12-05 01:13:30 -05:00
Jenkins for ownCloud	da691e0bfd	[tx-robot] updated from transifex	2014-12-04 01:13:37 -05:00
David A. Velasco	50e39f044f	Merge branch 'master' into develop	2014-12-03 11:31:49 +01:00
jabarros	d58d6ca4d0	Merge pull request #773 from owncloud/triggerMediaScan ... Trigger media scan	2014-12-03 10:10:26 +01:00
Sam	382191d1f9	Merged with owncloud develop	2014-12-03 10:04:39 +01:00
David A. Velasco	f139a7204d	Removed empty method, and some unused imports	2014-12-03 09:41:49 +01:00
jabarros	bad9f30115	Merge branch 'release-1.6.2'	2014-12-03 09:33:07 +01:00
jabarros	dfb2dc0a32	Update owncloud library reference to 0.9.4	2014-12-03 09:31:41 +01:00
David A. Velasco	1e9ff8c5fa	Trigger MediaScan for every downloaded file in a renamed or moved folder	2014-12-02 14:23:49 +01:00
David A. Velasco	5167e646ad	Refactoring: removed old FileDataStorageManager#moveFolder method, redirected to newer FileDataStorageManager#moveLocalFile	2014-12-02 13:33:57 +01:00
David A. Velasco	0f39ff841a	Bug fixed (and some refactoring): crash on local removal of a folder	2014-12-02 11:17:47 +01:00
Magnus Sjoqvist	1a6319eba4	Removes build version magic numbers	2014-12-02 11:11:34 +01:00
David A. Velasco	c20d7ef4ad	Let Gradle out of Travis for the moment - needs additional review	2014-12-02 09:47:02 +01:00
David A. Velasco	2717c2a219	Refactoring: MediaScan triggered via FileDataStorageManager in RemoveFileDialogFragment	2014-12-02 09:29:26 +01:00
David A. Velasco	87f911c1ed	Refactoring: moved MediaScan trigger from DownloadFileOperation to FileDownloader service via FileDataStorageManager	2014-12-02 09:21:35 +01:00
David A. Velasco	e771c09ad9	Refactoring: move all the intents for MediaScanner in FileDataStorageManager to a single method	2014-12-02 09:16:56 +01:00
David A. Velasco	c95eb327f8	Refactoring: get MediaScan trigger out of OCFile for renaming	2014-12-02 09:08:55 +01:00
jabarros	0a0c808e3b	Merge pull request #662 from tobiasKaminsky/fileCount ... File count	2014-12-02 08:31:54 +01:00
tobiasKaminsky	eaa3b1ef56	Merge remote-tracking branch 'upstream/develop' into triggerMediaScan ... -fr/strings.xml Conflicts: src/com/owncloud/android/datamodel/FileDataStorageManager.java src/com/owncloud/android/datamodel/OCFile.java	2014-11-29 12:18:02 +01:00
tobiasKaminsky	e8a4780cbc	- test fix for android 4	2014-11-29 12:13:46 +01:00