summaryrefslogtreecommitdiff
AgeCommit message (Expand)Author
2012-10-30Refactor structure of api/http_api.md and add api version numbers for all end...Marcel Klehr
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
2012-10-25fix marcels trailing ,John McLear
2012-10-25Merge pull request #1088 from marcelklehr/fix/update-npmJohn McLear
2012-10-25Merge pull request #1089 from marcelklehr/legal/extend-collaboratersJohn McLear
2012-10-25Add "Marcel Klehr" to contributers listMarcel Klehr
2012-10-25Update npm (fix #1012)Marcel Klehr
2012-10-25Fix broken layout (Chrome Mobile)0ip
2012-10-25Merge pull request #1081 from clkao/developMatthias Bartelmeß
2012-10-24Templates: relative links instead of absolute ones for /static directoryneurolit
2012-10-23Do not assume window object existsChia-liang Kao
2012-10-17Add LibreJS Licensing information to headers of HTML templatesjohnyma22
2012-10-16Merge pull request #1072 from marcelklehr/fix/timeslider-links-regexpJohn McLear
2012-10-16Fix #1067 Corrected exports links regexpMarcel Klehr
2012-10-15couch, level, mongo, postgres, redis DB supportJohn McLear
2012-10-11Update src/package.jsonJohn McLear
2012-10-11Merge pull request #1059 from lepidum/developJohn McLear
2012-10-11Merge pull request #3 from ayokura/fix-international-compositionlepidum
2012-10-12fix Pita/etherpad-lite #1032NAGOYA, Yoshihiko
2012-10-11Merge pull request #1035 from amtep/developJohn McLear
2012-10-11Merge pull request #1057 from dmitryuv/sync-processingMarcel Klehr
2012-10-11fix for error handling in callback codeDmitry
2012-10-11Merge pull request #1056 from dmitryuv/sync-processingMarcel Klehr
2012-10-11fixed variable name in handleMessageHookDmitry
2012-10-09Merge pull request #1049 from cweider/fix-expressJohn McLear
2012-10-09Drop method deprecated in Express 3.x.Chad Weider
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-17 07:27:48 +0000