summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
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-05very quick admin interface styling and sensibilityjohnyma22
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
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
fix crash if getFileCompressed fails (i.e. if /static/js is called)
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
Admin page security
2012-04-03when no password is set, dont allow access to admin pageMatthias Bartelmeß
2012-04-02Merge pull request #587 from sfyn/c55f54b972e42cdaef6cb402d84027bd39ac5774John McLear
Fix nocolor embed parameter
2012-04-02Fix the nocolor embed parameterSofian Benaissa
2012-04-02Merge pull request #557 from redhog/masterJohn McLear
Templating system built on top of EJS and plugin installer
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
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-17 17:33:41 +0000