Marcel Klehr a369347d86 Merge branch 'pr/1579' into toolbar-test ... Conflicts: settings.json.template src/static/js/pad_editbar.js		2014-03-16 13:30:22 +01:00
..
admin.js	redirect /admin to /admin/ so that the relative links work	2013-03-14 15:59:39 +01:00
adminplugins.js	/admin/plugins: Fix update check	2013-03-27 12:02:19 +01:00
adminsettings.js	Fix #1130 Reload settings on /admin/settings server restart	2012-11-06 17:35:52 +01:00
apicalls.js	Polish logging of client-side errors on the server	2013-10-10 18:45:22 +02:00
errorhandling.js	stats: Add http500, memoryUsage, pendingEdits gauges	2013-10-27 21:43:32 +01:00
importexport.js	‘Etherpad Lite’ -> ‘Etherpad’	2013-09-29 13:57:37 +02:00
padreadonly.js	Replace tabs indentation with spaces indentation	2013-12-05 08:41:29 +01:00
padurlsanitize.js	Replace tabs indentation with spaces indentation	2013-12-05 08:41:29 +01:00
socketio.js	add socketTransportProtocols parameter	2012-12-02 18:28:28 +01:00
specialpages.js	Merge branch 'pr/1579' into toolbar-test	2014-03-16 13:30:22 +01:00
static.js	Minify publishes its own mock request thing.	2012-09-03 14:37:26 -07:00
swagger.js	‘Etherpad Lite’ -> ‘Etherpad’	2013-09-29 13:57:37 +02:00
tests.js	Make async and cleaner	2013-02-04 00:00:39 +00:00
webaccess.js	Record metrics with 'measured'	2013-10-27 17:42:55 +01:00