628 commits

Author	SHA1	Message	Date
David A. Velasco	0f99af779e	Merge branch 'share_link__unshare_file' into release-1.5.4	2014-02-18 11:16:22 +01:00
masensio	c6d4f4980b	Merge branch 'develop' into send_file_pr311_with_develop	2014-02-18 10:32:28 +01:00
Mr. Jenkins	c28ab3aec8	[tx-robot] updated from transifex	2014-02-18 04:21:22 -05:00
masensio	6cf78042b0	OC-2968: Filter out ownCloud from the list of apps able to receive the file	2014-02-17 13:54:02 +01:00
masensio	85db28795d	OC-2982: Update Settings	2014-02-17 13:11:28 +01:00
masensio	a5db2c2f68	HotFix to add Send File option, after PR#311	2014-02-17 09:16:29 +01:00
masensio	99686805e1	Merge branch 'develop' into send_file_pr311_with_develop	2014-02-17 08:45:52 +01:00
Mr. Jenkins	29318f128d	[tx-robot] updated from transifex	2014-02-17 02:25:08 -05:00
Mr. Jenkins	b5f8f72eaa	[tx-robot] updated from transifex	2014-02-16 01:20:41 -05:00
Mr. Jenkins	e87fdb87e8	[tx-robot] updated from transifex	2014-02-15 06:19:59 -05:00
masensio	7ead9a0fe4	Merge pull request #311 from tobiasKaminsky/develop ... Added support for sharing files:	2014-02-14 14:59:24 +01:00
David A. Velasco	fd0b92e9f2	Merge branch 'develop' into release-1.5.4	2014-02-14 14:54:47 +01:00
masensio	7309ea39a6	Merge pull request #401 from owncloud/share_link__unshare_file ... Share link unshare file	2014-02-14 14:47:19 +01:00
masensio	42834b213a	OC-2966: Change name of the action from 'Share' to 'Send'	2014-02-14 12:38:38 +01:00
masensio	065a9c0046	OC-2966: Change name of the action from 'Share' to 'Send'	2014-02-14 12:13:58 +01:00
masensio	296df1bb65	Merge branch 'pr/311' into pull_request_311_with_develop	2014-02-14 10:59:26 +01:00
Mr. Jenkins	3afa50db27	[tx-robot] updated from transifex	2014-02-14 04:20:44 -05:00
Mr. Jenkins	472169d692	[tx-robot] updated from transifex	2014-02-13 03:06:51 -05:00
Mr. Jenkins	036304a96b	[tx-robot] updated from transifex	2014-02-12 01:17:23 -05:00
masensio	c68012235a	Merge branch 'develop' into share_link__unshare_file	2014-02-11 10:56:31 +01:00
Mr. Jenkins	34ac94ab4a	[tx-robot] updated from transifex	2014-02-11 01:15:14 -05: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
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	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
masensio	ebbc1793e2	Merge branch 'develop' into share_link__unshare_file	2014-02-07 12:02:38 +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	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
David A. Velasco	a9bf3f334d	Some high-priority strings needing translation	2014-02-06 13:16:16 +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	3f701c5bb8	OC-2834: Access to unshare link from PreviewMediaFragment	2014-02-05 12:52:55 +01:00
masensio	e437d8320d	Merge branch 'share_link__new_share' into share_link__unshare_file	2014-02-05 11:25:39 +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
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
Mr. Jenkins	1b5320094e	[tx-robot] updated from transifex	2014-02-04 01:13:58 -05:00
masensio	8d493de0ea	OC-2734: Update Database for UnshareLink operation	2014-02-03 14:24:36 +01:00
David A. Velasco	77d22d5a31	Added filtered chooser dialog for activities that can receive a link	2014-02-03 14:24:28 +01:00
masensio	2b8588ab0b	OC-2732: Create 'unshare' option menu for a shared file/folder	2014-02-03 11:22:39 +01:00
David A. Velasco	59513cd56d	Merge branch 'share_link__new_share' into share_link__new_share_menu	2014-02-03 09:46:26 +01:00
masensio	261d8a5167	OC-2772:Display a message if the user selects to share a file or folder that does not exist on the server	2014-02-03 09:26:36 +01:00
Mr. Jenkins	30663bbc2d	[tx-robot] updated from transifex	2014-02-02 01:15:19 -05:00
masensio	0f7d8d8453	OC-2771: Add pop-up message if the server doesn't support Share API and Share Link option is selected	2014-02-01 19:38:36 +01:00
David A. Velasco	fbe5f83aee	Adding custom dialog to let the user choose what app should received a shared link [WIP]	2014-01-31 15:38:53 +01:00
Mr. Jenkins	f25faf6c50	[tx-robot] updated from transifex	2014-01-30 01:14:45 -05:00
masensio	7c0accf714	Merge branch 'share_link_show_shared_files' into share_link__code_improvements	2014-01-29 11:14:19 +01:00
masensio	063ec9eff5	Merge remote-tracking branch 'origin/develop' into share_link_show_shared_files	2014-01-29 11:06:48 +01:00
Mr. Jenkins	edd4d07ac0	[tx-robot] updated from transifex	2014-01-29 01:19:51 -05:00
David A. Velasco	c86d4d63cc	Merge branch 'share_link_show_shared_files' into share_link__new_share	2014-01-28 10:15:23 +01:00
masensio	0fe14f7457	OC-2490: Update sharelink icon.	2014-01-28 08:55:54 +01:00
Mr. Jenkins	b6a500fc68	[tx-robot] updated from transifex	2014-01-28 02:19:06 -05:00
masensio	388fdd2265	Merge branch 'develop' into share_link_show_shared_files	2014-01-27 14:00:07 +01:00
masensio	af87d2bb52	Merge pull request #360 from owncloud/oc_framework_cleanup_and_documentation ... Oc framework cleaned up and moved out	2014-01-27 01:14:01 -08:00
Mr. Jenkins	d5d8f3fb22	[tx-robot] updated from transifex	2014-01-27 02:19:06 -05:00
masensio	9d65b66999	OC-2585: Refresh the share items	2014-01-24 15:04:32 +01:00
masensio	a60643a0d0	OC-2700: Modify the layout list_item to show the share icon	2014-01-23 18:33:38 +01:00
Mr. Jenkins	a09ec0eee9	[tx-robot] updated from transifex	2014-01-23 01:14:28 -05:00
David A. Velasco	ef0df64070	Added entry menu to share files, whereever actions on files can be triggered	2014-01-22 13:31:52 +01:00
David A. Velasco	b8898a8864	Merge remote-tracking branch 'origin/develop' into share_link__new_share	2014-01-22 13:24:40 +01:00
David A. Velasco	8592c315eb	Merge branch 'develop' into release-1.5.3	2014-01-22 10:26:19 +01:00
Mr. Jenkins	4f84c74d1f	[tx-robot] updated from transifex	2014-01-22 01:14:29 -05:00
David A. Velasco	6d5949b0a2	Added app icon for xhdpi	2014-01-21 14:30:33 +01:00
masensio	2da9af3871	Merge branch 'develop' into share_link_show_shared_files	2014-01-20 11:36:10 +01:00
Mr. Jenkins	69743392f1	[tx-robot] updated from transifex	2014-01-20 01:14:27 -05:00
Mr. Jenkins	6483c8b913	[tx-robot] updated from transifex	2014-01-19 01:14:31 -05:00
Mr. Jenkins	61f53ad160	[tx-robot] updated from transifex	2014-01-18 01:14:30 -05:00
masensio	ae61e2d7d4	OC-2587:Add new string to setup.xml: share_api_link	2014-01-17 14:35:00 +01:00
Mr. Jenkins	2f5806da44	[tx-robot] updated from transifex	2014-01-17 01:14:30 -05:00
Mr. Jenkins	ce5b3e3118	[tx-robot] updated from transifex	2014-01-15 01:56:46 -05:00
Mr. Jenkins	bd5f59d376	[tx-robot] updated from transifex	2014-01-14 01:54:26 -05:00
Mr. Jenkins	09eb142860	[tx-robot] updated from transifex	2014-01-11 01:14:30 -05:00
Mr. Jenkins	03fb21540a	[tx-robot] updated from transifex	2014-01-09 01:14:27 -05:00
Mr. Jenkins	0e83e57373	[tx-robot] updated from transifex	2014-01-08 01:14:28 -05:00
Mr. Jenkins	72f6313df8	[tx-robot] updated from transifex	2014-01-07 01:14:46 -05:00
Mr. Jenkins	d9979bc30e	[tx-robot] updated from transifex	2014-01-06 01:14:49 -05:00
Mr. Jenkins	18637068f3	[tx-robot] updated from transifex	2014-01-05 01:14:45 -05:00
Mr. Jenkins	ff56f513e2	[tx-robot] updated from transifex	2014-01-02 01:15:03 -05:00
Mr. Jenkins	45593a5cfb	[tx-robot] updated from transifex	2013-12-30 01:14:29 -05:00
Mr. Jenkins	39dfccd2d4	[tx-robot] updated from transifex	2013-12-29 01:14:28 -05:00
Mr. Jenkins	d11e4898af	[tx-robot] updated from transifex	2013-12-27 01:14:29 -05:00
Mr. Jenkins	8185eb1189	[tx-robot] updated from transifex	2013-12-26 01:14:28 -05:00
Mr. Jenkins	0d7fa8b9d6	[tx-robot] updated from transifex	2013-12-24 01:14:28 -05:00
Mr. Jenkins	e25658837a	[tx-robot] updated from transifex	2013-12-22 01:15:05 -05:00
Mr. Jenkins	6effcdc5c3	[tx-robot] updated from transifex	2013-12-21 01:14:58 -05:00
Mr. Jenkins	429837e24b	[tx-robot] updated from transifex	2013-12-19 01:14:58 -05:00
Mr. Jenkins	21b2d159ca	[tx-robot] updated from transifex	2013-12-17 16:41:14 -05:00
Mr. Jenkins	c2bee9a6f3	[tx-robot] updated from transifex	2013-12-17 05:37:37 -05:00
Mr. Jenkins	45c612fdc9	[tx-robot] updated from transifex	2013-12-13 13:39:24 -05:00
David A. Velasco	ba8ee979d0	Merge branch 'master' into develop	2013-12-12 12:56:36 +01:00
Mr. Jenkins	e250504597	[tx-robot] updated from transifex	2013-12-11 11:38:03 -05:00
David A. Velasco	81e906bc34	Updated hint in URL input field	2013-12-10 13:53:21 +01:00
David A. Velasco	dae42a11b4	Added seasonal icon for winter holidays	2013-12-10 13:41:47 +01:00
Mr. Jenkins	619701c996	[tx-robot] updated from transifex	2013-12-07 21:22:34 -05:00