summaryrefslogtreecommitdiff
path: root/src
AgeCommit message (Expand)Author
2012-11-01added webdriver to npm dependenciesPeter 'Pita' Martischka
2012-10-30Merge branch 'develop' of github.com:Pita/etherpad-lite into feature/frontend...johnyma22
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 #1097 from Pita/developPeter 'Pita' Martischka
2012-10-28add a keystroke check for chat and make it so the chat listens on event 13 as...John 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-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-27Merge branch 'develop' of github.com:Pita/etherpad-lite into feature/frontend...Peter 'Pita' Martischka
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 pull request #1073 from Pita/librejs-headerJohn McLear
2012-10-25Merge pull request #1086 from neurolit/patch_relative_static_linksJohn McLear
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-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-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-09Drop method deprecated in Express 3.x.Chad Weider
2012-10-08major restructering of the front end test frameworkPeter 'Pita' Martischka
2012-10-06Remove two instances of the same function nameJohn McLear
2012-10-05Merge pull request #1034 from d-a-n/developJohn McLear
2012-10-04attempt to move onClick away from HTML.. This is requiredjohnyma22
2012-10-04Merge pull request #1004 from yourcelf/developJohn McLear
2012-10-04Merge branch 'develop' of github.com:Pita/etherpad-lite into feature/frontend...johnyma22
2012-10-04Fix issue caused by broken async updatejohnyma22
2012-10-03Merge pull request #1003 from Pita/express-v3John McLear
2012-10-03Changed pad_id to padID to follow projct standards.d-a-n