etherpad - fork of etherpad for spline

	Commit message (Collapse)	Author	Age	Files	Lines
*	Merge remote branch 'upstream/master'	Alexander Sulfrian	2010-06-08	43	-0/+22291
\|\ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	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
\| *	Bugfix regession from IFRAME+IE bugs. Closes GH-70	Simon B @piratpartiet	2010-04-22	2	-2/+16
\| \|
\| *	Fix IE lacking Array#map. Closes #70	Simon B @piratpartiet	2010-04-21	1	-0/+11
\| \|
\| *	Fix IFRAME bug. Closes #70	Simon B @piratpartiet	2010-04-21	3	-3/+4
\| \|
\| *	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
\| \|
\| *	Added support for plugins in the ACE linefilter	Egil Moeller	2010-03-25	2	-11/+28
\| \|
\| *	reorganizing the first level of folders (trunk/branch folders are not the ↵	Elliot Kroo	2010-03-11	43	-0/+22155
\| \| \| \|	git way :)
*	reverted folder structure change for better mergeing with upstream	Alexander Sulfrian	2010-06-08	43	-22223/+0
\|
*	added lineheight to headlines, to have some spaces around	Alexander Sulfrian	2010-02-16	1	-0/+1
\|
*	beautified code	Alexander Sulfrian	2010-02-16	1	-5/+24
\|
*	display h1,h2,h3,h4,h5,h6 as inline	Alexander Sulfrian	2010-02-16	1	-2/+6
\|
*	remove other headline properties on setting (no sense in setting two ↵	Alexander Sulfrian	2010-02-05	1	-0/+7
\| \| \| \|	headlines at one region)
*	fixed linenumber height if first line in source has a margin	Alexander Sulfrian	2010-02-05	1	-0/+5
\|
*	added header buttons and used backend functionality	Alexander Sulfrian	2010-02-05	3	-2/+29
\|
*	try to implement headlines	Alexander Sulfrian	2010-02-05	3	-2/+7
\|
*	removed obsolete svn folder from hg tree	alexanders@b2ef00c0-3703-41da-baef-cfe82387ac0c	2010-02-03	43	-0/+22155
	--HG-- extra : convert_revision : svn%3Ab2ef00c0-3703-41da-baef-cfe82387ac0c/trunk%408