Thomas Müller 6ff96b34ad Merge branch 'master' into load-apps-proper-master ... Conflicts: apps/files/ajax/rawlist.php cron.php ocs/v1.php		2014-03-21 14:05:08 +01:00
..
ajax	Merge branch 'master' into load-apps-proper-master	2014-03-21 14:05:08 +01:00
avatar	Base defaultavatar text on displayname	2013-09-28 16:46:53 +02:00
command	Merge branch 'master' into load-apps-proper-master	2014-03-21 14:05:08 +01:00
css	Fix #7758	2014-03-19 16:45:10 +01:00
doc	fix difference between packaged version and master	2013-08-17 10:33:11 +02:00
img	compress mail notification logo	2014-03-03 12:42:58 +01:00
js	Merge pull request #7557 from owncloud/issue/7297	2014-03-19 15:53:08 +01:00
l10n	[tx-robot] updated from transifex	2014-03-21 01:55:35 -04:00
lostpassword	Translate string when an error occured while sending a forgot password mail	2014-02-26 17:29:47 +01:00
setup	Change MySQL to MySQL/MariaDB in the frontend	2014-02-07 17:03:43 +01:00
skeleton	add a real examplefile instead of an .gitignore which is a bit stupid here	2013-10-04 10:21:33 +02:00
tags	JS version of the OCP\ITags interface	2013-10-04 17:21:52 +02:00
templates	add 'body-public' ID to body in base layout so it can be identified via CSS	2014-03-14 11:08:16 +01:00
register_command.php	Add command line tool to show numbers of users and user directories	2014-01-07 23:06:37 +01:00
routes.php	Replace OC.Router.generate() with OC.generateUrl()	2014-03-02 22:30:24 +01:00
strings.php	remove superfluous ?> at the end of .php files (left out apps/*/templates)	2012-07-09 16:51:16 +02:00