aboutsummaryrefslogtreecommitdiffstats
path: root/infrastructure/ace (follow)
Commit message (Collapse)AuthorAgeFilesLines
* Merge remote branch 'upstream/master'Alexander Sulfrian2010-06-0856-0/+26538
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-70Simon B @piratpartiet2010-04-222-2/+16
| |
| * Fix IE lacking Array#map. Closes #70Simon B @piratpartiet2010-04-211-0/+11
| |
| * Fix IFRAME bug. Closes #70Simon B @piratpartiet2010-04-213-3/+4
| |
| * Bugfix for the ace callHook supportEgil Moeller2010-03-272-2/+2
| |
| * Added the aceInitInnerdocbodyHead hookEgil Moeller2010-03-271-0/+8
| |
| * Added aceCreateDomline hook plus some code cleanup in the aceEgil Moeller2010-03-252-10/+22
| |
| * Generalized linestylefilter.getURLFilter to a linestylefilter.getRegexpFilterEgil Moeller2010-03-251-42/+47
| |
| * Bugfix for infrastructure/ace/bin/make to handle non-existent target ↵Egil Moeller2010-03-251-0/+2
| | | | | | | | directories, as git removes empty directories :(
| * Added support for plugins in the ACE linefilterEgil Moeller2010-03-252-11/+28
| |
| * Bugfix for ACE compilerEgil Moeller2010-03-221-4/+4
| |
| * reorganizing the first level of folders (trunk/branch folders are not the ↵Elliot Kroo2010-03-1156-0/+26400
| | | | git way :)
* reverted folder structure change for better mergeing with upstreamAlexander Sulfrian2010-06-0856-26468/+0
|
* added lineheight to headlines, to have some spaces aroundAlexander Sulfrian2010-02-161-0/+1
|
* beautified codeAlexander Sulfrian2010-02-161-5/+24
|
* display h1,h2,h3,h4,h5,h6 as inlineAlexander Sulfrian2010-02-161-2/+6
|
* remove other headline properties on setting (no sense in setting two ↵Alexander Sulfrian2010-02-051-0/+7
| | | | headlines at one region)
* fixed linenumber height if first line in source has a marginAlexander Sulfrian2010-02-051-0/+5
|
* added header buttons and used backend functionalityAlexander Sulfrian2010-02-053-2/+29
|
* try to implement headlinesAlexander Sulfrian2010-02-053-2/+7
|
* removed obsolete svn folder from hg treealexanders@b2ef00c0-3703-41da-baef-cfe82387ac0c2010-02-0356-0/+26400
--HG-- extra : convert_revision : svn%3Ab2ef00c0-3703-41da-baef-cfe82387ac0c/trunk%408