1772 commits

This branch

This branch

All branches

Author	SHA1	Message	Date
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
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
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