summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2012-05-14Remove unused line.Chad Weider
2012-05-14Upgrade yajsml version.Chad Weider
Fixes parent-relative redirects and prints results more nicely.
2012-05-13Merge pull request #609 from prauscher/disable-passwordsJohn McLear
Disable passwords
2012-05-13Merge pull request #667 from fourplusone/feature/cleaner_codeJohn McLear
Removing unused code - All looks good, some minor tweeks are probably worthwhile in the future.
2012-05-13Fix #655, wrong located APIKEY.txt0ip
2012-05-12Merge pull request #627 from edy-b/body-blockJohn McLear
add more blocks to pad.html
2012-05-02Updated socket.io0ip
2012-05-01accidentally deleted an end block in last mergeEdy
2012-05-01Merge branch 'develop' of git://github.com/Pita/etherpad-lite into body-blockEdy
Conflicts: src/templates/pad.html
2012-04-30Correct dependency paths for checkPad script.John McLear
2012-04-30Merge pull request #685 from 0ip/typoJohn McLear
Fix #666 - Typo "seperator"
2012-04-30Fixed typos0ip
2012-04-30Fix #683 - Disabling authorship colors doesn't work0ip
2012-04-30Merge pull request #684 from 0ip/remove_qr_codeJohn McLear
Remove QR-code
2012-04-30Removed QR-Code0ip
2012-04-30Merge branch 'develop' of git://github.com/Pita/etherpad-lite into body-blockEdy
Resolved conflicts: src/templates/pad.html
2012-04-29100% is not needed here http://ragefac.es/4160ip
2012-04-29Merge pull request #682 from fourplusone/fix/fix-677John McLear
fixed plugins.js
2012-04-29fixed plugins.jsMatthias Bartelmeß
2012-04-29Merge pull request #681 from fourplusone/fix/fix-677John McLear
fixed socket.io in timeslider.js
2012-04-29fixed socket.io in timeslider.jsMatthias Bartelmeß
2012-04-29Merge pull request #680 from fourplusone/fix/fix-677John McLear
Fix #677
2012-04-29fix #677Matthias Bartelmeß
2012-04-29Merge pull request #679 from 0ip/highl_modJohn McLear
Tidy up wobbly button highlighting code
2012-04-29Merge pull request #678 from 0ip/admin_rel_pathsJohn McLear
plugins.html ← Fix relative paths
2012-04-29Tidied up highlighting for currently opened module 20ip
2012-04-29Tidied up highlighting for currently opened module0ip
2012-04-28templates/plugins.html Fixed relative paths0ip
2012-04-25Merge pull request #671 from fourplusone/fix/baseurlJohn McLear
baseURL/fixing #670
2012-04-25added baseURL export to pad.js, timeslider.js, plugins.js, fixing #670Matthias Bartelmeß
2012-04-21adding padutils to padmodalsMatthias Bartelmeß
2012-04-21cssManager top is not used, so drop itMatthias Bartelmeß
2012-04-21Remove my fix and allow @redhogs to be the proper one.. (even though it's ↵John McLear
exactly the same thing)
2012-04-20Merge pull request #660 from redhog/masterJohn McLear
Unbreak last pull request (I forgot a dependency)
2012-04-21Bugfix dependenciesEgil Moeller
2012-04-21Merge branch 'develop' into feature/cleaner_codeMatthias Bartelmeß
2012-04-21luke warm fix.John McLear
2012-04-20Merge pull request #647 from etinquis/fixesJohn McLear
Fix + New Hook
2012-04-20less verbose startup, better log messages at startupMatthias Bartelmeß
2012-04-20server.js can be called from console.Matthias Bartelmeß
2012-04-20default dirty.db to current pwd, so no new directory has to be createdMatthias Bartelmeß
2012-04-20warn if dirty db is usedMatthias Bartelmeß
2012-04-20allow startup without settings fileMatthias Bartelmeß
2012-04-20added etherpad-lite to "bin" in package.jsonMatthias Bartelmeß
2012-04-20Merge pull request #659 from redhog/masterJohn McLear
Oups, forgot a debug print in there in the last pull request
2012-04-20removing Minify.js.rejMatthias Bartelmeß
2012-04-20Removed debug printEgil Moeller
2012-04-20Merge pull request #658 from redhog/masterJohn McLear
Bugfixes for when plugins are installed as dependencies for other plugins
2012-04-20Bugfix for recursive dependency-installation and pathsEgil Moeller
2012-04-20removing commented out functions from cssmanager.jsMatthias Bartelmeß
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-17 04:39:17 +0000