fuwafuwa
/
etherpad-lite
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity
4,329 Commits 1 Branch 0 Tags 10 MiB
Commit Graph

2107 Commits

Author SHA1 Message Date
John McLear dbb2956d2f allow chrome to use control shift 1 to send ordered list 2015-04-28 15:48:12 +01:00
John McLear 254edffa9c fixes #2547 2015-04-24 14:17:49 +01:00
John McLear b349a4f226 probably fixes #2625 2015-04-23 17:49:08 +01:00
Andreas Åkre Solberg ec7b3fc787 Adding support for providing intermediate CA certificates when running etherpad-lite with ssl through Node/expressjs 2015-04-22 20:29:19 +02:00
Stefan 2393ea01f0 Release version 1.5.6 2015-04-16 23:06:24 +02:00
Tom Hunkapiller 6ff7d4e9a6 revert to old path handling, but strip out "..". fixes #2614 2015-04-15 14:31:21 -05:00
Stefan 64d94cb346 Release version 1.5.5 2015-04-13 17:27:14 +02:00
John McLear 629f909d57 add some semicoolons to prevent chrome warning 2015-04-13 10:52:15 +01:00
louis 0fa7650df8 dont allow directory traversal #2 2015-04-12 17:12:35 +02:00
John McLear 6a027d88a9 fix older IEs 2015-04-12 13:00:01 +01:00
John McLear 5435063a2f re-fix rtl 2015-04-12 10:35:24 +01:00
John McLear e3f95d0c9c Merge pull request #2604 from ether/pad-options 
session key is now ignored and also padOptions are available in settings
 2015-04-11 22:33:46 +01:00
Peter 'Pita' Martischka fc0cac0cad merge object settings into default settings 2015-04-11 22:01:46 +01:00
John McLear 8ed12c7776 session key is now ignored and also padOptions are available in settings 2015-04-11 21:22:00 +01:00
John McLear 4a70837de9 Merge pull request #2602 from devoidfury/fix/import-large-etherpad 
fix large etherpad import, fixes #2524
 2015-04-11 20:09:01 +01:00
Stefan 43687f6e8b Merge pull request #2601 from Gared/session_key_file 
Move sessionKey setting from settings.json to SESSIONKEY.txt
 2015-04-11 19:10:18 +02:00
Tom Hunkapiller a896d67e8c make setPadRaw async; streamline .etherpad file import handling chain 2015-04-11 12:02:19 -05:00
Stefan a3ed82ad06 Move sessionKey setting from settings.json to SESSIONKEY.txt 2015-04-11 18:45:14 +02:00
John McLear 25092fcb90 Merge pull request #2600 from devoidfury/fix/junk-binary-files 
fix: only match /javascript/* for caching middleware
 2015-04-11 16:00:02 +01:00
Tom Hunkapiller 133188320a fix: only match /javascript/* for caching middleware 2015-04-11 09:54:40 -05:00
John McLear 5ef22e649b Merge pull request #2302 from Gared/create_pad_special_characters 
Add check for special url characters to createPad API function
 2015-04-11 14:56:26 +01:00
John McLear 27aa71f3a4 IE list fixes 2015-04-11 13:16:45 +01:00
John McLear 34c5441392 msg to self 2015-04-11 11:37:20 +01:00
John McLear 4d009ba445 bump underscore and require kernel 2015-04-11 11:32:46 +01:00
Stefan aa0d14c7d7 Merge branch 'master' of git://github.com/ether/etherpad-lite into create_pad_special_characters 2015-04-11 12:10:37 +02:00
John McLear 14fab9f441 FF middle click fix 2015-04-11 10:45:51 +01:00
John McLear 2ca0214661 bump versions outdated 2015-04-11 10:24:50 +01:00
Stefan a69b2a9cd1 Merge pull request #2596 from ether/master 
Master
 2015-04-11 10:55:26 +02:00
John McLear acc1a0626a use latest ejs 2015-04-11 09:53:27 +01:00
Stefan 1b9a51c879 Release version 1.5.4 2015-04-11 10:19:02 +02:00
Tom Hunkapiller 0b0a349081 clearer comments about the path handling behavior 2015-04-11 09:05:51 +01:00
Tom Hunkapiller 5409eb314c fix an issue in the path handling that allowed directory traversal 2015-04-11 09:05:32 +01:00
Tom Hunkapiller 2e4374c08d clearer comments about the path handling behavior 2015-04-10 20:19:26 -05:00
Tom Hunkapiller 3ebb19d8a2 fix an issue in the path handling that allowed directory traversal 2015-04-10 20:03:00 -05:00
John McLear 402e53d88e Merge pull request #2584 from devoidfury/express4 
Express 4 support
 2015-04-11 00:13:45 +01:00
Stefan d47e201232 Merge branch 'develop' of git://github.com/ether/etherpad-lite into release/1.5.3 2015-04-11 00:49:26 +02:00
Stefan d3277deafc Increase etherpad version to 1.5.3 2015-04-11 00:32:18 +02:00
Stefan db5bdc8719 Log version number and git-sha on server start 2015-04-11 00:13:04 +02:00
Stefan 8e4c961207 Add version number to plugins-info page 2015-04-10 23:52:17 +02:00
John McLear 9d4e5f6e35 dont allow directory traversal 2015-04-10 22:02:22 +01:00
Tom Hunkapiller fd1d285a77 fix the rest of the deprecation warnings 2015-04-10 14:18:30 -05:00
Tom Hunkapiller 6fad2ca39a fix vulnerability 2015-04-10 06:16:17 -05:00
Tom Hunkapiller de67714cf8 fix minify route path; update deprecated calls 2015-04-10 05:52:58 -05:00
Tom Hunkapiller d0b39c01fb update for express 4.x 2015-04-08 23:12:11 -05:00
John McLear 7b86eb09bc new fix for #1766 2015-04-08 09:24:19 +01:00
John McLear a5345524e1 Merge pull request #2566 from ether/editbar-accessibility 
Accessibility
 2015-04-07 21:25:27 +01:00
John McLear a2e6a1bb4f Merge pull request #2579 from ether/warnings-in-pad-contents 
pass error messages to pad text if shown during startup
 2015-04-07 21:24:47 +01:00
John McLear 7e99724fec Merge branch 'develop' of github.com:ether/etherpad-lite into editbar-accessibility 2015-04-06 13:19:42 +01:00
John McLear a5aa58e28b bump ueber 2015-04-06 13:18:44 +01:00
John McLear e0270d0ba8 bump vs 2015-04-06 13:16:21 +01:00