Bjoern Schiessle 51295e9a6b Merge branch 'master' into sharing_mail_notification_master ... Conflicts: apps/files/index.php apps/files/templates/index.php		2013-10-04 12:30:49 +02:00
..
ajax	Move ajax/changepassword to changepassword/controller to use autoloading	2013-09-13 17:03:13 +02:00
changepassword	fixing syntax error - it it that hard to test own code?	2013-09-18 23:46:58 +02:00
css	increase height of controls bar and elements to more clickable 44px	2013-10-04 08:41:16 +03:00
img	show 'More apps' link to app administration directly in app navigation	2013-08-07 18:18:09 +02:00
js	Hide defaultavatar in #header and don't darken proper avatars in #header	2013-10-04 02:27:53 +02:00
l10n	[tx-robot] updated from transifex	2013-09-30 10:19:22 -04:00
templates	Merge branch 'master' into sharing_mail_notification_master	2013-09-16 10:40:06 +02:00
admin.php	Merge branch 'master' into sharing_mail_notification_master	2013-09-05 13:39:45 +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	Pass view in \OC_Avatar to constructor and use $_ for enable_avatars	2013-09-09 16:57:46 +02:00
routes.php	Improve changepassword route naming	2013-09-13 17:07:23 +02:00
settings.php	Enhanced auth is totally unmaintained and broken	2013-01-14 21:39:49 +01:00
users.php	Pass view in \OC_Avatar to constructor and use $_ for enable_avatars	2013-09-09 16:57:46 +02:00