masensio
|
1319089297
|
Merge pull request #397 from owncloud/add_callback_in_OperationsService_through_binder
Added subscription through binder and callback at operations end to OperationsService
|
2014-02-11 11:05:36 +01:00 |
|
masensio
|
9500c65dac
|
Merge branch 'share_link__unshare_file' into share_link__unshare_file__share_in_operation_service
|
2014-02-11 10:57:16 +01:00 |
|
masensio
|
c68012235a
|
Merge branch 'develop' into share_link__unshare_file
|
2014-02-11 10:56:31 +01:00 |
|
masensio
|
b599f945e6
|
OC-2895: Move execution of UnshareOperation to OperationsService
|
2014-02-11 10:53:30 +01:00 |
|
masensio
|
e9ce426cdc
|
OC-2896: Move execution of CreateShareOperation to OperationsService
|
2014-02-11 10:35:25 +01:00 |
|
David A. Velasco
|
e64a3cbf35
|
All the FileActivities bind to OperationsService on creation, and the later reports them when an operation finishes
|
2014-02-11 10:29:01 +01:00 |
|
Mr. Jenkins
|
34ac94ab4a
|
[tx-robot] updated from transifex
|
2014-02-11 01:15:14 -05:00 |
|
Dominique Hazael-Massieux
|
d290db9ab6
|
allow multi-line checkbox for preferences with long titles
inspired from http://stackoverflow.com/questions/2408708/show-extra-info-for-preference-screens-when-checkboxpreference-summary-field-is
|
2014-02-10 15:00:34 +01:00 |
|
David A. Velasco
|
28ef1bcf62
|
Merge branch 'develop' into release-1.5.4
|
2014-02-10 14:46:26 +01:00 |
|
masensio
|
5462271de8
|
Merge branch 'develop' into share_link__unshare_file
|
2014-02-10 13:49:12 +01:00 |
|
masensio
|
659fda0475
|
Merge branch 'develop' into share_link__unshare_file
|
2014-02-10 13:48:02 +01:00 |
|
Mr. Jenkins
|
bd58ddb532
|
[tx-robot] updated from transifex
|
2014-02-10 06:13:43 -05:00 |
|
masensio
|
8d62faf6c4
|
Merge remote-tracking branch 'origin/share_link__unshare_file' into share_link__unshare_file
|
2014-02-10 11:28:36 +01:00 |
|
masensio
|
9df401a7cd
|
OC-2880: fix bug In the detail view, changing the orientation of the device and unsharing, menu is not refreshing, for images view
|
2014-02-10 11:27:49 +01:00 |
|
masensio
|
47c90583ea
|
Merge branch 'develop' into release-1.5.4
|
2014-02-10 10:19:02 +01:00 |
|
David A. Velasco
|
61f36d2a93
|
Fixed local state of file after a successful reupload
|
2014-02-10 09:42:39 +01:00 |
|
masensio
|
eb2d8e28dc
|
Merge remote-tracking branch 'origin/share_link__unshare_file' into share_link__unshare_file
|
2014-02-10 09:37:23 +01:00 |
|
masensio
|
15309cac8b
|
OC-2880: Fix bug: In the detail view, changing the orientation of the device and unsharing, menu is not refreshing
|
2014-02-10 09:36:46 +01:00 |
|
masensio
|
0f47656718
|
Merge pull request #393 from owncloud/fix_unshare_while_downloading
Fixed wrong local state of a file after a download finishes
|
2014-02-10 09:33:18 +01:00 |
|
David A. Velasco
|
3e6de92847
|
Fixed wrong local state of a file after a download finishes
|
2014-02-10 09:29:33 +01:00 |
|
Mr. Jenkins
|
2b27144b0c
|
[tx-robot] updated from transifex
|
2014-02-09 04:17:42 -05:00 |
|
Philippe MARASSE
|
24356ea250
|
Modified actionbar to allow display of icon+text on tablets
|
2014-02-08 22:19:54 +01:00 |
|
Mr. Jenkins
|
2d17077936
|
[tx-robot] updated from transifex
|
2014-02-08 01:23:03 -05:00 |
|
masensio
|
7cf9c82cc0
|
OC-2868: Fix bug: Unshare a file that does not exist any more, no message is shown
|
2014-02-07 13:25:53 +01:00 |
|
masensio
|
eb7bbebc08
|
OC-2868: Fix bug: Unshare a file that does not exist any more, no message is shown
|
2014-02-07 12:54:52 +01:00 |
|
David A. Velasco
|
2bf0864806
|
Fixed issue 308 - crash when other apps hold accounts with the same name, different type
|
2014-02-07 12:34:20 +01:00 |
|
David A. Velasco
|
ffa7b51784
|
Merge branch 'develop' into release-1.5.4
|
2014-02-07 12:04:02 +01:00 |
|
masensio
|
ebbc1793e2
|
Merge branch 'develop' into share_link__unshare_file
|
2014-02-07 12:02:38 +01:00 |
|
masensio
|
e49e66042f
|
Update library reference
|
2014-02-07 11:25:59 +01:00 |
|
David A. Velasco
|
807047be7a
|
Updated link to library
|
2014-02-07 11:23:54 +01:00 |
|
David A. Velasco
|
9fd493aa10
|
Updated link to library in develop branch
|
2014-02-07 11:20:03 +01:00 |
|
masensio
|
8b5915c710
|
Update library reference
|
2014-02-07 11:18:41 +01:00 |
|
masensio
|
1c83e75115
|
Merge pull request #390 from owncloud/share_link__new_share
Share a file with a public link
|
2014-02-07 10:58:21 +01:00 |
|
David A. Velasco
|
c76d01ce0e
|
Updated library to fix bug in SAML authentication flow
|
2014-02-07 09:48:44 +01:00 |
|
masensio
|
469dc7759b
|
Merge pull request #389 from owncloud/share_link__refresh_shares_folder_per_folder
Share link refresh shares folder per folder
|
2014-02-07 09:27:06 +01:00 |
|
David A. Velasco
|
d6ac750421
|
Version up: 1.5.4 and JB workaround 1.0.12
|
2014-02-07 09:25:58 +01:00 |
|
David A. Velasco
|
cba8baa98d
|
Merge branch 'share_link__new_share' into release-1.5.4
|
2014-02-07 09:23:40 +01:00 |
|
masensio
|
fdedbaa18f
|
OC-2859: Refix the bug. Unshare option shouldn't appear in non-shared files/folders
|
2014-02-07 09:11:08 +01:00 |
|
David A. Velasco
|
dd7d44ed32
|
Considered servers without sharing support
|
2014-02-07 08:59:11 +01:00 |
|
masensio
|
ba81538da6
|
Merge remote-tracking branch 'origin/develop' into share_link__unshare_file
|
2014-02-07 08:51:48 +01:00 |
|
David A. Velasco
|
0fde0084e2
|
Merge branch 'share_link__new_share' into share_link__refresh_shares_folder_per_folder
|
2014-02-06 20:16:14 +01:00 |
|
David A. Velasco
|
da4aaa5aa1
|
Recovered sendStickyBroadcast instead of LocalBroadcastManager#sendbroadcast; events were lost on screen rotations
|
2014-02-06 20:10:21 +01:00 |
|
David A. Velasco
|
533924f538
|
Get share resources ONLY for the current folder being refreshed
|
2014-02-06 19:54:29 +01:00 |
|
masensio
|
d1aca3a171
|
OC-2859: Fix bug: Unshare option shouldn't appear in non-shared files/folders
|
2014-02-06 19:10:08 +01:00 |
|
masensio
|
3662fda2de
|
Merge pull request #388 from owncloud/setup_additions
Setup additions
|
2014-02-06 18:42:33 +01:00 |
|
David A. Velasco
|
62c382b1dc
|
Merge branch 'develop' into share_link__new_share
|
2014-02-06 15:13:40 +01:00 |
|
David A. Velasco
|
4db5295f56
|
Merge branch 'share_link__new_share' into setup_additions
|
2014-02-06 13:58:41 +01:00 |
|
masensio
|
462641531b
|
OC-2738: Update library reference
|
2014-02-06 13:51:23 +01:00 |
|
David A. Velasco
|
a9bf3f334d
|
Some high-priority strings needing translation
|
2014-02-06 13:16:16 +01:00 |
|
David A. Velasco
|
fc09783c1d
|
Added HookActivity for integration of external SDKs
|
2014-02-06 12:18:03 +01:00 |
|