David A. Velasco [Wed, 7 Jan 2015 17:23:53 +0000 (18:23 +0100)]
First try
jabarros [Wed, 31 Dec 2014 12:48:36 +0000 (13:48 +0100)]
Fix. App does not realize that the folder does not exits when traying to download a folder
jabarros [Tue, 23 Dec 2014 08:15:59 +0000 (09:15 +0100)]
Fixed. Yellow arrow is not gone when there is not something to download
jabarros [Wed, 17 Dec 2014 12:25:02 +0000 (13:25 +0100)]
Merge pull request #813 from owncloud/download_folder__improved_cancellation
Download folder improved cancellation
David A. Velasco [Wed, 17 Dec 2014 11:54:45 +0000 (12:54 +0100)]
Removed unneeded logs
David A. Velasco [Wed, 17 Dec 2014 10:10:53 +0000 (11:10 +0100)]
Added cancellation checks in SynchronizeFolderOperation before every RemoteOperation execution
jabarros [Wed, 17 Dec 2014 08:47:18 +0000 (09:47 +0100)]
Merge pull request #812 from owncloud/download_folder__update_contextual_menu_asap
Allow cancelling download of folders as soon as the SynchronizeFolderOpe...
David A. Velasco [Wed, 17 Dec 2014 08:42:27 +0000 (09:42 +0100)]
Merge pull request #811 from owncloud/download_folder_cancel_downloads
'Cancel folder download' cancels downloads of files already in the FileD...
David A. Velasco [Wed, 17 Dec 2014 08:32:13 +0000 (09:32 +0100)]
Allow cancelling download of folders as soon as the SynchronizeFolderOperation is in the OperationsService
jabarros [Tue, 16 Dec 2014 14:04:39 +0000 (15:04 +0100)]
Merge branch 'download_folder' into download_folder_cancel_downloads
jabarros [Tue, 16 Dec 2014 13:47:27 +0000 (14:47 +0100)]
Merge pull request #810 from owncloud/download_folder__better_downloading_icon_for_folders
Show the download-in-progress icon in the folder as soon as the Synchron...
jabarros [Tue, 16 Dec 2014 13:28:36 +0000 (14:28 +0100)]
Added cancelation for each synchronizeFolderOperation when canceling download folder
jabarros [Tue, 16 Dec 2014 13:15:46 +0000 (14:15 +0100)]
Run folder download cancelation in new thread
jabarros [Tue, 16 Dec 2014 13:02:23 +0000 (14:02 +0100)]
'Cancel folder download' cancels downloads of files already in the FileDownloadService
David A. Velasco [Tue, 16 Dec 2014 09:42:55 +0000 (10:42 +0100)]
Show the download-in-progress icon in the folder as soon as the SynchronizeFolderOperation is created
jabarros [Mon, 15 Dec 2014 14:01:55 +0000 (15:01 +0100)]
Merge pull request #806 from owncloud/download_folder__clean_SynchronizeFolderOperation
Clean SynchronizeFolderOperation
David A. Velasco [Mon, 15 Dec 2014 13:46:52 +0000 (14:46 +0100)]
Avoid unneeded parameter
David A. Velasco [Mon, 15 Dec 2014 08:57:27 +0000 (09:57 +0100)]
Merge pull request #805 from owncloud/download_folder_cancel_menu_option
Show 'cancel download' option in folder actions menu when folder is bein...
David A. Velasco [Fri, 12 Dec 2014 12:30:55 +0000 (13:30 +0100)]
Fixed a couple of null pointers
David A. Velasco [Fri, 12 Dec 2014 11:28:31 +0000 (12:28 +0100)]
Optimize operation flow
David A. Velasco [Thu, 11 Dec 2014 13:30:10 +0000 (14:30 +0100)]
Delay load of cached information about folder (mLocalFolder) until the operation is really run
David A. Velasco [Fri, 12 Dec 2014 11:32:41 +0000 (12:32 +0100)]
Merge pull request #803 from owncloud/download_folder_cancel
Add cancellation of folder synchronizations to OperationsService.
jabarros [Fri, 12 Dec 2014 11:02:01 +0000 (12:02 +0100)]
Show 'cancel download' option in folder actions menu when folder is being downloaded
jabarros [Fri, 12 Dec 2014 09:40:13 +0000 (10:40 +0100)]
Changes after CR
jabarros [Fri, 12 Dec 2014 08:16:32 +0000 (09:16 +0100)]
Added some fixes in OperationsService
jabarros [Thu, 11 Dec 2014 17:44:29 +0000 (18:44 +0100)]
Update OperationsService to receive requests for cancelling downloads (WIP)
jabarros [Thu, 11 Dec 2014 17:18:23 +0000 (18:18 +0100)]
Add call to OperationService for canceling transference of downloading a folder
jabarros [Thu, 11 Dec 2014 08:21:42 +0000 (09:21 +0100)]
Merge pull request #797 from owncloud/download_folder__in_a_separate_worker_thread
Download folder in a separate worker thread
David A. Velasco [Wed, 10 Dec 2014 17:52:57 +0000 (18:52 +0100)]
Fixed compilation error
David A. Velasco [Wed, 10 Dec 2014 17:04:21 +0000 (18:04 +0100)]
Fixed access to storage manager in SynchronizeFolderOperation
David A. Velasco [Wed, 10 Dec 2014 15:59:37 +0000 (16:59 +0100)]
Refactored OperationsService to hold two separated Handlers in two separated worker threads, one for SyncFolder, one for the rest
David A. Velasco [Wed, 10 Dec 2014 15:27:34 +0000 (16:27 +0100)]
Added construction of SynchronizeFolderOperation to OperationService
David A. Velasco [Wed, 10 Dec 2014 17:21:05 +0000 (18:21 +0100)]
Merge pull request #795 from owncloud/download_folder_recursion
Resolve recursion on new SyncFolderOperation creating new instances of S...
jabarros [Wed, 10 Dec 2014 15:23:46 +0000 (16:23 +0100)]
Resolve recursion on new SyncFolderOperation creating new instances of SynFolderOperation and running them
jabarros [Wed, 10 Dec 2014 10:03:43 +0000 (11:03 +0100)]
Merge pull request #794 from owncloud/download_folder__add_download_to_operationService
Updated OperationService to attend requests for FileSyncFolderOperations...
David A. Velasco [Wed, 10 Dec 2014 10:03:00 +0000 (11:03 +0100)]
Merge pull request #791 from owncloud/download_folder_SynchronizeFolderOperation
Download folder synchronize folder operation
jabarros [Wed, 10 Dec 2014 09:06:10 +0000 (10:06 +0100)]
Changes after CR
David A. Velasco [Wed, 10 Dec 2014 08:39:41 +0000 (09:39 +0100)]
Updated OperationService to attend requests for FileSyncFolderOperations without a Binder in the caller Context
jabarros [Tue, 9 Dec 2014 10:18:57 +0000 (11:18 +0100)]
Request the download of all the files in a folder (non recursively)
jabarros [Tue, 9 Dec 2014 09:55:17 +0000 (10:55 +0100)]
Create new SyncFolderOperation
jabarros [Tue, 9 Dec 2014 09:54:18 +0000 (10:54 +0100)]
Rename SynchronizeFolderOperation to RefreshFolderOperation and update references
David A. Velasco [Tue, 9 Dec 2014 09:39:14 +0000 (10:39 +0100)]
Merge remote-tracking branch 'rhabbachi/feature/308_sync_folder' into download_folder
Jenkins for ownCloud [Mon, 8 Dec 2014 06:13:29 +0000 (01:13 -0500)]
[tx-robot] updated from transifex
Jenkins for ownCloud [Sun, 7 Dec 2014 06:13:35 +0000 (01:13 -0500)]
[tx-robot] updated from transifex
Jenkins for ownCloud [Sat, 6 Dec 2014 06:13:30 +0000 (01:13 -0500)]
[tx-robot] updated from transifex
Jenkins for ownCloud [Fri, 5 Dec 2014 06:13:30 +0000 (01:13 -0500)]
[tx-robot] updated from transifex
Jenkins for ownCloud [Thu, 4 Dec 2014 06:13:37 +0000 (01:13 -0500)]
[tx-robot] updated from transifex
David A. Velasco [Wed, 3 Dec 2014 10:31:49 +0000 (11:31 +0100)]
Merge branch 'master' into develop
jabarros [Wed, 3 Dec 2014 09:10:26 +0000 (10:10 +0100)]
Merge pull request #773 from owncloud/triggerMediaScan
Trigger media scan
David A. Velasco [Wed, 3 Dec 2014 08:41:49 +0000 (09:41 +0100)]
Removed empty method, and some unused imports
jabarros [Wed, 3 Dec 2014 08:33:07 +0000 (09:33 +0100)]
Merge branch 'release-1.6.2'
jabarros [Wed, 3 Dec 2014 08:31:41 +0000 (09:31 +0100)]
Update owncloud library reference to 0.9.4
David A. Velasco [Tue, 2 Dec 2014 13:23:49 +0000 (14:23 +0100)]
Trigger MediaScan for every downloaded file in a renamed or moved folder
David A. Velasco [Tue, 2 Dec 2014 12:33:57 +0000 (13:33 +0100)]
Refactoring: removed old FileDataStorageManager#moveFolder method, redirected to newer FileDataStorageManager#moveLocalFile
David A. Velasco [Tue, 2 Dec 2014 10:17:47 +0000 (11:17 +0100)]
Bug fixed (and some refactoring): crash on local removal of a folder
David A. Velasco [Tue, 2 Dec 2014 08:47:02 +0000 (09:47 +0100)]
Let Gradle out of Travis for the moment - needs additional review
David A. Velasco [Tue, 2 Dec 2014 08:29:26 +0000 (09:29 +0100)]
Refactoring: MediaScan triggered via FileDataStorageManager in RemoveFileDialogFragment
David A. Velasco [Tue, 2 Dec 2014 08:21:35 +0000 (09:21 +0100)]
Refactoring: moved MediaScan trigger from DownloadFileOperation to FileDownloader service via FileDataStorageManager
David A. Velasco [Tue, 2 Dec 2014 08:16:56 +0000 (09:16 +0100)]
Refactoring: move all the intents for MediaScanner in FileDataStorageManager to a single method
David A. Velasco [Tue, 2 Dec 2014 08:08:48 +0000 (09:08 +0100)]
Refactoring: get MediaScan trigger out of OCFile for renaming
jabarros [Tue, 2 Dec 2014 07:31:54 +0000 (08:31 +0100)]
Merge pull request #662 from tobiasKaminsky/fileCount
File count
tobiasKaminsky [Sat, 29 Nov 2014 11:18:02 +0000 (12:18 +0100)]
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
tobiasKaminsky [Sat, 29 Nov 2014 11:13:46 +0000 (12:13 +0100)]
- test fix for android 4
tobiasKaminsky [Sat, 29 Nov 2014 10:32:00 +0000 (11:32 +0100)]
- restore some files :/
tobiasKaminsky [Tue, 18 Nov 2014 16:30:27 +0000 (17:30 +0100)]
Temporary fix of missing escape for apostrophe
tobiasKaminsky [Sat, 29 Nov 2014 10:23:16 +0000 (11:23 +0100)]
cleanup
tobiasKaminsky [Sat, 29 Nov 2014 10:12:03 +0000 (11:12 +0100)]
- trigger mediaScan when files are deleted remote
tobiasKaminsky [Sat, 29 Nov 2014 09:37:13 +0000 (10:37 +0100)]
- trigger works when moving files
jabarros [Fri, 28 Nov 2014 13:25:32 +0000 (14:25 +0100)]
Merge pull request #768 from owncloudChalmers/owncloud_submodule
Change submodule from owncloudChalmers/android-library to owncloud/android-library
Jorge Antonio Diaz-Benito Soriano [Fri, 28 Nov 2014 11:16:34 +0000 (12:16 +0100)]
Change submodule from owncloudChalmers/android-library to ownCloud/android-library
jabarros [Fri, 28 Nov 2014 09:55:39 +0000 (10:55 +0100)]
Update owncloud library reference
jabarros [Fri, 28 Nov 2014 08:10:45 +0000 (09:10 +0100)]
Merge pull request #661 from owncloudChalmers/gradleWithInternalDependency
Gradle support (squashed history)
Jenkins for ownCloud [Fri, 28 Nov 2014 06:13:32 +0000 (01:13 -0500)]
[tx-robot] updated from transifex
David A. Velasco [Wed, 26 Nov 2014 12:10:04 +0000 (13:10 +0100)]
Merge pull request #752 from owncloud/instant_uploads_set_path
Better UI for settings path of instant uploads
jabarros [Wed, 26 Nov 2014 12:06:00 +0000 (13:06 +0100)]
Changed var to parcelable in FolderPickerActivity
jabarros [Wed, 26 Nov 2014 11:51:16 +0000 (12:51 +0100)]
Refactor after CR
jabarros [Wed, 26 Nov 2014 08:05:23 +0000 (09:05 +0100)]
Changes after CR
Jorge Antonio Diaz-Benito Soriano [Tue, 25 Nov 2014 20:34:20 +0000 (21:34 +0100)]
Update the submodule version to the restored .gitignore
Jorge Antonio Diaz-Benito Soriano [Tue, 25 Nov 2014 19:46:44 +0000 (20:46 +0100)]
Restore .gitignore and SETUP.md, remove files that were added
jabarros [Tue, 25 Nov 2014 13:23:17 +0000 (14:23 +0100)]
Update owncloud library reference
tobiasKaminsky [Mon, 24 Nov 2014 19:15:57 +0000 (20:15 +0100)]
bugfix
David A. Velasco [Mon, 24 Nov 2014 13:15:38 +0000 (14:15 +0100)]
Update reference to library
Jorge Antonio Diaz-Benito Soriano [Mon, 24 Nov 2014 11:37:12 +0000 (12:37 +0100)]
Update submodule to version with updated .gitignore
Jorge Antonio Diaz-Benito Soriano [Mon, 24 Nov 2014 11:17:01 +0000 (12:17 +0100)]
Updated instructions to the continuous presence of the *.iml files
Jorge Antonio Diaz-Benito Soriano [Mon, 24 Nov 2014 10:57:01 +0000 (11:57 +0100)]
Update .gitignore and re-add missing files
tobiasKaminsky [Mon, 24 Nov 2014 09:59:31 +0000 (10:59 +0100)]
changed order to: file(s), folder(s)
jabarros [Mon, 24 Nov 2014 09:54:13 +0000 (10:54 +0100)]
Update owncloud library reference
Jenkins for ownCloud [Mon, 24 Nov 2014 06:13:31 +0000 (01:13 -0500)]
[tx-robot] updated from transifex
Jenkins for ownCloud [Sat, 22 Nov 2014 06:13:44 +0000 (01:13 -0500)]
[tx-robot] updated from transifex
tobiasKaminsky [Fri, 21 Nov 2014 17:12:48 +0000 (18:12 +0100)]
- removed Log
tobiasKaminsky [Fri, 21 Nov 2014 17:08:44 +0000 (18:08 +0100)]
fix bug #742
tobiasKaminsky [Fri, 21 Nov 2014 16:59:51 +0000 (17:59 +0100)]
Merge remote-tracking branch 'upstream/develop' into fileCount
tobiasKaminsky [Fri, 21 Nov 2014 16:58:32 +0000 (17:58 +0100)]
Merge remote-tracking branch 'upstream/develop' into triggerMediaScan
tobiasKaminsky [Fri, 21 Nov 2014 16:54:47 +0000 (17:54 +0100)]
Merge remote-tracking branch 'upstream/develop' into triggerMediaScan
Jorge Antonio Diaz-Benito Soriano [Fri, 21 Nov 2014 15:16:37 +0000 (16:16 +0100)]
Update submodule with the rebased version
Jorge Antonio Diaz-Benito Soriano [Fri, 21 Nov 2014 14:31:14 +0000 (15:31 +0100)]
Merge remote-tracking branch 'upstream/develop' into gradleWithInternalDependency
Jorge Antonio Diaz-Benito Soriano [Fri, 21 Nov 2014 14:31:04 +0000 (15:31 +0100)]
Update submodule
Jos Poortvliet [Fri, 21 Nov 2014 13:52:15 +0000 (14:52 +0100)]
Update README.md
Linking not to raw MD file but to the nicely formatted one in github :D
David A. Velasco [Fri, 21 Nov 2014 11:40:05 +0000 (12:40 +0100)]
Merge branch 'develop' into release-1.6.2
David A. Velasco [Fri, 21 Nov 2014 11:23:27 +0000 (12:23 +0100)]
Merge pull request #740 from owncloud/revert-669-master
Revert "Add "select all" option to photo (or other) upload screen"
projects / pub / Android / ownCloud.git / log