summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2012-04-19Corrected color picker: `jQuery(...).css('background-color')` returns a hex ↵Nikolai Prokoschenko
notation in IE8 and `rgb()` in every other browser.
2012-04-17Merge pull request #645 from redhog/masterJohn McLear
Bugfixes
2012-04-17Merge commit 'd5120c9' into pitaEgil Moeller
2012-04-17Bugfix for this being wrong in ↵Egil Moeller
editorInfo.ace_performDocumentApplyAttributesToRange
2012-04-15Merge pull request #637 from fourplusone/feature/timeslider_cleanupJohn McLear
Feature/timeslider cleanup
2012-04-15Merge pull request #636 from fourplusone/fix/timeslider_authorsJohn McLear
Fix/timeslider authors
2012-04-15removed sliderEnabled, supportsSlider clientVars, as they were not used anywhereMatthias Bartelmeß
2012-04-15avoid missing anon. timeslider authorsMatthias Bartelmeß
2012-04-13Merge pull request #631 from jhollinger/developJohn McLear
Fix re-enabling of line numbers
2012-04-13Fix re-enabling line numbers. issue #618Jordan Hollinger
2012-04-13Merge pull request #630 from jhollinger/developJohn McLear
Don't require http auth for static paths
2012-04-13Don't block static paths with http authJordan Hollinger
2012-04-11forgot to remove a ',' ^.^0ip
2012-04-11Having "maxAge" twice doesn't double the fun0ip
2012-04-11Merge pull request #624 from 0ip/admin_cssJohn McLear
Admin css
2012-04-11admin interface styling and sensibility0ip
2012-04-11Merge pull request #622 from cweider/fix-firefoxJohn McLear
Fix firefox
2012-04-11Work around strange order of execution bug in Firefox. Fixes #620Chad Weider
2012-04-11Revert "Made it possible to disable minification again"Chad Weider
This reverts commit 22eaa6ffc012e83438d54e6fb5b023a7952246a7.
2012-04-09Merge pull request #617 from 0ip/prefixJohn McLear
Prefixed css files
2012-04-09prefixed css files containing css3 attributes due to recently removed ↵0ip
prefixfree.js
2012-04-09removed a weird plus0ip
2012-04-09Merge pull request #612 from levu42/bug-user-scrollJohn McLear
Userlists now scrolls if there are too many users
2012-04-09Merge pull request #616 from 0ip/developJohn McLear
Userlist: users now don't overlap other objects
2012-04-09improved userlist ux (prevent overlapping of objects)0ip
2012-04-09Merge branch 'develop' of git://github.com/Pita/etherpad-lite into develop0ip
2012-04-08Merge pull request #614 from fourplusone/ace2_refactoringJohn McLear
Adding more hooks + some code refactoring
2012-04-08added a comment on skiplist.jsMatthias Bartelmeß
2012-04-08...well stupid errorMatthias Bartelmeß
2012-04-08documentation on AttributeManagerMatthias Bartelmeß
2012-04-08Merge pull request #613 from prauscher/fix-apicallPeter 'Pita' Martischka
bugfix for some crashes through stack overflows
2012-04-08bugfix for some crashes through stack overflowsPatrick Rauscher
2012-04-08fix for bug 'userlist not scrolling'levu
2012-04-07Merge pull request #610 from prauscher/fix-apiPeter 'Pita' Martischka
Fix api
2012-04-07bugfix to use the API againPatrick Rauscher
2012-04-07Merge pull request #607 from fourplusone/fix/list-removalJohn McLear
Fix list removal
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.