Matthias Bartelmeß 0191c248b5 Merge commit '64f04670efd582230e693a1c6b3c91bc8df27299' into cleanup-ace-fix ...

Conflicts:
	static/js/ace2_inner.js

2012-02-24 20:22:32 +01:00

..

Abiword.js

Merge branch 'api' of ../etherpad-lite.dev/

2011-08-16 17:22:15 +01:00

Cli.js

Allow settings filename to be passed as a cli option

2012-02-21 14:20:45 -05:00

common_code.js

Account for more spaces and Windows paths. This fixes #456.

2012-02-16 14:19:16 -08:00

customError.js

replaced all stop callbacks with customError callbacks. Fixes #270

2011-12-10 16:46:47 +01:00

ExportDokuWiki.js

Share the AttributePoolFactory, Changeset, and contentcollector modules.

2012-02-10 14:52:34 -08:00

ExportHtml.js

Create and use the Security module.

2012-02-10 14:52:35 -08:00

ImportHtml.js

Share the AttributePoolFactory, Changeset, and contentcollector modules.

2012-02-10 14:52:34 -08:00

Minify.js

drop embedding of JS/CSS files in ace.js. May result in a little performance drop but makes code much smaller

2012-02-19 15:02:54 +01:00

Settings.js

Allow settings filename to be passed as a cli option

2012-02-21 14:20:45 -05:00

tar.json

Create and use the Security module.

2012-02-10 14:52:35 -08:00