jabarros
|
4257aa1d9c
|
Merge branch 'develop' into obeySortOrder_fixmerge
|
2014-12-26 11:10:22 +01:00 |
|
jabarros
|
0b7c37671f
|
Merge pull request #755 from owncloud/OpenWithInContextMenu
"open with" in ContextMenu of downloaded files
|
2014-12-26 09:13:58 +01:00 |
|
jabarros
|
f0905fbaac
|
Merge pull request #784 from ekeitho/develop
subject mail populated when user shares >>file/folder<<
|
2014-12-26 09:04:02 +01:00 |
|
Jenkins for ownCloud
|
b64e5ff65b
|
[tx-robot] updated from transifex
|
2014-12-26 01:13:28 -05:00 |
|
Jenkins for ownCloud
|
db3c9440fb
|
[tx-robot] updated from transifex
|
2014-12-25 01:13:29 -05:00 |
|
Jenkins for ownCloud
|
64c3c9d53c
|
[tx-robot] updated from transifex
|
2014-12-24 01:13:31 -05:00 |
|
Keith Abdulla
|
150050aeb0
|
fix tab indent
|
2014-12-23 09:38:38 -08:00 |
|
Keith Abdulla
|
1db0d7daf2
|
create an extra string resource
|
2014-12-23 09:31:59 -08:00 |
|
jabarros
|
1cc6d8c612
|
Fixed. Yellow arrow is not gone when there is not something to download
|
2014-12-23 09:15:59 +01:00 |
|
Jenkins for ownCloud
|
a11f951ed7
|
[tx-robot] updated from transifex
|
2014-12-23 01:13:30 -05:00 |
|
Jenkins for ownCloud
|
29eba16031
|
[tx-robot] updated from transifex
|
2014-12-22 01:13:44 -05:00 |
|
Jenkins for ownCloud
|
68e8a942a1
|
[tx-robot] updated from transifex
|
2014-12-21 01:13:29 -05:00 |
|
Jenkins for ownCloud
|
167c86b4ac
|
[tx-robot] updated from transifex
|
2014-12-20 01:13:31 -05:00 |
|
Keith Abdulla
|
38d0a19307
|
fix string format and context method
|
2014-12-19 20:11:25 -08:00 |
|
David A. Velasco
|
981d4580cf
|
Merge pull request #718 from owncloudChalmers/multi2
Multiselect functionalty targeting https://github.com/owncloud/android/issues/596
|
2014-12-19 12:56:14 +01:00 |
|
jabarros
|
6e3d3cd016
|
Merge branch 'develop' into thumbnailForUpload
|
2014-12-19 10:58:08 +01:00 |
|
Jenkins for ownCloud
|
78c1a484e7
|
[tx-robot] updated from transifex
|
2014-12-19 01:13:38 -05:00 |
|
tobiasKaminsky
|
e23fa3acaa
|
renamed sortDirectory to sortFolder
|
2014-12-18 21:19:39 +01:00 |
|
Jenkins for ownCloud
|
f8acc67eb7
|
[tx-robot] updated from transifex
|
2014-12-18 01:13:30 -05:00 |
|
jabarros
|
ec820a29ac
|
Removed specific check for character '%' when renaming a folder
|
2014-12-17 13:36:38 +01:00 |
|
jabarros
|
d0aeb54738
|
Merge pull request #813 from owncloud/download_folder__improved_cancellation
Download folder improved cancellation
|
2014-12-17 13:25:02 +01:00 |
|
David A. Velasco
|
f382ae73e3
|
Removed unneeded logs
|
2014-12-17 12:54:45 +01:00 |
|
David A. Velasco
|
cc77ea37de
|
Added cancellation checks in SynchronizeFolderOperation before every RemoteOperation execution
|
2014-12-17 11:10:53 +01:00 |
|
jabarros
|
732ab432a4
|
Merge pull request #812 from owncloud/download_folder__update_contextual_menu_asap
Allow cancelling download of folders as soon as the SynchronizeFolderOpe...
|
2014-12-17 09:47:18 +01:00 |
|
David A. Velasco
|
9795a2bb2b
|
Merge pull request #811 from owncloud/download_folder_cancel_downloads
'Cancel folder download' cancels downloads of files already in the FileD...
|
2014-12-17 09:42:27 +01:00 |
|
David A. Velasco
|
1d0f705509
|
Allow cancelling download of folders as soon as the SynchronizeFolderOperation is in the OperationsService
|
2014-12-17 09:32:13 +01:00 |
|
Jenkins for ownCloud
|
b23d33b737
|
[tx-robot] updated from transifex
|
2014-12-17 01:13:32 -05:00 |
|
jabarros
|
98929a9c8f
|
Merge branch 'download_folder' into download_folder_cancel_downloads
|
2014-12-16 15:04:39 +01:00 |
|
jabarros
|
a4277dcd37
|
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...
|
2014-12-16 14:47:27 +01:00 |
|
jabarros
|
f22693cd4e
|
Added cancelation for each synchronizeFolderOperation when canceling download folder
|
2014-12-16 14:28:36 +01:00 |
|
jabarros
|
0c8d508a61
|
Run folder download cancelation in new thread
|
2014-12-16 14:15:46 +01:00 |
|
jabarros
|
cec7baba5b
|
'Cancel folder download' cancels downloads of files already in the FileDownloadService
|
2014-12-16 14:02:23 +01:00 |
|
David A. Velasco
|
727a941b3c
|
Show the download-in-progress icon in the folder as soon as the SynchronizeFolderOperation is created
|
2014-12-16 10:42:55 +01:00 |
|
Jenkins for ownCloud
|
2c48adc760
|
[tx-robot] updated from transifex
|
2014-12-16 01:13:32 -05:00 |
|
jabarros
|
5a4b0731f0
|
Merge pull request #806 from owncloud/download_folder__clean_SynchronizeFolderOperation
Clean SynchronizeFolderOperation
|
2014-12-15 15:01:55 +01:00 |
|
David A. Velasco
|
e650fd2c6f
|
Avoid unneeded parameter
|
2014-12-15 14:46:52 +01:00 |
|
David A. Velasco
|
46b5e21ef5
|
Merge pull request #801 from owncloud/community_image-preview-save-position
Restore the current image when the preview activity is hidden
|
2014-12-15 10:22:10 +01:00 |
|
David A. Velasco
|
407a31b3ca
|
Merge pull request #805 from owncloud/download_folder_cancel_menu_option
Show 'cancel download' option in folder actions menu when folder is bein...
|
2014-12-15 09:57:27 +01:00 |
|
Jenkins for ownCloud
|
3772a9d78e
|
[tx-robot] updated from transifex
|
2014-12-15 01:13:29 -05:00 |
|
Jenkins for ownCloud
|
c6ce747d8a
|
[tx-robot] updated from transifex
|
2014-12-14 01:13:29 -05:00 |
|
Jenkins for ownCloud
|
885e76abb1
|
[tx-robot] updated from transifex
|
2014-12-13 01:13:30 -05:00 |
|
David A. Velasco
|
e409b5afb6
|
Fixed a couple of null pointers
|
2014-12-12 13:30:55 +01:00 |
|
David A. Velasco
|
399251bc5a
|
Optimize operation flow
|
2014-12-12 13:06:12 +01:00 |
|
David A. Velasco
|
ddac353a0a
|
Delay load of cached information about folder (mLocalFolder) until the operation is really run
|
2014-12-12 12:57:53 +01:00 |
|
David A. Velasco
|
47559478ba
|
Merge pull request #803 from owncloud/download_folder_cancel
Add cancellation of folder synchronizations to OperationsService.
|
2014-12-12 12:32:41 +01:00 |
|
jabarros
|
bbf85d96de
|
Show 'cancel download' option in folder actions menu when folder is being downloaded
|
2014-12-12 12:02:01 +01:00 |
|
jabarros
|
0be6894ec3
|
Changes after CR
|
2014-12-12 10:40:13 +01:00 |
|
jabarros
|
4e2f886b44
|
Merge pull request #766 from owncloud/feedbackWithVersionNumber
Email from feedback contains version number
|
2014-12-12 10:05:49 +01:00 |
|
jabarros
|
a6a010440d
|
Added some fixes in OperationsService
|
2014-12-12 09:16:32 +01:00 |
|
Jenkins for ownCloud
|
9cdcea64ee
|
[tx-robot] updated from transifex
|
2014-12-12 01:13:36 -05:00 |
|