87 commits

Author	SHA1	Message	Date
John McLear	6d7e709ecb	Merge branch 'develop' of github.com:ether/etherpad-lite into store-sessions-in-db	2013-02-17 23:44:26 +00:00
John McLear	efce99c3a1	session key in settings file OR generate temp key for instance	2013-02-13 21:51:09 +00:00
John McLear	5c9d081391	Begin supporting the database but still have a problem where it generates new key on restart...	2013-02-13 01:33:22 +00:00
Manuel Knitza	e855bafdf9	Update src/node/hooks/express/apicalls.js	2013-02-12 21:47:40 +01:00
John McLear	da0b331502	Make async and cleaner	2013-02-04 00:00:39 +00:00
John McLear	8b8cf01785	put tests in static folder, still have a race condition no biggy	2013-02-03 13:53:44 +00:00
John McLear	0ff9f53297	correct path	2013-02-03 00:18:24 +00:00
John McLear	594d272334	allow plugins to specify frontend test specs	2013-02-03 00:14:17 +00:00
Marcel Klehr	0549a4fec7	Add checkUpdates endpoinnt for /admin/plugins	2013-01-26 22:13:28 +01:00
Wikinaut	5bf79971b8	merged upstream develop	2012-12-07 08:59:13 +01:00
Marcel Klehr	377ff1eade	Fix #1219: Make api work if requireAuth is enabled	2012-12-05 14:04:48 +01:00
Iván Eixarch	657322db91	fixed git merge confict	2012-12-03 01:39:59 +01:00
Wikinaut	8b044254cc	add socketTransportProtocols parameter	2012-12-02 18:28:28 +01:00
Marcel Klehr	719fb7e045	Let socket.io decide which transport is best for the browser	2012-11-29 13:42:37 +01:00
Iván Eixarch	cc60b82a6e	Import html by default and allow basic import/export features without abiword	2012-11-23 22:55:25 +01:00
Marcel Klehr	364e6928b5	Make tests work on windows	2012-11-17 16:28:54 +01:00
Peter 'Pita' Martischka	4c095202bd	Merged branch feature/frontend-tests	2012-11-13 07:29:57 -08:00
Marcel Klehr	d26f5d64f7	Fix #1130 Reload settings on /admin/settings server restart	2012-11-06 17:35:52 +01:00
John McLear	28bcdcec25	Merge pull request #1124 from Wikinaut/fix-issue-377-add-favicon-url-settings-parameter ... fix #377: add favicon url as optional settings.json parameter	2012-11-06 03:08:25 -08:00
John McLear	b9541f938b	Merge pull request #1127 from Pita/admin-page ... add express endpoint for admin index.html	2012-11-05 04:59:01 -08:00
John McLear	3766858dd2	add express endpoint for admin index.html	2012-11-05 12:58:02 +00:00
John McLear	b6a331b9ec	Merge pull request #1120 from Pita/feature/settings-admin ... Modify Server Settings in /admin/settings	2012-11-05 04:48:59 -08:00
Wikinaut	a575de7884	allow favicon.ico as pad name	2012-11-04 13:02:55 +01:00
Wikinaut	c92b5283fd	fix #377: add favicon url as optional settings.json parameter	2012-11-04 11:26:17 +01:00
Peter 'Pita' Martischka	6408581adb	merged develop back in	2012-11-03 18:16:36 +00:00
johnyma22	2f123970e6	Make express restart - I think this reloads settings	2012-11-02 15:21:12 +00:00
johnyma22	3ca450fefc	make the server save settings	2012-11-02 15:10:01 +00:00
johnyma22	89e38ed4c2	Start putting file system together for admin settings, no where near complete	2012-11-02 13:16:15 +00:00
Marcel Klehr	2d6e577683	Put up some '/admin doesn't exist' notice.	2012-11-01 19:45:26 +01:00
John McLear	5629063b9c	Allow robots.txt to be custom	2012-11-01 13:32:04 +00:00
Marcel Klehr	ed2faa68c9	Pass on the req object to eejs hooks	2012-11-01 13:44:59 +01:00
Peter 'Pita' Martischka	9537892c61	wrap spec files with a describe	2012-10-27 17:29:17 +01:00
Peter 'Pita' Martischka	cac27c864a	load list of spec files from the server	2012-10-27 17:05:26 +01:00
Peter 'Pita' Martischka	cc7ddddd2f	redirect from frontend to frontend/	2012-10-27 16:41:17 +01:00
Peter 'Pita' Martischka	ca6ebd6151	major restructering of the front end test framework	2012-10-08 00:34:29 +02:00
johnyma22	c74aed986e	Merge branch 'develop' of github.com:Pita/etherpad-lite into feature/frontend-tests	2012-10-04 18:55:57 +01:00
Marcel Klehr	2684a1d295	Merge branch 'develop' into express-v3 ... Conflicts: src/node/hooks/express/errorhandling.js	2012-10-03 10:09:00 +02:00
Marcel Klehr	7656001cb5	Don't shut down the whole server, if error handling middleware is called. ... The errors passed to error handling middleware aren't that severe, so it's fine to just stay alive...	2012-10-02 20:11:18 +02:00
Peter 'Pita' Martischka	ba4ebbba3b	Setted up an enviroment for frontend tests, first steps	2012-10-02 00:35:43 +01:00
Marcel Klehr	0c9c1f514f	Fix socket.io auth: Use connect to parse signed cookies (migrate to express v3)	2012-09-22 16:03:40 +02:00
Marcel Klehr	0f436d5916	Migrate error handling middleware to express v3	2012-09-22 15:22:15 +02:00
Marcel Klehr	794c3d1afe	Set secret on cookieParser (migrate to express v3)	2012-09-22 14:05:41 +02:00
Marcel Klehr	71579d1478	Fix res.send (migrate to express v3)	2012-09-22 13:51:39 +02:00
Marcel Klehr	ff7cf991c9	Upgrade log4js to v0.5	2012-09-21 21:39:08 +02:00
Marcel Klehr	4416210471	Differentiate between http server and express app	2012-09-21 17:12:22 +02:00
johnyma22	603f251824	error handling and close is removed in express 3	2012-09-12 19:34:33 +01:00
Marcel Klehr	ea0f7cb2e9	Add support for multiple api versions	2012-09-09 18:20:16 +02:00
John McLear	c5be2eb418	Merge pull request #977 from cweider/loopback-avoidance ... Loopback avoidance	2012-09-03 14:56:55 -07:00
Chad Weider	024a26f272	Minify publishes its own mock request thing.	2012-09-03 14:37:26 -07:00
Wikinaut	e82588c332	use socket.io with jsonp-polling. several browsers tested. fixes IE8 issues	2012-08-18 00:47:13 +02:00