libretic/etherpad-lite
6
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity
976 commits 2 branches 0 tags 24 MiB
Commit graph

307 commits

Author SHA1 Message Date
Chad Weider
da95016228 Add a fake require to go with the fake exports. 2012-01-22 09:49:13 -08:00
Chad Weider
fc68a25b21 Isolate all files in a closure. 2012-01-22 09:49:13 -08:00
Chad Weider
ab02135643 Factor out taring process. 2012-01-22 09:49:13 -08:00
Chad Weider
9e16b9a575 Always use the JS assets processed by Minify. 
This allows the preprocessing that will restrict scope of files to be done once in Minify.
 2012-01-22 09:49:13 -08:00
Chad Weider
b175ad562a Use uncompressed jQuery. 
The jQuery library does not need to be compressed; it is compressed as a consequence of being included in `pad.js`.
 2012-01-22 09:46:08 -08:00
Chad Weider
53549b7422 Use constants and CWD-independent paths for resource directories. 2012-01-22 09:42:09 -08:00
Chad Weider
c3acdbe329 Minify uses the stardard middleware interface. 2012-01-22 09:33:17 -08:00
Chad Weider
1c0a74d7c6 Use middleware to specify Server name in header. 2012-01-22 09:30:51 -08:00
Peter 'Pita' Martischka
cf47153769 Merge branch 'master' of github.com:Pita/etherpad-lite 2012-01-22 15:25:50 +01:00
Peter 'Pita' Martischka
d391dab558 fixed merge conflict 2012-01-22 15:23:50 +01:00
Azul
c4f9268cfa make PadMessageHandler more robust against timing issues 2012-01-19 17:38:16 +01:00
Peter 'Pita' Martischka
a313c2570e Merge pull request #331 from cweider/packaging-improvement 
Packaging improvement
 2012-01-15 12:48:41 -08:00
Chad Weider
9c91f16c71 Improve inlining of editor content. 
Instead of replacing substrings, write each included file's content into a shared dictionary for lookup later. This eliminates duplication and arguably improves readability.
 2012-01-15 11:27:04 -08:00
John McLear
f4dca37a93 Ordered list support 2012-01-15 17:20:20 +00:00
Chad Weider
77804673d7 Move packaging info into its own file. 2012-01-15 01:52:58 -08:00
Chad Weider
387dd4a48b The value of all href attributes is escaped. 2012-01-14 14:50:23 -08:00
Chad Weider
6e36b59a59 All escaping functions replace HTML reserved characters. 2012-01-14 14:46:15 -08:00
John McLear
642b716553 Merge pull request #289 from jhollinger/no_spaces 
Sanitize pad names
 2012-01-08 07:30:07 -08:00
John McLear
86902c2c0b Merge pull request #291 from jhollinger/export_revisions 
Add ability to export specific pad revisions
 2012-01-08 07:06:13 -08:00
Azul
7dcc7be8e0 get the proper git revision even when not started from node dir 2012-01-05 11:44:08 +01:00
Azul
b1faa8e0f8 Make sure Minify.js finds its files 2012-01-05 11:44:07 +01:00
Azul
33ffda19b1 Load the settings even when not starting in node path 2012-01-05 11:44:07 +01:00
Jordan
7c84d8cc74 Bugfix to API calling indexOf on an undefined padID 2011-12-22 00:22:36 -05:00
Jordan
2a86d57e46 Add ability to export specific pad revisions 2011-12-18 00:18:35 -05:00
Jordan
e8ef99fb72 Sanitize pad names 2011-12-16 15:41:11 -05:00
Peter 'Pita' Martischka
609701961e Added some comments to help us documentating the code 2011-12-11 19:45:40 +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
Peter 'Pita' Martischka
6684d6ed52 replaced all stop callbacks with customError callbacks. Fixes #270 2011-12-10 16:46:47 +01:00
Peter 'Pita' Martischka
49006a3b6a Don't make the globalPads too global ;) 2011-12-08 23:32:51 +01:00
Adrian Lang
40c5e70aa7 Add DokuWiki export 2011-12-07 13:03:08 +01:00
Peter 'Pita' Martischka
18f90866ae fixed reconnect 2011-12-04 22:01:49 +01:00
Peter 'Pita' Martischka
7075fbebe6 fixed a bug in auto reconnect 2011-12-04 19:43:05 +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
bfbdac10d3 fixed #250 2011-12-04 17:09:31 +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
Peter 'Pita' Martischka
e44b41f4a3 Fixed the easysync test 2011-12-03 21:32:52 +01:00
Alexandre Girard
71fee11656 add the ability to set global password with http basic auth 2011-12-01 16:44:51 +01:00
Peter 'Pita' Martischka
f33af4700b Merge pull request #242 from jaseg/master 
Random filename generation fix, made a windows-only delay actually windows-only.
 2011-11-26 12:23:44 -08:00
Peter 'Pita' Martischka
3aacc0a1eb Merge pull request #222 from jhollinger/master 
API-only access, per issue #150
 2011-11-26 12:22:04 -08:00
