etherpad - fork of etherpad for spline

	Commit message (Collapse)	Author	Age	Files	Lines
*	Merge commit 'cd2bbd0e602244403ca379f9f4d9d15bbde545a7'	Michael Prasuhn	2010-04-16	1	-1/+1
\|\
\| *	Replacing 'etherpad.com' with 'main site' in some code comments	Simon Bohlin	2010-04-15	1	-1/+1
\| \|
* \|	Merge branch 'master' of http://github.com/redhog/pad	Peter Martischka	2010-04-10	1	-5/+11
\|\ \ \| \|/ \|/\|
\| *	Adde support for <%: %> and ejs_data in ejs-files, allowing templates to ↵	Egil Moeller	2010-04-09	1	-5/+11
\| \| \| \| \| \| \| \|	store/restore template-generated content.
* \|	Add another REMOVED_COS_OF_COS	Jeff Mitchell	2010-04-08	1	-0/+1
\| \|
* \|	Add needed jars which someone removed and needed code to actually make ↵	Jeff Mitchell	2010-04-08	6	-6/+104
\|/ \| \| \|	import/export work. Have tested it and it works well. Note that if you don't have a soffice server running, it just doesn't do anything, so this is safe to have active.
*	Add REMOVED_COS_OF_COS markers so those that want to enable support provided ↵	Jeff Mitchell	2010-04-07	2	-1/+8
\| \| \| \|	by cos.jar can easily find what to uncomment.
*	Add useHttpsUrls and hidePorts config options	Jeff Mitchell	2010-04-07	1	-0/+5
\|
*	Merge branch 'master' of git://github.com/cjb/pad	Egil Moeller	2010-04-05	2	-42/+44
\|\
\| *	Made check to see if we are on Solaris, and if we are, then don't use '-u' ↵	Jeppe Toustrup	2010-04-05	1	-41/+43
\| \| \| \| \| \| \| \| \| \| \| \|	on the cp command. Also, convertion of spaces to tabs.
\| *	Make config parsing more robust	Chris Ball	2010-04-05	1	-1/+1
\| \| \| \| \| \| \| \| \| \|	Previously, config booleans like etherpad.isProduction accepted only "true", and not "true " or " true" or "True" or "TRUE". Fix that.
* \|	Bugfixed faststatic to handle plugins properly	Egil Moeller	2010-04-05	1	-1/+25
\| \|
* \|	Oups, forgot some new dependencies for handling mime/multipart	Egil Moeller	2010-04-04	6	-0/+0
\|/
*	Revert "Fixed .txt file import - NOT open office import, just basic text import"	Egil Moeller	2010-04-01	1	-3/+3
\| \| \| \| \| \|	Reverting as this patch breaks the build - dependency on unfree libraries from O'Reilly that aren't available. This reverts commit e24352483b7efc151e6b5995bddac3c89d04a6cc.
*	Merge branch 'john'	Egil Moeller	2010-03-31	1	-3/+3
\|\
\| *	Fixed .txt file import - NOT open office import, just basic text import	root	2010-03-27	1	-3/+3
\| \|
* \|	Bugfix for the ace callHook support	Egil Moeller	2010-03-27	2	-2/+2
\| \|
* \|	Added the aceInitInnerdocbodyHead hook	Egil Moeller	2010-03-27	1	-0/+8
\|/
*	Added aceCreateDomline hook plus some code cleanup in the ace	Egil Moeller	2010-03-25	2	-10/+22
\|
*	Generalized linestylefilter.getURLFilter to a linestylefilter.getRegexpFilter	Egil Moeller	2010-03-25	1	-42/+47
\|
*	Bugfix for infrastructure/ace/bin/make to handle non-existent target ↵	Egil Moeller	2010-03-25	1	-0/+2
\| \| \| \|	directories, as git removes empty directories :(
*	Added support for plugins in the ACE linefilter	Egil Moeller	2010-03-25	2	-11/+28
\|
*	Bugfix for ACE compiler	Egil Moeller	2010-03-22	1	-4/+4
\|
*	Merge branch 'master' into plugin-framework	Egil Moeller	2010-03-22	2	-3/+52
\|
*	reorganizing the first level of folders (trunk/branch folders are not the ↵	Elliot Kroo	2010-03-11	450	-0/+177521
	git way :)