summaryrefslogtreecommitdiff
AgeCommit message (Expand)Author
2012-11-02Make express restart - I think this reloads settingsjohnyma22
2012-11-02make stuff workjohnyma22
2012-11-02make the server save settingsjohnyma22
2012-11-02remove cruft from js and move minify json to seperate file and also send emit...johnyma22
2012-11-02actually using text area is a lot less stupidjohnyma22
2012-11-02Start putting file system together for admin settings, no where near completejohnyma22
2012-11-01Merge branch 'develop' of github.com:Pita/etherpad-lite into developjohnyma22
2012-11-01Merge pull request #1112 from marcelklehr/docs/custom-folderJohn McLear
2012-11-01[docs] Document custom static files.Marcel Klehr
2012-11-01Allow robots.txt to be customJohn McLear
2012-11-01Merge pull request #1111 from marcelklehr/feature/eejs-pass-args-to-hooksJohn McLear
2012-11-01Merge branch 'feature/eejs-pass-args-to-hooks' of git://github.com/marcelkleh...johnyma22
2012-11-01Pass on the req object to eejs hooksMarcel Klehr
2012-11-01Pass on the render args to all eejs hooksMarcel Klehr
2012-10-31Merge pull request #1109 from yourcelf/patch-1John McLear
2012-10-31Add api docs for `userColor` query argyourcelf
2012-10-31[docs] Fix assets: Rename doc/_assets to doc/assetsMarcel Klehr
2012-10-31Merge pull request #1103 from marcelklehr/docs/http-api-versionsJohn McLear
2012-10-30JS fix for #1077 fire event at start because of the resize issue, this is a c...johnyma22
2012-10-30Merge branch 'develop' of github.com:Pita/etherpad-lite into developjohnyma22
2012-10-30fixes a tiny css bug #1077johnyma22
2012-10-30Bump api version in #usage sectionMarcel Klehr
2012-10-30Refactor structure of api/http_api.md and add api version numbers for all end...Marcel Klehr
2012-10-30Get involved textJohn McLear
2012-10-30Don't depend on Bit.ly to get people to the EPJohn McLear
2012-10-29Merge branch 'develop' of github.com:Pita/etherpad-lite into developjohnyma22
2012-10-29remove opacity to fix opera bug #941johnyma22
2012-10-29Merge pull request #1098 from Pita/span-two-lines-on-less-than-400pxJohn McLear
2012-10-29fix rtl sanityjohnyma22
2012-10-29Merge branch 'develop' of github.com:Pita/etherpad-lite into developjohnyma22
2012-10-29allow max chat to be 999 charsjohnyma22
2012-10-29make anything less than 400px span 2 lines on toolbar and make popups appear ...johnyma22
2012-10-29Merge pull request #1094 from marcelklehr/fix/doc-generatorJohn McLear
2012-10-29Merge pull request #1095 from marcelklehr/docs/improve-doc-generationJohn McLear
2012-10-28Merge pull request #1096 from marcelklehr/fix/server-startup-npmJohn McLear
2012-10-28Mimic, replace or work around removed npm utils.Marcel Klehr
2012-10-28Make sure npm is initialized before requiring things (fix #1092)Marcel Klehr
2012-10-27Add recipe for doc assets and some basic styling for the generated docs.Marcel Klehr
2012-10-27Insert epl version into template.Marcel Klehr
2012-10-27Change filename hooks.md -> hooks_overview.mdMarcel Klehr
2012-10-25Merge pull request #1091 from kingkaeru/feature/iisnode_supportJohn McLear
2012-10-25Add IIS config fileRandy
2012-10-25Add default port of process.env.PORT if port isnt specified in settings.jsonRandy
2012-10-25Merge branch 'develop' of git://github.com/Pita/etherpad-lite into developJohn McLear
2012-10-25add a script to migrate from dirtyDB to MYSQL thanks to http://blog.codeborne...John McLear
2012-10-25fix paths in convert.js so it worksJohn McLear
2012-10-25Merge pull request #1073 from Pita/librejs-headerJohn McLear
2012-10-25Merge pull request #1090 from marcelklehr/docs/add-pluginfwJohn McLear
2012-10-25Merge pull request #1086 from neurolit/patch_relative_static_linksJohn McLear
2012-10-25Add docs for plugins and plugin frameworkMarcel Klehr
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-17 06:18:09 +0000