etherpad - fork of etherpad for spline

	Commit message (Collapse)	Author	Age	Files	Lines
*	ported changes from old version	Alexander Sulfrian	2010-06-08	8	-0/+0
\|
*	Merge remote branch 'upstream/master'	Alexander Sulfrian	2010-06-08	50	-0/+0
\|\ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	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
\| *	Reduced the height of the docbar about 5px	Peter Martischka	2010-04-08	7	-0/+0
\| \|
\| *	Redesign of the editbar	Peter Martischka	2010-04-07	17	-0/+0
\| \|
\| *	added some pictures	Peter Martischka	2010-04-05	9	-0/+0
\| \|
\| *	Redesign of the topbar + deleted unused css & images	Peter Martischka	2010-04-05	19	-0/+0
\| \|
\| *	add 32 user color support on pads	Peter Martischka	2010-03-30	1	-0/+0
\| \|
\| *	reorganizing the first level of folders (trunk/branch folders are not the ↵	Elliot Kroo	2010-03-11	43	-0/+0
\| \| \| \|	git way :)
*	reverted folder structure change for better mergeing with upstream	Alexander Sulfrian	2010-06-08	48	-0/+0
\|
*	added header buttons and used backend functionality	Alexander Sulfrian	2010-02-05	3	-0/+0
\|
*	dded branding to padtop4.png (css needs work)	nehls@b2ef00c0-3703-41da-baef-cfe82387ac0c	2010-02-04	3	-0/+0
\| \| \| \| \|	--HG-- extra : convert_revision : svn%3Ab2ef00c0-3703-41da-baef-cfe82387ac0c/trunk%4030
*	Added spline Pad [beta] branding	nehls@b2ef00c0-3703-41da-baef-cfe82387ac0c	2010-02-03	6	-0/+0
\| \| \| \| \|	--HG-- extra : convert_revision : svn%3Ab2ef00c0-3703-41da-baef-cfe82387ac0c/trunk%4025
*	removed obsolete svn folder from hg tree	alexanders@b2ef00c0-3703-41da-baef-cfe82387ac0c	2010-02-03	43	-0/+0
	--HG-- extra : convert_revision : svn%3Ab2ef00c0-3703-41da-baef-cfe82387ac0c/trunk%408