2313 commits

This branch

This branch

All branches

Author	SHA1	Message	Date
masensio	c8fc9cfa70	Merge branch 'develop' into remove_folder_size_info	2014-02-24 13:37:48 +01: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
masensio	a5215ce89e	OC-3049: Remove the database update for the folder size data: modify FileContentProvider and FileSyncAdapter.	2014-02-24 10:51:44 +01:00
Mr. Jenkins	d7b3f42664	[tx-robot] updated from transifex	2014-02-22 01:14:58 -05:00
masensio	3960309379	Fix import in AccountUtilsTest	2014-02-21 14:52:46 +01:00
masensio	049f659f77	OC-3049: Remove the database update for the folder size data	2014-02-21 14:46:09 +01:00
masensio	422f87c57f	OC-3047: Hide the file size when the file is a folder	2014-02-21 14:06:02 +01:00
masensio	4172b5824f	Merge branch 'develop' into send_file_pr311_with_develop	2014-02-21 09:22:32 +01:00
David A. Velasco	10e856c2e8	Updated .gitmodules for easier access to ownCloud library from different environments	2014-02-20 17:51:13 +01:00
David A. Velasco	6faa40fde5	Fixed problems unsharing links when other kind of shares exist on a file	2014-02-20 15:00:52 +01:00
David A. Velasco	8c6da0e6cc	Updated reference to library after filtering not public shares	2014-02-20 14:48:32 +01:00
David A. Velasco	fb3653daa2	Updated reference to library after fixing crash browsing into Shared folder	2014-02-20 12:59:41 +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
David A. Velasco	771d40b46a	Updated library reference	2014-02-19 16:28:08 +01:00
Mr. Jenkins	0f2787afeb	[tx-robot] updated from transifex	2014-02-19 09:43:23 -05:00
David A. Velasco	7a4ac19993	Version server is checked every time the root folder is refreshed, and both version and versionstring are in the server are saved locally	2014-02-19 12:28:24 +01:00
masensio	8db07c67b6	OC-3016: Add option 'send_files_to_other_apps' with default value 'on'	2014-02-19 10:33:27 +01:00
masensio	0308f468e9	Update with develop	2014-02-19 09:08:45 +01:00
masensio	9343650e84	Merge branch 'develop' into send_file_pr311_with_develop	2014-02-19 08:51:58 +01:00
David A. Velasco	34776c03ba	Updated library reference	2014-02-18 15:20:18 +01:00
masensio	3b4baa1faa	Merge pull request #405 from owncloud/wide_scope_library_clean_up ... Wide scope library clean up	2014-02-18 15:16:22 +01:00
masensio	8e0ecc6570	Update License in OwnCloudAccount.java	2014-02-18 15:15:22 +01:00
masensio	aa598936f7	OC-2765: App crashes when loging in servers without the patch	2014-02-18 11:36:06 +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
David A. Velasco	35503cbd6e	Updated library reference	2014-02-18 10:55:01 +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	a6aec931a7	OC-2971: Grant action is working in other views: Details, Videos, MP3 Player and Images	2014-02-18 09:45:20 +01:00
David A. Velasco	714e656f60	Updated library reference	2014-02-17 14:43:22 +01: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
David A. Velasco	4f7cd3ef94	Adapted to relocation of RemoveRemoteShareOperation in library	2014-02-17 13:08:18 +01:00
masensio	55e2a45ab8	Merge remote-tracking branch 'origin/release-1.5.4' into release-1.5.4	2014-02-17 13:03:30 +01:00
David A. Velasco	9e0f02131f	Merge branch 'share_link__unshare_file' into wide_scope_library_clean_up	2014-02-17 13:01:55 +01:00
David A. Velasco	7391fd5e5f	Updaty library reference	2014-02-17 12:49:08 +01:00
masensio	9b1a549226	OC-2967: Grant that files are downloaded automatically when the action is triggered on files not down	2014-02-17 12:44:08 +01:00
masensio	de2dd7b1b6	Merge branch 'develop' into send_file_pr311_with_develop	2014-02-17 09:20:45 +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
David A. Velasco	ae4febff5a	Updated reference to ownCloud library	2014-02-14 14:54:41 +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
David A. Velasco	4cc578faf9	Merge remote-tracking branch 'origin/share_link__unshare_file' into share_link__unshare_file	2014-02-14 14:37:32 +01:00