Thomas Müller 32b29c9d73 Merge branch 'master' into fix-7307 ... Conflicts: core/js/router.js settings/js/admin.js		2014-03-06 00:15:08 +01:00
..
ajax	don't urldecode get var, php does this automatically	2014-01-30 16:32:45 +01:00
appinfo	Replace OC.Router.generate() with OC.generateUrl()	2014-03-02 22:30:24 +01:00
css	Consolidate two sections, per code review. Issue #1648	2014-02-17 12:57:54 -05:00
js	Improve jQuery element selector	2014-02-20 18:24:43 +01:00
l10n	remove ru_RU - it has bee removed from transifex	2014-01-13 16:41:10 +01:00
lib	Merge branch 'master' into display-share-owner-master	2014-02-28 14:54:10 +01:00
templates	disable autocomplete for shared link password input, fix #7419	2014-02-26 14:48:15 +01:00
tests	fix path in sharing results if it is a file in the Shared folder	2014-02-25 17:27:23 +01:00
public.php	Fix svg icons for public shares and external/shared files	2014-02-19 15:08:05 +01:00