kondou 65413a95dc Merge branch 'master' into oc_avatars ... Conflicts: config/config.sample.php		2013-09-03 04:43:11 +02:00
..
ajax	Merge pull request #4563 from owncloud/use_personal-password	2013-08-28 06:23:13 -07:00
css	Sanitize displayname, respect data @ $element, fix routename, clean after cropping, updateAvatar with displayname	2013-08-31 18:27:28 +02:00
img	show 'More apps' link to app administration directly in app navigation	2013-08-07 18:18:09 +02:00
js	Merge branch 'master' into oc_avatars	2013-09-03 04:43:11 +02:00
l10n	[tx-robot] updated from transifex	2013-09-01 13:30:40 -04:00
templates	Fix some of @jancborchardt's complaints in oc_avatars	2013-09-02 17:07:38 +02:00
admin.php	Remove gravatar and no-avatar functionality, prepare for default avatars even more and reword some stuff	2013-08-25 21:06:02 +02:00
apps.php	Use !== and === in settings.	2013-07-21 13:55:25 +02:00
help.php	fix difference between packaged version and master	2013-08-17 10:33:11 +02:00
languageCodes.php	remove ru_RU - fixes #3135	2013-08-17 11:43:37 +02:00
personal.php	Provide 'enable_avatars' in config.php, to disable avatars	2013-09-01 18:17:14 +02:00
routes.php	Remove gravatar and no-avatar functionality, prepare for default avatars even more and reword some stuff	2013-08-25 21:06:02 +02:00
settings.php	Enhanced auth is totally unmaintained and broken	2013-01-14 21:39:49 +01:00
users.php	Clean up some cruft	2013-08-26 17:41:19 +02:00