summaryrefslogtreecommitdiff
AgeCommit message (Expand)Author
2012-04-04make jshint happyMatthias Bartelmeß
2012-04-04get rid of node.extend (since duplicated by underscorejs)Matthias Bartelmeß
2012-04-03Merge pull request #592 from fourplusone/fix_crash_minify_dirJohn McLear
2012-04-03fix crash if getFileCompressed fails (i.e. if /static/js is called)Matthias Bartelmeß
2012-04-03Merge branch 'develop' into ace2_refactoringMatthias Bartelmeß
2012-04-03Merge pull request #589 from fourplusone/fix_admin_undefined_authJohn McLear
2012-04-03when no password is set, dont allow access to admin pageMatthias Bartelmeß
2012-04-02Merge pull request #587 from sfyn/c55f54b972e42cdaef6cb402d84027bd39ac5774John McLear
2012-04-02Fix the nocolor embed parameterSofian Benaissa
2012-04-02Merge pull request #557 from redhog/masterJohn McLear
2012-04-02Basic auth for admin pageEgil Moeller
2012-04-01Removed prefixfree as it breaks @import in css filesEgil Moeller
2012-04-01Button styling bugfixEgil Moeller
2012-04-01Moved star image to right directoryEgil Moeller
2012-04-01Bugfix for timeslider stylingEgil Moeller
2012-04-01Merge branch 'johnyma22'Egil Moeller
2012-03-31fix pitas fixJohn McLear
2012-03-29restructuring save/load process of a pad, this makes it easier to extend the ...Peter 'Pita' Martischka
2012-03-29Added saved revisions supportPeter 'Pita' Martischka
2012-03-29Add ability to export specific pad revisionsJohn McLear
2012-03-28Styling generalization - use classes instead of id:s where applicableEgil Moeller
2012-03-28Merge branch 'develop' into timeslider_authorsMatthias Bartelmeß
2012-03-27Merge pull request #563 from fourplusone/objectify_epJohn McLear
2012-03-27Merge branch 'develop' of git://github.com/Pita/etherpad-liteEgil Moeller
2012-03-27Add jquery to ace iframeEgil Moeller
2012-03-27One more exposed ace functionEgil Moeller
2012-03-27Added client side hook postAceInitEgil Moeller
2012-03-27Better argument handling and defaultsEgil Moeller
2012-03-27setupMozillaCaretHack is never called, so removing it should be safeMatthias Bartelmeß
2012-03-27replaced function(){} with noopMatthias Bartelmeß
2012-03-27use underscore in skipListMatthias Bartelmeß
2012-03-27Merge branch 'develop' into objectify_epMatthias Bartelmeß
2012-03-26Merge pull request #556 from fourplusone/feature_jqueryJohn McLear
2012-03-25added UI to for unnamed authorsMatthias Bartelmeß
2012-03-25CSS candyMatthias Bartelmeß
2012-03-24Added timeslider author UIMatthias Bartelmeß
2012-03-24Merge branch 'feature_jquery' into timeslider_authorsMatthias Bartelmeß
2012-03-24fixed error foreach error in timeslider.jsMatthias Bartelmeß
2012-03-24proceed if plugin-definitions.json didn't load properlyMatthias Bartelmeß
2012-03-24Send the Content-Type header for plugin-definitions.json in the right formatMatthias Bartelmeß
2012-03-24re-enabled maxAge setting. maxAge is now in seconds, not milliseconds.Matthias Bartelmeß
2012-03-24Merge pull request #571 from fourplusone/fix_ie9_pluginsJohn McLear
2012-03-24proceed if plugin-definitions.json didn't load properlyMatthias Bartelmeß
2012-03-24Send the Content-Type header for plugin-definitions.json in the right formatMatthias Bartelmeß
2012-03-23added underscore to tar.jsonMatthias Bartelmeß
2012-03-23corrected underscore path in hooksMatthias Bartelmeß
2012-03-23Merge pull request #570 from fourplusone/developJohn McLear
2012-03-23re-enabled maxAge setting. maxAge is now in seconds, not milliseconds.Matthias Bartelmeß
2012-03-22Merge commit '1a64a6c1'Egil Moeller
2012-03-22Made it possible to disable minification againEgil Moeller
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-18 01:24:26 +0000