593 commits

Author	SHA1	Message	Date
masensio	ac836eddb7	Merge branch 'develop' into send_file_pr311_with_develop	2014-02-27 08:40:17 +01:00
Mr. Jenkins	0641afc93d	[tx-robot] updated from transifex	2014-02-27 01:14:38 -05:00
masensio	54d99ee9f6	Merge branch 'develop' into send_file_pr311_with_develop	2014-02-26 10:15:37 +01:00
Mr. Jenkins	1948d435d7	[tx-robot] updated from transifex	2014-02-26 01:14:35 -05:00
masensio	e183acd650	Merge branch 'develop' into send_file_pr311_with_develop	2014-02-25 11:12:48 +01:00
Mr. Jenkins	e8cb4a594e	[tx-robot] updated from transifex	2014-02-25 01:14:46 -05:00
masensio	af1f880b27	Merge branch 'develop' into send_file_pr311_with_develop	2014-02-24 13:33:23 +01:00
masensio	271078a403	Merge branch 'master' into develop	2014-02-24 13:16:57 +01:00
masensio	4852ca8dd4	Merge branch 'develop' into send_file_pr311_with_develop	2014-02-24 13:02:10 +01:00
Mr. Jenkins	d7b3f42664	[tx-robot] updated from transifex	2014-02-22 01:14:58 -05:00
masensio	4172b5824f	Merge branch 'develop' into send_file_pr311_with_develop	2014-02-21 09:22:32 +01:00
Mr. Jenkins	1d5087d736	[tx-robot] updated from transifex	2014-02-20 02:29:39 -05:00
David A. Velasco	42fc189367	Implemented option to copy shared link in clipboard instead of trusting in external clipboard front-ends	2014-02-19 18:00:49 +01:00
Mr. Jenkins	0f2787afeb	[tx-robot] updated from transifex	2014-02-19 09:43:23 -05:00
masensio	8db07c67b6	OC-3016: Add option 'send_files_to_other_apps' with default value 'on'	2014-02-19 10:33:27 +01:00
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