summaryrefslogtreecommitdiff
AgeCommit message (Expand)Author
2012-10-27made it possible to run only certain testsPeter 'Pita' Martischka
2012-10-27wrap spec files with a describePeter 'Pita' Martischka
2012-10-27load list of spec files from the serverPeter 'Pita' Martischka
2012-10-27redirect from frontend to frontend/Peter 'Pita' Martischka
2012-10-27run all testsPeter 'Pita' Martischka
2012-10-27Merge branch 'clear-authorship-color-test-spec' of git://github.com/johnyma22...Peter 'Pita' Martischka
2012-10-27Merge branch 'develop' of github.com:Pita/etherpad-lite into feature/frontend...Peter 'Pita' Martischka
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-09clear authorship colors testjohnyma22
2012-10-09simple check to ensure changing username change worksjohnyma22
2012-10-09keystroke enter specjohnyma22
2012-10-09Merge pull request #1049 from cweider/fix-expressJohn McLear
2012-10-09Drop method deprecated in Express 3.x.Chad Weider
2012-10-09 a non working chat always ons creen testjohnyma22
2012-10-09strikethrough testjohnyma22
2012-10-09button ordered list testjohnyma22
2012-10-09redo buttonjohnyma22
2012-10-09an undo button testjohnyma22
2012-10-09the first stages of a clear authorship color testjohnyma22