mirrors/etherpad-lite
1
0
Fork 0
mirror of https://github.com/ether/etherpad-lite.git synced 2025-04-30 04:09:13 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions 43
4340 commits 219 branches 107 tags 74 MiB
Commit graph

2122 commits

Author SHA1 Message Date
Egil Moeller
459e75ab69 Less static code in templates 2015-05-12 23:24:40 +02:00
Egil Moeller
e5abd185b5 Lots of fixes 2015-05-12 21:32:33 +02:00
Egil Moeller
0ec2592c53 Bugfixed a broken merge 2015-04-24 21:04:52 +02:00
John McLear
2cd280a44b merge develop back in 2015-04-19 11:46:41 +01: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
Egil Moeller
0c94c8ade5 Bugfix 2015-04-12 22:29:31 +02:00
Egil Moeller
250b8928bd The Big Rewrite to AMD format - had to do lots of them at once 2015-04-12 21:03:59 +02:00
Egil Moeller
2472cd365e ace.js AMDification 2015-04-12 18:10:17 +02:00
louis
0fa7650df8 dont allow directory traversal #2 2015-04-12 17:12:35 +02:00
Egil Moeller
2f12fc0229 Removed some more minify stuff 2015-04-12 14:24:03 +02:00
John McLear
6a027d88a9 fix older IEs 2015-04-12 13:00:01 +01:00
Egil Moeller
6cbf8a6245 Embed less 2015-04-12 13:55:08 +02:00
Egil Moeller
027d9e3a70 Some amd loading of hooks 2015-04-12 13:33:33 +02:00
Egil Moeller
77449760f6 Indentation 2015-04-12 13:08:26 +02:00
John McLear
30ea6bd7ab allow different syntax 2015-04-12 11:40:57 +01:00
John McLear
5435063a2f re-fix rtl 2015-04-12 10:35:24 +01:00
Egil Moeller
dade9520a4 Hooks can now be loaded as AMD 2015-04-12 11:32:59 +02: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
Egil Moeller
7a1f065702 More AMDificatioN 2015-04-11 23:08:09 +02: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
4234681efd merge latest develop 2015-04-11 16:16:03 +01:00
John McLear
e488d95aca include requirejs in package file 2015-04-11 16:15:08 +01: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
Egil Moeller
9729af63e8 Cleanup 2015-04-11 16:57:58 +02:00
Tom Hunkapiller
133188320a fix: only match /javascript/* for caching middleware 2015-04-11 09:54:40 -05:00
Egil Moeller
b86aa5d858 Hook modules can be in either CommonJS or AMD format, have to be AMD for client side 2015-04-11 16:51:01 +02: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
Egil Moeller
0e5cd65d8d First baby steps towards requirejs 2015-04-11 13:22:27 +02: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