Peter 'Pita' Martischka
932ad0eeeb This may fixes the pdf convert issue 2011-11-25 16:58:00 -08:00
Peter 'Pita' Martischka
7296913cb0 fixed merge confilicts 2011-11-25 16:56:08 -08:00
Peter 'Pita' Martischka
dc6d0cda68 Merge branch 'master' of github.com:Pita/etherpad-lite 2011-11-25 16:08:24 -08:00
Peter 'Pita' Martischka
fa098d73cd Do a reconnect on network problems. After 10s it gives up 2011-11-25 15:26:01 -08:00
Micah Anderson
97e9eb84af fix for #224 2011-11-25 13:39:33 -05:00
Lorenzo Gil Sanchez
943f8c4682 Stupid syntax error due to last minute refactoring 2011-11-22 16:09:27 +01:00
Lorenzo Gil Sanchez
e6de06b103 Transform multiline HTML into a single line stream to avoid spurious lines in the final result 2011-11-22 10:09:10 +01:00
Jordan
6297e628eb Permissions checks on pad and timeslider in server.js are redudant 2011-11-21 15:51:54 -05:00
Jordan
5e7c5d5dd3 Add editOnly option 2011-11-21 12:44:33 -05:00
Alexandre Girard
90e9d552f0 fix issue with newline in APIKEY.txt when checking api key 2011-11-21 16:39:54 +01:00
Jordan
9850ba43ee Implement a 'requireSession' mode, which requires any user to have a valid session 2011-11-21 01:45:37 -05:00
Peter 'Pita' Martischka
2e79bd50a3 fixed socket.io logging 2011-11-19 14:14:31 -08:00
Peter 'Pita' Martischka
2f16dff0ba Merge branch 'master' of https://github.com/jhollinger/etherpad-lite 2011-11-19 12:08:57 -08:00
Peter 'Pita' Martischka
54c8e46cdf Fixed Joes typo commit 2011-11-19 12:07:39 -08:00
Joe Corneli
0aa56136fe Fix message typos 2011-11-19 19:21:23 +00:00
Jordan
411984787a Implement POST requests for HTTP API 2011-11-18 21:52:12 -05:00
Lorenzo Gil Sanchez
a26918c69e Hook the ImportHtml module into the API 2011-11-17 10:26:32 +01:00
Lorenzo Gil Sanchez
9fe6c11d87 Main implementation of the setHTML API 2011-11-17 10:26:32 +01:00
Lorenzo Gil Sanchez
09cb367d8e The contentcollector code is harder to adapt since it has the Changeset module as a dependency 2011-11-17 10:26:32 +01:00
Peter 'Pita' Martischka
6d190f517e Merge pull request #184 from thomasf/issue158 
Kind of a hack but fixes issue #158
 2011-11-14 21:35:37 -08:00
Peter 'Pita' Martischka
9eac04aaa6 Fixed a huge problem with the sessioninfos array 2011-11-13 20:33:13 -08:00
Peter 'Pita' Martischka
a5a9592031 Revert "Fixing a bug that happens when a socket.io connection closes very early after a CLIENT_READY message" 
This reverts commit 0f559347ee.
 2011-11-13 20:25:22 -08:00
Peter 'Pita' Martischka
820326dc2b Output more informations on message dropped 2011-11-12 16:47:01 -08:00
Peter 'Pita' Martischka
17666339d0 Merge pull request #191 from Yaco-Sistemas/master 
Get the HTML of a Pad via the API
 2011-11-12 15:04:53 -08:00
jaseg
b0976a292f Fixed a somewhat quirky random string generator, made another windows-only delay actually windows-only. 2011-11-10 11:39:46 +01:00
jaseg
4fc4a35381 Spelling fixes in log messages, made a delay windows-only which according to a comment should be windows-only, fixed a random filename generator. 2011-11-09 17:19:59 +01:00
Peter 'Pita' Martischka
f6165eb2ea Fixed another bug that breaked the abiword parser 2011-11-05 19:34:01 +01:00
Peter 'Pita' Martischka
90ba811bb5 Fixed a bug that creates invalid HTML at Export that lets Abiwords parser crash 2011-11-04 03:15:26 +01:00
Thomas Frössman
73711abd97 Added comments 2011-11-03 07:34:51 +01:00
Lorenzo Gil
e4481ea22b Allow to get the HTML of the pad with the API 2011-10-31 11:19:51 +01:00
Peter 'Pita' Martischka
0f559347ee Fixing a bug that happens when a socket.io connection closes very early after a CLIENT_READY message 2011-10-19 21:48:36 +02:00
Peter 'Pita' Martischka
e0cf6098fb fixing issues with bad import uploads, fixed #186 2011-10-19 21:46:28 +02: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
Rob Speer
2d3272e3b6 make globalPads into an ad-hoc Object that can store values with arbitrary names. Fixes issue #160. 2011-09-30 00:41:46 -04: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
e771542961 added deleteGroup API function 2011-08-22 13:11:34 +01:00
Peter 'Pita' Martischka
177abdd29e Don't show PDF Export on Windows 2011-08-21 20:09:25 +01: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
307d0acdeb put expolorer canvas into minify 2011-08-21 19:20:18 +01:00
Peter 'Pita' Martischka
4d7c8a2c7d added ability to set a custom favicon 2011-08-20 19:27:41 +01:00
Peter 'Pita' Martischka
fdeb2a45e7 Ops, forgot to replace two throws 2011-08-20 18:56:38 +01:00
Peter 'Pita' Martischka
b9f23fa208 handle bad changesets 2011-08-20 18:51:43 +01:00
Peter 'Pita' Martischka
42662d73d0 Merge branch 'master' of /home/jose/etherpad-lite/ 2011-08-20 18:23:58 +01:00
Peter 'Pita' Martischka
9d37d91ce1 added a colorPicker 2011-08-20 18:22:10 +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
82dd4802d7 fixed a API Bug 2011-08-19 21:35:31 +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
4554c32e64 show the last 100 chat messages, instead of the last 20 2011-08-17 20:04:28 +01:00
Peter 'Pita' Martischka
a47ada46d7 forgot to change the default settings in Settings.js 2011-08-17 19:26:56 +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