summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2012-10-25fix paths in convert.js so it worksJohn McLear
2012-10-25fix marcels trailing ,John McLear
2012-10-25Merge pull request #1088 from marcelklehr/fix/update-npmJohn McLear
Update npm
2012-10-25Merge pull request #1089 from marcelklehr/legal/extend-collaboratersJohn McLear
Add myself to the list of contributers
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ß
Do not assume window object exists
2012-10-23Do not assume window object existsChia-liang Kao
2012-10-16Merge pull request #1072 from marcelklehr/fix/timeslider-links-regexpJohn McLear
Fix #1067 Corrected exports links regexp
2012-10-16Fix #1067 Corrected exports links regexpMarcel Klehr
2012-10-15couch, level, mongo, postgres, redis DB supportJohn McLear
Support for additional underlying databases
2012-10-11Update src/package.jsonJohn McLear
Bump version #
2012-10-11Merge pull request #1059 from lepidum/developJohn McLear
Fix for #1032 caused by pull-request 999
2012-10-11Merge pull request #3 from ayokura/fix-international-compositionlepidum
fix Pita/etherpad-lite #1032 (International composition (e.g. Japanese Input))
2012-10-12fix Pita/etherpad-lite #1032NAGOYA, Yoshihiko
refact inInternationalComposition
2012-10-11Merge pull request #1035 from amtep/developJohn McLear
Guard against malicious clients in USERINFO_UPDATE handling
2012-10-11Merge pull request #1057 from dmitryuv/sync-processingMarcel Klehr
fix for error handling in the callback code
2012-10-11fix for error handling in callback codeDmitry
The callback code does not follow error handling guidelines, thus always receiving NULL instead of results array.
2012-10-11Merge pull request #1056 from dmitryuv/sync-processingMarcel Klehr
Fix variable name in handleMessageHook
2012-10-11fixed variable name in handleMessageHookDmitry
the code would never work as expected with this type
2012-10-09Merge pull request #1049 from cweider/fix-expressJohn McLear
Drop method deprecated in Express 3.x.
2012-10-09Drop method deprecated in Express 3.x.Chad Weider
2012-10-06Remove two instances of the same function nameJohn McLear
Both functions did the same thing, the first function was buggy.  Might be worth someone looking through the history of this file and pointing out when I made this heinous error ;)
2012-10-05Merge pull request #1034 from d-a-n/developJohn McLear
Added hooks for pad events create/edit/load/remove
2012-10-04Merge pull request #1004 from yourcelf/developJohn McLear
Add `userColor` query param to set initial color
2012-10-04Fix issue caused by broken async updatejohnyma22
2012-10-03Merge pull request #1003 from Pita/express-v3John McLear
Upgrade Express to v3 [proposal]
2012-10-03Merge pull request #1038 from cweider/fix-relativeJohn McLear
Upgrade to Yajsml bug fix.
2012-10-03Changed pad_id to padID to follow projct standards.d-a-n
2012-10-03Changed pad_id to padID to follow projct standards.d-a-n
2012-10-03Changed pad hook names to follow naming conventions. Arguments will now be ↵d-a-n
passed as hash.
2012-10-03Changed pad hook names to follow naming conventions.d-a-n
2012-10-03Merge branch 'develop' into express-v3Marcel Klehr
Conflicts: src/node/hooks/express/errorhandling.js
2012-10-02Upgrade to Yajsml bug fix.Chad Weider
2012-10-02USERINFO_UPDATE: construct a new message for broadcastRichard Braakman
The server was reusing the client's message when broadcasting userinfo updates. This would allow a malicious client to insert arbitrary fields into a message that the other clients would trust as coming from the server. For example, adding "disconnect" or renaming other authors. This commit fixes it by having the server construct a new message with known fields before broadcasting.
2012-10-02Updated docs for new pad hooks (add, edit, remove)d-a-n
2012-10-02Added pad hooks (create, load, edit, remove)d-a-n
2012-10-02Updated docs for new pad hooks (add, edit, remove)d-a-n
2012-10-02Updated docs for new pad hooks (add, edit, remove)d-a-n
2012-10-02Merge pull request #1031 from gedion/developJohn McLear
Update docs for new hooks and ace exposures
2012-10-02Merge pull request #1033 from marcelklehr/fix/shutdown-on-middlware-errorJohn McLear
Don't shut down the whole server, if error handling middleware is called...
2012-10-02Don't shut down the whole server, if error handling middleware is called.Marcel Klehr
The errors passed to error handling middleware aren't that severe, so it's fine to just stay alive...
2012-10-02Update src/static/js/pad_editbar.jsJohn McLear
Somehow </iframe> was no more.  Now it is back..  Oh boy.
2012-10-01added comments to ace exposed methodsGedion
2012-10-01added comments to ace exposed methodsGedion
2012-10-01Merge pull request #1006 from cweider/ace-cleanupJohn McLear
Ace cleanup
2012-09-30update docs for new hooks and ace exposuresGedion
2012-09-30Merge pull request #1028 from amtep/developJohn McLear
Fix server crash if client disconnects too soon after connecting
2012-09-30Merge pull request #1020 from marcelklehr/fix/express-v3John McLear
Fixes for express-v3 branch