etherpad - fork of etherpad for spline

	Commit message (Collapse)	Author	Age	Files	Lines
*	removed ip/user-agent from tooltipsHEAD master	Alexander Sulfrian	2011-02-01	2	-4/+0
\|
*	Merge remote branch 'upstream/master'	Alexander Sulfrian	2010-06-08	37	-0/+15957
\|\ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Conflicts: etherpad/src/etherpad/control/pro/admin/pro_admin_control.js etherpad/src/etherpad/control/pro/pro_main_control.js etherpad/src/etherpad/control/pro_help_control.js etherpad/src/etherpad/globals.js etherpad/src/etherpad/legacy_urls.js etherpad/src/etherpad/pne/pne_utils.js etherpad/src/etherpad/pro/pro_utils.js etherpad/src/main.js etherpad/src/plugins/fileUpload/templates/fileUpload.ejs etherpad/src/plugins/testplugin/templates/page.ejs etherpad/src/static/css/pad2_ejs.css etherpad/src/static/css/pro-help.css etherpad/src/static/img/jun09/pad/protop.gif etherpad/src/static/js/store.js etherpad/src/themes/default/templates/framed/framedheader-pro.ejs etherpad/src/themes/default/templates/main/home.ejs etherpad/src/themes/default/templates/pro-help/main.ejs etherpad/src/themes/default/templates/pro-help/pro-help-template.ejs infrastructure/com.etherpad/licensing.scala trunk/etherpad/src/etherpad/collab/ace/contentcollector.js trunk/etherpad/src/etherpad/collab/ace/linestylefilter.js trunk/etherpad/src/static/css/home-opensource.css trunk/etherpad/src/static/js/ace.js trunk/etherpad/src/static/js/linestylefilter_client.js trunk/etherpad/src/templates/email/eepnet_license_info.ejs trunk/etherpad/src/templates/pad/pad_body2.ejs trunk/etherpad/src/templates/pad/pad_content.ejs trunk/etherpad/src/templates/pad/padfull_body.ejs trunk/etherpad/src/templates/pro/admin/pne-license-manager.ejs
\| *	Change executable bit of two files to much the intent of the files.	Mikko Rantalainen	2010-05-06	1	-0/+0
\| \| \| \| \| \| \| \|	Make lintian happier.
\| *	Merge commit 'mainline/master'	Simon B @piratpartiet	2010-04-21	1	-1/+1
\| \|\
\| \| *	Merge commit 'cd2bbd0e602244403ca379f9f4d9d15bbde545a7'	Michael Prasuhn	2010-04-16	1	-1/+1
\| \| \|\
\| \| * \|	Fixed a a serious Security Bug, HTML injection!	Peter Martischka	2010-04-11	1	-1/+1
\| \| \| \|
\| * \| \|	Remove unused file	Simon Bohlin	2010-04-21	1	-1984/+0
\| \| \| \|
\| * \| \|	Drive-by optimization. Motivation: every keypress invokes callHooks()	Simon Bohlin	2010-04-21	1	-4/+5
\| \| \| \|
\| * \| \|	Add code origin comments	Simon Bohlin	2010-04-21	1	-0/+3
\| \| \|/ \| \|/\|
\| * \|	Replacing 'etherpad.com' with 'main site' in some code comments	Simon Bohlin	2010-04-15	1	-1/+1
\| \|/
\| *	Removed files auto-generated by infrastructure/ace/bin/make	Egil Moeller	2010-03-25	6	-2441/+0
\| \|
\| *	Made the client side plugin API more similar to the server side one	Egil Moeller	2010-03-22	1	-18/+20
\| \|
\| *	Updated changes to adhere to new directory layout	Egil Moeller	2010-03-22	1	-0/+19
\| \|
\| *	reorganizing the first level of folders (trunk/branch folders are not the ↵	Elliot Kroo	2010-03-11	43	-0/+20357
\| \| \| \|	git way :)
*	reverted folder structure change for better mergeing with upstream	Alexander Sulfrian	2010-06-08	43	-20363/+0
\|
*	Fixed a a serious Security Bug, HTML injection!	Alexander Sulfrian	2010-04-27	1	-2/+2
\| \| \| \|	(see: http://github.com/Pita/pad/commit/6f0061961975df9a0c3ebab68386d8d65b706959)
*	added lineheight to headlines, to have some spaces around	Alexander Sulfrian	2010-02-16	1	-2/+2
\|
*	rebranded for pad.spline.inf.fu-berlin.de	Alexander Sulfrian	2010-02-16	3	-4/+4
\|
*	changed from infrastucture to public dirs	Alexander Sulfrian	2010-02-16	2	-4/+10
\|
*	remove other headline properties on setting (no sense in setting two ↵	Alexander Sulfrian	2010-02-05	1	-1/+1
\| \| \| \|	headlines at one region)
*	fixed linenumber height if first line in source has a margin	Alexander Sulfrian	2010-02-05	1	-1/+1
\|
*	added header buttons and used backend functionality	Alexander Sulfrian	2010-02-05	1	-2/+2
\|
*	try to implement headlines	Alexander Sulfrian	2010-02-05	1	-2/+2
\|
*	removed help/billing, changed some email adesses	alexanders@b2ef00c0-3703-41da-baef-cfe82387ac0c	2010-02-03	1	-2/+2
\| \| \| \| \|	--HG-- extra : convert_revision : svn%3Ab2ef00c0-3703-41da-baef-cfe82387ac0c/trunk%4022
*	removed obsolete svn folder from hg tree	alexanders@b2ef00c0-3703-41da-baef-cfe82387ac0c	2010-02-03	43	-0/+20357
	--HG-- extra : convert_revision : svn%3Ab2ef00c0-3703-41da-baef-cfe82387ac0c/trunk%408