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 |
|
masensio
|
af7dc662d0
|
Update library reference
|
2014-02-06 11:30:57 +01:00 |
|
masensio
|
1bdf1e60f1
|
Merge branch 'share_link__new_share' into share_link__unshare_file
|
2014-02-06 11:23:30 +01:00 |
|
masensio
|
45b73934fa
|
OC-2841: Fix bug: Folder doesn't refresh and loading is in the action bar for more than 12 minutes
|
2014-02-06 11:13:36 +01:00 |
|
David A. Velasco
|
f0477ef854
|
Updated code to compose recommendation text for friends so that it allows the inclusion of the username
|
2014-02-06 09:30:36 +01:00 |
|
David A. Velasco
|
08cec8f7a2
|
Allow setup of display name in the action bar for root folder
|
2014-02-05 19:10:08 +01:00 |
|
masensio
|
b228f472c0
|
OC-2845: Fix app crashes when trying to share the Shared folder
|
2014-02-05 17:58:08 +01:00 |
|
masensio
|
de29fd38ce
|
OC-2833: Access to unshare link from PreviewImageFragment
|
2014-02-05 17:32:29 +01:00 |
|
masensio
|
6951154b11
|
Update Library reference
|
2014-02-05 17:07:37 +01:00 |
|
masensio
|
e8af3821ac
|
OC-2840: Update library reference
|
2014-02-05 16:38:16 +01:00 |
|
masensio
|
3f701c5bb8
|
OC-2834: Access to unshare link from PreviewMediaFragment
|
2014-02-05 12:52:55 +01:00 |
|
masensio
|
ffdd188f06
|
OC-2834: Access to unshare link from FileDetailFragment
|
2014-02-05 11:39:18 +01:00 |
|
masensio
|
56c28cd0aa
|
Update library reference
|
2014-02-05 11:31:51 +01:00 |
|
masensio
|
e437d8320d
|
Merge branch 'share_link__new_share' into share_link__unshare_file
|
2014-02-05 11:25:39 +01:00 |
|
David A. Velasco
|
44c730167c
|
Enabled action to share file with link in preview of images
|
2014-02-05 10:53:47 +01:00 |
|
masensio
|
c1af013596
|
OC-2832: Accesss to share link from PreviewMediaFragment
|
2014-02-05 10:42:00 +01:00 |
|
masensio
|
046a566ed4
|
OC-2822: Loading progress dialog while share link is being created. Fix a problem when the app for sharing is not selected
|
2014-02-05 10:18:46 +01:00 |
|
masensio
|
173c810cc1
|
OC-2680: Shared icon is shown when file is shared. Update in DB file.isShareByLink
|
2014-02-05 10:17:10 +01:00 |
|
masensio
|
44aeecb27f
|
OC-2822: Add 'loading' progress dialog while the share link is being created
|
2014-02-05 09:13:31 +01:00 |
|
masensio
|
e2af381b88
|
OC-2823: Show toast message when CreateShareOperation failes
|
2014-02-05 09:01:46 +01:00 |
|
masensio
|
d770f62ed8
|
Merge branch 'develop' into share_link__new_share
|
2014-02-05 08:50:19 +01:00 |
|
Mr. Jenkins
|
3596628da1
|
[tx-robot] updated from transifex
|
2014-02-05 01:55:24 -05:00 |
|
David A. Velasco
|
3eb043caf0
|
Merge branch 'develop' into share_link__new_share
|
2014-02-04 14:43:36 +01:00 |
|
David A. Velasco
|
ef95cea5c9
|
Updated pointer to android library
|
2014-02-04 14:26:20 +01:00 |
|
David A. Velasco
|
3738df0e8c
|
Merge remote-tracking branch 'origin/develop' into develop
|
2014-02-04 14:22:23 +01:00 |
|
David A. Velasco
|
e2a4ad78de
|
Connected selection of app to send share link with creation of share resource, and link send to chosen app
|
2014-02-04 14:19:23 +01:00 |
|
masensio
|
09bb7bce23
|
Merge branch 'share_link_show_shared_files' into share_link__unshare_file
|
2014-02-04 13:31:30 +01:00 |
|
masensio
|
7966a9d62e
|
Changes from comments in PR #385
|
2014-02-04 12:49:15 +01:00 |
|
masensio
|
dcc540358d
|
Changes from comments in PR #385
|
2014-02-04 12:31:46 +01:00 |
|
masensio
|
b6a9e6d6a7
|
Merge pull request #386 from owncloud/share_link_show_shared_files
Show 'shared' icon on files shared by the user in the list of files.
|
2014-02-04 01:18:00 -08:00 |
|
masensio
|
816ec123b5
|
Merge pull request #384 from owncloud/share_link__new_share_menu
Added custom menu to show apps able to receive a link, filtering out ownCloud
|
2014-02-04 00:46:44 -08:00 |
|
David A. Velasco
|
5034e44599
|
Merge remote-tracking branch 'origin/develop' into develop
|
2014-02-04 08:33:23 +01:00 |
|
Mr. Jenkins
|
1b5320094e
|
[tx-robot] updated from transifex
|
2014-02-04 01:13:58 -05:00 |
|
David A. Velasco
|
7f3be4620e
|
Extra check on progress of refresh to decide visibility of progress circle
|
2014-02-03 15:19:50 +01:00 |
|
masensio
|
a8b46b7d95
|
OC-2735: Refresh unshare files in list
|
2014-02-03 15:14:42 +01:00 |
|