summaryrefslogtreecommitdiff
path: root/src/node/hooks/express
AgeCommit message (Expand)Author
2012-12-07merged upstream developWikinaut
2012-12-05Fix #1219: Make api work if requireAuth is enabledMarcel Klehr
2012-12-03fixed git merge confictIván Eixarch
2012-12-02add socketTransportProtocols parameterWikinaut
2012-11-29Let socket.io decide which transport is best for the browserMarcel Klehr
2012-11-23Import html by default and allow basic import/export features without abiwordIván Eixarch
2012-11-17Make tests work on windowsMarcel Klehr
2012-11-13Merged branch feature/frontend-testsPeter 'Pita' Martischka
2012-11-06Fix #1130 Reload settings on /admin/settings server restartMarcel Klehr
2012-11-06Merge pull request #1124 from Wikinaut/fix-issue-377-add-favicon-url-settings...John McLear
2012-11-05Merge pull request #1127 from Pita/admin-pageJohn McLear
2012-11-05add express endpoint for admin index.htmlJohn McLear
2012-11-05Merge pull request #1120 from Pita/feature/settings-adminJohn McLear
2012-11-04allow favicon.ico as pad nameWikinaut
2012-11-04fix #377: add favicon url as optional settings.json parameterWikinaut
2012-11-03merged develop back inPeter 'Pita' Martischka
2012-11-02Make express restart - I think this reloads settingsjohnyma22
2012-11-02make the server save settingsjohnyma22
2012-11-02Start putting file system together for admin settings, no where near completejohnyma22
2012-11-01Put up some '/admin doesn't exist' notice.Marcel Klehr
2012-11-01Allow robots.txt to be customJohn McLear
2012-11-01Pass on the req object to eejs hooksMarcel 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-08major restructering of the front end test frameworkPeter 'Pita' Martischka
2012-10-04Merge branch 'develop' of github.com:Pita/etherpad-lite into feature/frontend...johnyma22
2012-10-03Merge branch 'develop' into express-v3Marcel Klehr
2012-10-02Don't shut down the whole server, if error handling middleware is called.Marcel Klehr
2012-10-02Setted up an enviroment for frontend tests, first stepsPeter 'Pita' Martischka
2012-09-22Fix socket.io auth: Use connect to parse signed cookies (migrate to express v3)Marcel Klehr
2012-09-22Migrate error handling middleware to express v3Marcel Klehr
2012-09-22Set secret on cookieParser (migrate to express v3)Marcel Klehr
2012-09-22Fix res.send (migrate to express v3)Marcel Klehr
2012-09-21Upgrade log4js to v0.5Marcel Klehr
2012-09-21Differentiate between http server and express appMarcel Klehr
2012-09-12error handling and close is removed in express 3johnyma22
2012-09-09Add support for multiple api versionsMarcel Klehr
2012-09-03Merge pull request #977 from cweider/loopback-avoidanceJohn McLear
2012-09-03Minify publishes its own mock request thing.Chad Weider
2012-08-18use socket.io with jsonp-polling. several browsers tested. fixes IE8 issuesWikinaut
2012-08-16fix for all IE8 issues when IE8 setting NATIVE XMLHHTP SUPPORT is disabledWikinaut
2012-07-22Eliminate the loopback that has been causing so much trouble.Chad Weider
2012-07-03Merge branch 'develop' of git://github.com/Pita/etherpad-lite into restartserverEgil Moeller
2012-07-03Make the server restart on plugin installEgil Moeller
2012-07-02Don't rewrite in a stupid wayMark Holmquist
2012-06-22Merge pull request #810 from redhog/aceEditEventJohn McLear
2012-06-13The pad name sanitizer shouldn't drop query params. issue #779Jordan Hollinger
2012-06-04More plugin informationEgil Moeller
2012-04-23Unified timeslider and pad editing protocol / componentEgil Moeller