summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2012-04-08...well stupid errorMatthias Bartelmeß
2012-04-08documentation on AttributeManagerMatthias Bartelmeß
2012-04-07Merge branch 'fix/list-removal' into ace2_refactoringMatthias Bartelmeß
2012-04-07Merge branch 'develop' into fix/list-removalMatthias Bartelmeß
2012-04-07Fixing bug where lists get deleted when pressing enterMatthias Bartelmeß
2012-04-07Merge commit '57e137f65bd5152c0c2dc8508c796674d3289545' into ace2_refactoringMatthias Bartelmeß
2012-04-07linestylefilter now uses attributemanager to find lineattributemarkersMatthias Bartelmeß
2012-04-07syntax candyMatthias Bartelmeß
2012-04-07made domline and content collector lineAttributes compatibleMatthias Bartelmeß
2012-04-06Merge pull request #599 from fourplusone/ace2_refactoringJohn McLear
ACE2 refactoring
2012-04-07removed unused variableMatthias Bartelmeß
2012-04-07added aceEditorCSS hookMatthias Bartelmeß
2012-04-07Delete key removes line attributes if prev line is not emtpyMatthias Bartelmeß
2012-04-07postAceInit passes ace instanceMatthias Bartelmeß
2012-04-07Pad message handler detects lineattributemakers by asking Attribute managerMatthias Bartelmeß
2012-04-07Added 2 new HooksMatthias Bartelmeß
+ aceInitialized is called when ace has been fully initialized + aceRegisterBlockElements allows to register new Block Elements with ace.
2012-04-06Deselect highlighted editbar module button when userlist is opened0ip
2012-04-06Merge branch 'develop' into ace2_refactoringMatthias Bartelmeß
2012-04-06corrected documentation on Attribute ManagerMatthias Bartelmeß
2012-04-05Merge pull request #591 from fourplusone/timeslider_authorsJohn McLear
Timeslider authors
2012-04-05Merge pull request #601 from redhog/masterJohn McLear
Bugfix for document.domain, and added initialization hook
2012-04-05Merge branch 'develop' into ace2_refactoringMatthias Bartelmeß
2012-04-05fixing 'rep is not defined' errorMatthias Bartelmeß
2012-04-05Merge branch 'develop' into timeslider_authorsMatthias Bartelmeß
2012-04-05css fixesMatthias Bartelmeß
2012-04-05Merge branch 'develop' into timeslider_authorsMatthias Bartelmeß
Conflicts: src/static/css/pad.css src/templates/timeslider.html
2012-04-05Merge branch 'develop' of git://github.com/Pita/etherpad-liteEgil Moeller
2012-04-05Ignoring .ep_initialized in gitEgil Moeller
2012-04-05move css out of htmljohnyma22
2012-04-05add some sense to the buttons on the plugin pagejohnyma22
2012-04-05Make the console show the url that admin/plugins is available atjohnyma22
2012-04-05Minor coding style improvement. Does the same as beforeMatthias Bartelmeß
2012-04-05documented lineAndColumnFromCharMatthias Bartelmeß
2012-04-05renamed performDocumentApplyAttributesToRange to setAttributesOnRange and ↵Matthias Bartelmeß
moved it to AttributeManager
2012-04-05added lineMarkerAttribute + more commentsMatthias Bartelmeß
2012-04-05Added init hook to install plugin database default content and the likeEgil Moeller
2012-04-05Set document.domain explicitly to allow fow ajaxupload and other more fancy ↵Egil Moeller
iframe stuff
2012-04-05remove debugger statementMatthias Bartelmeß
2012-04-05fixing lineHasMarkerMatthias Bartelmeß
2012-04-05Merge branch 'develop' into ace2_refactoringMatthias Bartelmeß
2012-04-05added AttributeManager, ChangesetUtilsMatthias Bartelmeß
2012-04-04Merge pull request #597 from fourplusone/fix/max-ageJohn McLear
Fix max-age
2012-04-04Merge branch 'develop' into fix/max-ageMatthias Bartelmeß
2012-04-04remove maxAge: undefined header, send maxAge even if set to 0Matthias Bartelmeß
2012-04-04Merge pull request #596 from fourplusone/fix/client_pluginsJohn McLear
Fix/client plugins
2012-04-04Merge branch 'fix/client_plugins' into ace2_refactoringMatthias Bartelmeß
2012-04-04on plugin definitions, only expose plugins with client_hooks registered. ↵Matthias Bartelmeß
dont expose 'package' property
2012-04-04Merge branch 'develop' into feature/implicit_hooksMatthias Bartelmeß
2012-04-04use hook name as function name, if not specifiedMatthias Bartelmeß
Example `"[hookName]": "ep_plugin/static/js/index:[hookName]"` becomes `"[hookName]": "ep_plugin/static/js/index"`
2012-04-04Merge pull request #593 from fourplusone/nicer_codeJohn McLear
Removing node.extend