679 commits

Author	SHA1	Message	Date
John McLear	13ad46aa67	a safer approach I think but still be careful	2013-03-16 13:19:12 +00:00
Marcel Klehr	cd9c78998e	Fix path.join in Settings.js	2013-03-16 09:47:10 +01:00
Marcel Klehr	de552df6db	Fix clearing authorship colors which was broken by #1609 ... Fixes #1620	2013-03-15 18:08:51 +01:00
John McLear	ffe7e65db6	allow strict transport if ssl is on and stop x-frame-options, this might break embedded pads, please test	2013-03-14 19:03:20 -03:00
John McLear	f0dee2d2ce	Merge pull request #1615 from ether/fix/admin-relative-links ... redirect /admin to /admin/ so that the relative links work	2013-03-14 08:01:11 -07:00
John McLear	ac9b972358	Merge branch 'develop' of github.com:ether/etherpad-lite into custom-obj-msg	2013-03-14 12:01:09 -03:00
Marcel Klehr	5fe60e7221	redirect /admin to /admin/ so that the relative links work	2013-03-14 15:59:39 +01:00
Marcel Klehr	c30b0b72b8	Validate all 'author' attribs of incoming changesets to be the same value as the current user's authorId	2013-03-13 22:23:35 +01:00
cohitre	988653b8ce	Toolbar hooks	2013-03-12 19:36:04 -07:00
John McLear	83a820b720	new function for handling custom messages, allows objects to be sent, before we only allowed strings	2013-03-12 16:59:15 +00:00
cohitre	52aa7d3997	Registering commands on the ace toolbar	2013-03-10 15:42:12 -07:00
cohitre	292a3bd7b7	Setting up the right toolbar.	2013-03-09 14:57:42 -08:00
John McLear	0b16d96c97	Merge pull request #1527 from nelsonsilva/swagger ... Initial work on new swagger based REST API	2013-03-07 08:07:46 -08:00
Jordan Hollinger	3cafa24982	Fix variable name typo in PadMessageHandler.padUsers	2013-03-07 09:37:03 -05:00
nelson.silva	a5987285e0	Multiple REST endpoints (one per version)	2013-03-06 10:10:21 +00:00
Nelson Silva	8f279a6710	Added some fixes to make it work with the codegen	2013-03-06 10:10:21 +00:00
Nelson Silva	1cfc8eda19	Initial work on swagger	2013-03-06 10:10:21 +00:00
cohitre	c57bc444cd	basic toolbar setup	2013-03-03 16:06:14 -08:00
Marcel Klehr	c4966543ed	Fix settings object having constructors of another vm.context ... This made it impossible to rely on `instanceof` to work as expected on (even parts of) the settings object Fixes #1570	2013-02-28 16:16:26 +01:00
John McLear	ebd8b85072	patch documented here https://github.com/ether/etherpad-lite/issues/472 adds some stability but not a perfect solution	2013-02-27 16:17:50 +00:00
John McLear	18b6cf1534	Merge pull request #1523 from ether/store-sessions-in-db ... Store sessions in db	2013-02-26 18:03:54 -08:00
John McLear	2c69066591	remove pointless stuff	2013-02-27 02:02:18 +00:00
John McLear	fb3e4a6232	only show clients on this pad resolves issue #1544	2013-02-20 16:10:27 +00:00
John McLear	e52dc2b17c	dont reset head count, use the one we should :)	2013-02-19 02:05:51 +00:00
Marcel Klehr	4592397bd9	Merge pull request #1491 from ether/export-txt-with-indent ... TXT Export Indentation on lists Edit	2013-02-18 12:13:06 -08:00
John McLear	eeeeb04840	remove cruft	2013-02-18 00:37:47 +00:00
John McLear	6e46a53288	this is probably bad, please sanity check	2013-02-18 00:36:31 +00:00
John McLear	11a8295150	eureka	2013-02-18 00:29:53 +00:00
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	7c03bc2610	when exporting HTML include html and body	2013-02-14 01:13:23 +00:00
John McLear	c723aefdfe	when exporting HTML include html and body	2013-02-14 01:10:47 +00:00
John McLear	7f09ec25a2	no need for prefix and tidy double semi	2013-02-13 21:53:15 +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	aefd8d8d0d	nice chars n no cruft	2013-02-13 18:45:45 +00:00
John McLear	dea892213e	Revert "allow non ascii chars in txt export" ... This reverts commit be56272e66.	2013-02-13 18:41:04 +00:00
John McLear	be56272e66	allow non ascii chars in txt export	2013-02-13 18:30:55 +00:00
John McLear	d3f730e2ba	fix various issues dont stop random *'s appearing	2013-02-13 18:01:15 +00:00
Mark Fisher	500f9b8b48	Fixed typo thats made server hang	2013-02-13 15:25:27 +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
John McLear	198110eb4b	drunk comments	2013-02-12 23:49:43 +00:00
John McLear	e152c477c7	include the callback call, for sanity and stop the pad from being nuked so early in the function	2013-02-12 23:38:02 +00:00
John McLear	086132de66	dont die on bad html but only warn to api logger but dont tell client that it failed cause html was bad	2013-02-12 23:23:44 +00:00
Manuel Knitza	8c9ad6ee50	Update src/node/handler/APIHandler.js	2013-02-12 21:50:14 +01:00
Manuel Knitza	e855bafdf9	Update src/node/hooks/express/apicalls.js	2013-02-12 21:47:40 +01:00
John McLear	da246d183d	Correct license header	2013-02-12 19:47:53 +00:00
John McLear	0b5c948549	Move code from Html export to a Helper file	2013-02-12 19:45:46 +00:00
Manuel Knitza	b1586684c8	Explicitly log creation of pad	2013-02-11 03:03:18 +01:00
John McLear	60ef5f210a	remove duplicate code to the best of my ability right now	2013-02-10 23:41:14 +00:00
John McLear	28f6d50011	remove console warn	2013-02-10 22:14:05 +00:00
John McLear	bcf9c23b4e	dont use HTML filter hooks on txt export	2013-02-10 19:38:16 +00:00