Commit graph

81 commits

Author SHA1 Message Date
Azul
7dcc7be8e0 get the proper git revision even when not started from node dir 2012-01-05 11:44:08 +01:00
Peter 'Pita' Martischka
c72cd49ede Merge branch 'dokuwiki-merge' of git://github.com/adrianlang/etherpad-lite into dokuwiki 2011-12-11 18:09:51 +01:00
Adrian Lang
40c5e70aa7 Add DokuWiki export 2011-12-07 13:03:08 +01:00
Peter 'Pita' Martischka
8a6704beef reduced the httpAuth timeout to 1000ms 2011-12-04 17:27:36 +01:00
Peter 'Pita' Martischka
a4eef2780e Merge branch 'issue241' of git://github.com/alx/etherpad-lite into httpAuth 2011-12-04 17:22:00 +01:00
Peter 'Pita' Martischka
5c56e62d67 Changed all error handling to async-stacktrace style + fixed import/export on unix 2011-12-04 16:50:02 +01:00
Peter 'Pita' Martischka
db1ba6a65e Don't let express catch errors, let the process die 2011-12-04 15:19:24 +01:00
Alexandre Girard
71fee11656 add the ability to set global password with http basic auth 2011-12-01 16:44:51 +01:00
Micah Anderson
97e9eb84af fix for #224 2011-11-25 13:39:33 -05:00
Peter 'Pita' Martischka
2e79bd50a3 fixed socket.io logging 2011-11-19 14:14:31 -08:00
Jordan
411984787a Implement POST requests for HTTP API 2011-11-18 21:52:12 -05:00
Thomas Frössman
73711abd97 Added comments 2011-11-03 07:34:51 +01:00
Thomas Frössman
8223f84714 Kind of a hack but makes issue #158 go away.
There is probably a deeper error somewhere in either log4js or express, I don't have the time to investigate that atm.
2011-10-17 23:31:39 +02:00
Adrian Lang
7557af3db7 Fix directory traversal fixing RegExp 2011-09-01 23:49:52 +02:00
Adrian Lang
86d3b2ba81 Fix directory traversal
See https://ada.adrianlang.de/etherpad-lite-directory-traversal
2011-09-01 23:27:18 +02:00
Peter 'Pita' Martischka
8d12c3d7ee added a link to the bugtracker 2011-08-21 19:52:24 +01:00
Peter 'Pita' Martischka
d85eeee5f4 check pad access on read only 2011-08-21 19:43:42 +01:00
Peter 'Pita' Martischka
4d7c8a2c7d added ability to set a custom favicon 2011-08-20 19:27:41 +01:00
Peter 'Pita' Martischka
3c6ca617f6 show git version on start 2011-08-19 22:01:33 +01:00
Peter 'Pita' Martischka
b9c1b45a8b added utf8 to content type of api responses, thx @0ip 2011-08-19 21:57:15 +01:00
Peter 'Pita' Martischka
caecfd3997 PITA, Y U NO TEST? 2011-08-18 21:29:34 +01:00
Peter 'Pita' Martischka
ef6a75ca54 don't do a graceful shutdown on SIGINT on windows 2011-08-18 21:02:54 +01:00
Peter 'Pita' Martischka
ad1e8fb4f8 limit the graceful shutdown time to 3 seconds 2011-08-18 20:54:04 +01:00
Peter 'Pita' Martischka
2dd82f82de since we set a global lock level, we can log socket.io debug messages 2011-08-18 13:40:30 +01:00
Peter 'Pita' Martischka
c2457e06d8 send client side javascript errors to the server 2011-08-17 19:24:44 +01:00
Peter 'Pita' Martischka
b58bdb4e4d support jsonp api calls 2011-08-17 18:24:14 +01:00
Peter 'Pita' Martischka
41883e688b moved require joose to the correct place 2011-08-17 17:49:05 +01:00
Peter 'Pita' Martischka
3ec7dc224b added a loglevel setting 2011-08-17 17:45:47 +01:00
Peter 'Pita' Martischka
296777ab53 added a graceful shutdown 2011-08-17 15:58:42 +01:00
Peter 'Pita' Martischka
5da30a40bf changed content type of api responses to application/json 2011-08-16 20:06:59 +01:00
Peter 'Pita' Martischka
3ff34f50d1 added a security control at socketiorouter, pad security is now fully enforced 2011-08-16 15:53:09 +01:00
Peter 'Pita' Martischka
317370da2c restricted access to pad import and export 2011-08-15 22:20:37 +01:00
Peter 'Pita' Martischka
255dc5a325 fixed merge conflicts 2011-08-15 16:58:22 +01:00
Peter 'Pita' Martischka
793ef42704 added a error message for invalid padIDs 2011-08-15 15:45:28 +01:00
John McLear
10c2497fcc Allow cross site export 2011-08-14 14:47:41 +01:00
Peter 'Pita' Martischka
b300dc1d2c fixed merge conflicts 2011-08-13 22:18:42 +01:00
Peter 'Pita' Martischka
4730c3b46e added a error message for invalid padIDs 2011-08-13 20:20:30 +01:00
Peter 'Pita' Martischka
0e05e58c76 changed copyright from Peter 'Pita' Martischka to Peter 'Pita' Martischka (Primary Technology Ltd) 2011-08-11 15:27:16 +01:00
Peter 'Pita' Martischka
a6df6ab0a7 change api calls from POST to GET 2011-08-08 20:14:01 +01:00
Peter 'Pita' Martischka
9d91a3873c added logging for http api calls 2011-08-08 17:45:44 +01:00
Peter 'Pita' Martischka
8d28fcbf23 ensure server header is also send with the api functions 2011-08-08 17:34:51 +01:00
Peter 'Pita' Martischka
820c18c7e9 check the padID with a regular expression 2011-08-04 16:07:58 +01:00
Peter 'Pita' Martischka
f45b7ce9ea Installed API infrastructure, getText works already 2011-08-03 19:31:25 +01:00
Peter 'Pita' Martischka
b30849c2f2 Installed log4js as logging framework 2011-07-31 18:25:51 +01:00
Peter 'Pita' Martischka
5306a88214 added the ability to listen at a specific ip 2011-07-30 16:39:53 +01:00
Peter 'Pita' Martischka
2aafcc1027 Fixed all requires 2011-07-27 18:52:23 +01:00
Peter 'Pita' Martischka
f4e04be9da Let socket.io minify its javascript 2011-07-27 14:46:45 +01:00
Peter 'Pita' Martischka
56ab112fa3 Timeslider Javascript is now minified too 2011-07-26 17:39:25 +01:00
Peter 'Pita' Martischka
1067d17381 Log the disconnect diagnostic info that etherpad still sends. Maybe thats usefull 2011-07-25 16:31:41 +01:00
Peter 'Pita' Martischka
e9a389b0a6 improved minifying 2011-07-25 14:38:54 +01:00