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
|
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
|
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 |
|
Jenkins for ownCloud
|
940f0cc89c
|
[tx-robot] updated from transifex
|
2014-12-06 01:13:30 -05: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 |
|
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 |
|
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 |
|
tobiasKaminsky
|
0809b821e8
|
- restore some files :/
|
2014-11-29 11:32:00 +01:00 |
|
tobiasKaminsky
|
12f515936d
|
Temporary fix of missing escape for apostrophe
|
2014-11-29 11:28:21 +01:00 |
|
tobiasKaminsky
|
9fcba0b801
|
cleanup
|
2014-11-29 11:23:16 +01:00 |
|
tobiasKaminsky
|
95967c2151
|
- trigger mediaScan when files are deleted remote
|
2014-11-29 11:12:03 +01:00 |
|
tobiasKaminsky
|
cb9927fb00
|
- trigger works when moving files
|
2014-11-29 10:37:13 +01:00 |
|
jabarros
|
b2af9efa78
|
Merge pull request #768 from owncloudChalmers/owncloud_submodule
Change submodule from owncloudChalmers/android-library to owncloud/android-library
|
2014-11-28 14:25:32 +01:00 |
|
Jorge Antonio Diaz-Benito Soriano
|
37a374df58
|
Change submodule from owncloudChalmers/android-library to ownCloud/android-library
|
2014-11-28 12:16:34 +01:00 |
|
jabarros
|
b80060f941
|
Update owncloud library reference
|
2014-11-28 10:55:39 +01:00 |
|
jabarros
|
9990eb9495
|
Merge pull request #661 from owncloudChalmers/gradleWithInternalDependency
Gradle support (squashed history)
|
2014-11-28 09:10:45 +01:00 |
|
Jenkins for ownCloud
|
37713d798b
|
[tx-robot] updated from transifex
|
2014-11-28 01:13:32 -05:00 |
|
David A. Velasco
|
44c0d86ede
|
Merge pull request #752 from owncloud/instant_uploads_set_path
Better UI for settings path of instant uploads
|
2014-11-26 13:10:04 +01:00 |
|
jabarros
|
849dde6703
|
Changed var to parcelable in FolderPickerActivity
|
2014-11-26 13:06:00 +01:00 |
|
jabarros
|
48b3852f7b
|
Refactor after CR
|
2014-11-26 12:51:16 +01:00 |
|
jabarros
|
5c0e9ca5f2
|
Changes after CR
|
2014-11-26 09:05:23 +01:00 |
|
Jorge Antonio Diaz-Benito Soriano
|
9764f939f5
|
Update the submodule version to the restored .gitignore
|
2014-11-25 21:34:20 +01:00 |
|