libre-service.eu/pad.libre-service.eu-etherpad
libre-service.eu/pad.libre-service.eu-etherpad
1
0
Fork 0
mirror of https://github.com/ether/etherpad-lite.git synced 2025-01-23 15:50:54 +01:00
Code Issues Projects Releases Wiki Activity
5436 commits 206 branches 105 tags 124 MiB
Commit graph

1136 commits

Author SHA1 Message Date
Simon Gaeremynck
2bfc3026d2 Allow LibreOffice to be used when exporting a pad 
This commit adds support for LibreOffice when exporting a pad to doc, pdf, ..

This commit also cleans up some export logic when exporting to txt
 2015-10-20 19:46:08 +01:00
Ted Mielczarek
a675659dc2 Add an appendText API 2015-10-19 15:27:09 -04:00
Stefan
504cc102a0 Merge pull request #2762 from storytouch/exportTagsAsArrays 
Accepting Arrays on 'exportHtmlAdditionalTags'
 2015-10-17 18:24:18 +02:00
Luiza Pagliari
5deb06d589 Create setting to control if a new line will be indented or not 
Currently pressing ENTER on a line that ends with ':', '[', '(' or '{'
automaticaly indents the new line with 4 spaces. The variable added by
this commit to settings.json allow an Etherpad instance to not have this
behavior.
 2015-10-13 18:39:23 -03:00
Stefan
9d29b15def Merge pull request #2730 from emilyxxie/clientready_hook 
added clientReady hook
 2015-10-10 13:30:36 +02:00
Stefan
22bf9c9297 Merge pull request #2799 from Gared/fix_url_location_error 
Fix decode error if pad name contains special characters and is sanitized
 2015-10-10 13:21:40 +02:00
webzwo0i
1ee1f818db if granularity is negative, endNum is negative and loop 2015-10-09 14:55:59 +02:00
webzwo0i
31f7c7e0f2 check if ChangesetRequest granularity is a number (#2796) 2015-10-09 14:55:19 +02:00
Stefan
f6cebdad98 Fix decode error if pad name contains special characters and is sanitized 2015-10-08 20:46:15 +02:00
Robin Schneider
29441a8ae1
Get git commit hash even if the repo only points to a bare repo. 
* Used by https://github.com/debops/ansible-etherpad
 2015-10-07 15:43:29 +02:00
Andreas Fried
e6b0e954b5 Fix off-by-one: The chatHead is in fact a valid message index. 
This fixes #2751.
 2015-09-30 00:48:15 +02:00
Luiza Pagliari
1d134f0b13 Fixing ed52626. It was closing the span with </span data-TAG=VALUE>, not </span> 2015-09-17 15:30:09 -03:00
Luiza Pagliari
ed5262650a Generating pad HTML with tags like <span data-TAG="VALUE"> instead of <TAG:VALUE> 2015-09-07 03:55:56 -07:00
Stefan
cc9f88e7ed Merge pull request #2757 from Gared/doc_append_chat_message 
Add appendChatMessage API to docs
 2015-08-30 18:15:51 +02:00
Luiza Pagliari
1a5985dc75 Accepting Arrays on 'exportHtmlAdditionalTags' to handle attributes stored as ['key', 'value'] (and not only ['key', 'true']) 2015-08-24 07:58:45 -07:00
Stefan
f27aacc5bf Fix missing bracket 2015-08-15 22:41:59 +02:00
Stefan
94cb743ca8 Fix API call appendChatMessage to send new message to all connected clients 2015-08-15 22:05:31 +02:00
Thomas Russell Murphy
b557927b72 Fix link to etherpad-lite on GitHub 2015-08-03 21:53:54 -05:00
Emily Xie
21f0d12d31 clientReady hook- pass entire message, updated doc 2015-07-20 11:45:41 -04:00
Xavid
ad137fa4c8 Restore newline-adding to setText() if passed string does not end in '\n'. 
Add a test for the ending-in-'\n' case and update tests for the other case.
 2015-06-30 04:47:55 -04:00
Clark Boylan
1060595676 Check for valid session in handleUserInfoUpdate 
Address issue 2674 by checking that the session is valid and has a valid
author and padId before using it to update the userInfo for that
session. Otherwise it is possible that by the time we try to update a
session with new userInfo that session has disconnected and is no longer
available to be updated. Without this commit the etherpad-lite service
gracefully shutsdown whenever this happens.
 2015-06-24 15:18:35 -07:00
Xavid
a4fe0d0dc8 Add an 'author' entry to the context for the padCreate and padUpdate hooks. 2015-06-21 11:29:17 -04:00
Xavid
0713553906 Allow a pad to only end with a single newline, rather than requiring two. 2015-06-19 14:02:18 -04:00
Stéphane Alnet
0b3216ecb6 Do not extend Array.prototype 2015-05-22 12:27:08 +02:00
John McLear
757ad765d3 use removeItem instead of remove namespace 2015-05-22 11:09:21 +01:00
John McLear
3944a0e79b more read only mode fixes andadd support for handleMessageSecurity hook 2015-05-20 01:05:53 +01:00
John McLear
818408cf49 other bits required for read only 2015-05-19 16:57:53 +01:00
John McLear
41d24a8c8f Merge branch 'develop' of github.com:ether/etherpad-lite into develop 2015-05-19 16:44:57 +01:00
John McLear
b662d5c618 dont show editing buttons in R/O view 2015-05-19 16:43:19 +01:00
Simon Gaeremynck
7fe99cccad Using log4js in TidyHtml 2015-05-18 17:43:46 +01:00
Simon Gaeremynck
786b43efc8 Tidy HTML before trying to convert it with abiword 2015-05-18 16:24:41 +01:00
John McLear
9e9207d8b6 Merge pull request #2657 from simong/cookie-parser 
Use the cookie parser middleware
 2015-05-11 15:10:45 +01:00
Simon Gaeremynck
5a7750781b Use the cookie parser middleware 2015-05-07 18:35:21 +01:00
Xavid
9e86fb279b Fix backend tests with new setText() implementation; tests depended 
on the old setText() behavior leaving the last character.
 2015-05-06 08:45:22 -04:00
Xavid
5e64c292a4 When using setText(), replace the entire existing text of the pad, 
rather than replacing all except the last letter.
 2015-05-05 14:18:27 -04:00
John McLear
4938c7be38 plugins always return html so use that endpoint 2015-04-29 20:54:41 +01:00
John McLear
1f471b0f81 show versions of plugins at startup, fixes #2642 2015-04-28 23:41:55 +01:00
John McLear
254edffa9c fixes #2547 2015-04-24 14:17:49 +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
Tom Hunkapiller
6ff7d4e9a6 revert to old path handling, but strip out "..". fixes #2614 2015-04-15 14:31:21 -05:00
louis
0fa7650df8 dont allow directory traversal #2 2015-04-12 17:12:35 +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
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
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
acc1a0626a use latest ejs 2015-04-11 09:53:27 +01: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
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
a5345524e1 Merge pull request #2566 from ether/editbar-accessibility 
Accessibility
 2015-04-07 21:25:27 +01:00
John McLear
3a969f8dd8 pass error messages to pad text if shown during startup 2015-04-06 00:13:38 +01:00
John McLear
e027083136 timeslider settings for fonts 2015-04-05 15:18:36 +01:00
John McLear
ee5833b9c6 Merge branch 'develop' of github.com:ether/etherpad-lite into editbar-accessibility 2015-04-02 00:05:25 +01:00
John McLear
27ae48686d reintroduce removed api points that were removed by mistake 2015-04-01 13:56:52 +01:00
John McLear
32a09ff461 tests and fix up sloppy code by original author 2015-04-01 13:52:56 +01:00
John McLear
c705a058fb Merge branch 'feature/append-chat-api' of github.com:derosm2/etherpad-lite into append-chat-api 2015-04-01 13:32:07 +01:00
John McLear
fef746e80e fix import issue with txt files and abiword #2572 2015-04-01 00:19:42 +01:00
John McLear
0b90da19d2 Merge branch 'develop' of github.com:ether/etherpad-lite into editbar-accessibility 2015-03-31 23:32:15 +01:00
John McLear
b404af7c17 Merge pull request #2530 from webzwo0i/exception-handling-for-mimatched-composition 
do not crash when encountering mismatched compositions. log the changese...
 2015-03-31 23:17:51 +01:00
John McLear
e47992f5b7 Merge pull request #2538 from webzwo0i/check-author-attribution 
Check author attribution and fix clearAuthorship test
 2015-03-31 23:14:22 +01:00
John McLear
662216b6cf slightly different alt stuff 2015-03-31 16:36:44 +01:00
John McLear
ef38bcad9f make buttons i18n friendly and a better experience 2015-03-31 13:57:18 +01:00
John McLear
7b726cbc02 more working logic and also pretty nice screen reader experience 2015-03-26 13:58:57 +00:00
John McLear
ec1956b4b6 read for button activity 2015-03-26 12:42:07 +00:00
John McLear
5761e998de first semi working alt f9 functionality 2015-03-25 11:03:45 +00:00
webzwo0i
a0fb65205c oops, fix export with wildcards 2015-03-14 00:02:23 +01:00
webzwo0i
f249b42ab4 empty author should be allowed to support clearAuthorship functionality 2015-03-03 16:39:14 +01:00
webzwo0i
0693c0ae97 - operator do not show up in the attribs of a pad, but authors could still leak to the pool 2015-03-03 15:37:56 +01:00
webzwo0i
01cd82427a check author in = operator 2015-03-03 15:20:33 +01:00
webzwo0i
0f82cd8711 print revision numbers - not changesets - in warn-log 2015-03-02 11:14:24 +01:00
webzwo0i
683c9dfb7c callback with argument error in async.series instead 2015-03-02 11:05:33 +01:00
John McLear
152f51aeab Merge pull request #2527 from ldidry/issue-1870-get-saved-revisions-count 
Fixes #1870
 2015-02-27 12:03:03 +00:00
webzwo0i
7719117e1e do not crash when encountering mismatched compositions. log the changesets and padid 2015-02-26 14:57:49 +01:00
John McLear
178309e10d Merge branch 'develop' of github.com:ether/etherpad-lite into develop 2015-02-26 12:13:41 +00:00
Luc Didry
92022e493e Add backend tests for new API functions 
These new functions are:
* getSavedRevisionsCount
* listSavedRevisions
* saveRevision

+ typo fixing in backend tests
 2015-02-25 01:05:58 +01:00
Luc Didry
845788c39d Add a saveRevision API function 
Calling saveRevision create an author which name is "API"
 2015-02-25 01:04:27 +01:00
Luc Didry
a08c50a77d Fixes #1870 
Add two functions to API :
 * getSavedRevisionsCount
 * listSavedRevisions
 2015-02-24 23:42:35 +01:00
John McLear
470b0ba2a6 Merge pull request #2520 from ether/load-testing-settings 
allow for load testing connections to hit by a setting
 2015-02-22 14:41:09 +00:00
John McLear
d5bec1701e fix export of bad pads and also limit import to files 2015-02-21 12:33:30 +00:00
John McLear
ec6a2b5ba9 allow for load testing connections to hit by a setting 2015-02-16 23:02:19 +00:00
webzwo0i
37924e441a add try-catch clause around calls to applyToAText 2015-02-16 09:01:30 +01:00
webzwo0i
59328aa33a Revert "51c14d994756e60333b0b60eccb7255cf0c86461 changed the return value of" 
This reverts commit 66582b19e7.
 2015-02-16 06:22:49 +01:00
webzwo0i
66582b19e7 51c14d9947 changed the return value of 
applyToText to an array that includes if there was an error in the
newline part of an changeset op.
easysync_tests need to know this too
 2015-02-15 16:21:07 +01:00
John McLear
ddc69831b2 working, need to test though 2015-02-11 17:59:05 +00:00
Mike DeRosa
4c6bd37286 Adding api call for appending a chat message. 2015-02-09 00:18:12 -05:00
John McLear
b9802616b6 use latest cleanCSS 2015-02-04 17:57:34 +00:00
Stefan
4c64b7a670 Revert 'asyncLineHTMLForExport' hook 2015-01-25 22:08:40 +01:00
John McLear
aca745ddf6 tell installer if old etherpad needs updating during plugin install 2015-01-25 02:44:10 +00:00
John McLear
831151cfba Merge pull request #2487 from ether/html-e-hook 
Better HTML Export rewrite hook allows functions to be passed instead of strings means state is saved between plugins
 2015-01-25 00:07:34 +00:00
John McLear
c798a27ad8 boop 2015-01-24 13:39:45 +00:00
webzwo0i
6b0cf29af6 Stop processing a message without auth (i.e. a client did not send 
CLIENT_READY)
 2015-01-24 06:34:41 +01:00
John McLear
1890ba3976 working, might need polish its pretty late 2015-01-24 05:14:38 +00:00
John McLear
9abb85799c realization how aCallAll works 2015-01-24 04:31:50 +00:00
John McLear
372063295f beginning of a hook, needs docs etc 2015-01-24 04:09:13 +00:00
John McLear
6fd0285d4d include lineContent in hok 2015-01-21 21:36:11 +00:00
John McLear
cb65224997 better logic for author handling 2015-01-21 00:28:00 +00:00
John McLear
5f9bbd0666 restrict expor4t to only expose this pad ID 2015-01-21 00:03:39 +00:00
John McLear
4f637befeb more fixing 2015-01-19 02:59:17 +00:00
John McLear
85fffbe14c more handling 2015-01-19 02:57:10 +00:00
John McLear
cadb83ac5a bumpage 2015-01-19 02:51:32 +00:00
John McLear
6bc74a9adb more export logic handling 2015-01-18 23:33:29 +00:00
John McLear
e50ea6ffea whoops proper regexp fix for listNumber 2015-01-18 23:24:20 +00:00
John McLear
bd9ff770fe reset all numbers on first item 2015-01-18 23:21:34 +00:00
John McLear
af70902bef support deeper nested elements on exports 2015-01-18 23:16:58 +00:00
John McLear
689ced8443 and this one.. 2015-01-18 20:15:17 +00:00
John McLear
a553b44dbc refix plugins 2015-01-11 23:59:18 +00:00
Timothy Gu
9b9a747167 Support ejs 2.0 
Fixes #2437.

This is still relying on undocumented behavior, but should unbreak the app
in the mean time.
 2015-01-11 08:17:17 -08:00
John McLear
17ce67d936 final html export hook 2015-01-06 16:31:52 +00:00
John McLear
26c839063f check file system that abiword exists 2015-01-04 14:47:08 +00:00
John McLear
036b7d2890 Merge pull request #2418 from ether/etherpad-export-and-import 
Full Pad portability (Export/Import)
 2014-12-31 13:32:09 +00:00
John McLear
4b6df17e99 Merge pull request #2421 from webzwo0i/fix-swagger 
hack to avoid warnings in swagger usage
 2014-12-31 13:27:00 +00:00
John McLear
01c667aa2e export html more styles 2014-12-31 00:53:20 +00:00
webzwo0i
b0da214ad5 hack to avoid warnings in swagger usage 2014-12-30 18:06:41 +01:00
Stefan
c20a7e9bce Merge pull request #2406 from Gared/fix/author-not-set-callback 
Fix missing callback of #2400 and ignore missing author on timeslider on client-side
 2014-12-30 14:55:49 +01:00
John McLear
90e83ed6b5 more styling 2014-12-30 14:53:44 +01:00
John McLear
716b1c6113 Merge branch 'develop' of github.com:ether/etherpad-lite into develop 2014-12-30 14:44:55 +01:00
John McLear
16713d8b3b some demo export loic for handling OL incrementation 2014-12-30 14:43:00 +01:00
John McLear
4687d226c6 Merge pull request #2417 from webzwo0i/fix-export 
Fix ExportHtml.js list parsing code
 2014-12-30 13:47:31 +01:00
John McLear
a07d1722fc no errors on chrome client 2014-12-30 12:12:24 +01:00
John McLear
5ba3cab445 better take some responsibility 2014-12-30 00:13:01 +01:00
John McLear
ac4f9eb4ce licensing 2014-12-30 00:12:26 +01:00
John McLear
99a239fa9a remove console log 2014-12-30 00:10:08 +01:00
John McLear
0676d2fe24 working author import 2014-12-30 00:01:15 +01:00
John McLear
b8648b4a49 remove error logging 2014-12-29 23:08:42 +01:00
John McLear
1e0de620be more author logic 2014-12-29 23:08:17 +01:00
John McLear
ec2b844f94 authors 2014-12-29 22:51:31 +01:00
John McLear
a6400b3f61 allow only for pads less than 10 to be overwritten 2014-12-29 22:02:24 +01:00
John McLear
ab5e7381a2 working for all files 2014-12-29 21:35:10 +01:00
John McLear
1081156f13 whoopsi, required files 2014-12-29 21:13:49 +01:00
John McLear
3773b6346b semi working requires browser refresh 2014-12-29 20:57:58 +01:00
webzwo0i
6e4e034e42 fix closing of lists 2014-12-29 16:27:40 +01:00
John McLear
302ceb665b delay write to fix copypad -- bad practice but due to db.set not allowing callback 2014-12-29 14:59:22 +01:00
John McLear
3fe802077c Merge pull request #2091 from webzwo0i/disconnect-if-an-old-cs-is-submitted-twice 
disconnect client if it submits an already accepted changeset based on a...
 2014-12-29 02:01:03 +01:00
John McLear
c4959b089f resolve merge conflict 2014-12-29 01:54:44 +01:00
John McLear
8603fb4583 fix sockets of switch to pad 2014-12-29 00:46:47 +01:00
John McLear
6b1fee400d Merge branch 'switch-to-pad' of github.com:derosm2/etherpad-lite into localTest 2014-12-29 00:40:07 +01:00
webzwo0i
6ca2c91fdf close and open lists according to the actual line.listLevel 2014-12-28 02:32:53 +01:00
webzwo0i
d71b11f4b2 fix export of lists with bullets; <li> are closed before the next list starts. also, when closing, ensure that list-items are not nested 2014-12-28 02:31:26 +01:00
John McLear
dd09f6144b Merge pull request #2398 from ether/indentLevels 
Indent levels
 2014-12-27 23:27:11 +01:00
Gared
9cf19b99fe Fix missing callback of #2400 and ignore missing author on timeslider on client-side 2014-12-27 22:25:24 +01:00
John McLear
7df944b3fd Merge pull request #2404 from webzwo0i/sanity-in-atext 
block changeset if it deletes more lines than exist in the whole pad
 2014-12-27 18:36:13 +01:00
Stefan
a645aeef5c Merge pull request #2400 from Gared/fix/author-not-set 
Prevent server crash if author is not set
 2014-12-27 16:15:26 +01:00
Gared
40c7ee9df9 Prevent server crash if author is not set 2014-12-27 14:26:05 +01:00
John McLear
ae22332f71 removing dokuwiki 2014-12-27 14:08:45 +01:00
John McLear
6ac99ab03f support for export 2014-12-27 13:27:07 +01:00
John McLear
fdc930de3d Merge branch 'develop' of github.com:ether/etherpad-lite into hook_for_exportHTMLStyles 2014-12-21 23:43:21 +00:00
John McLear
ee3f3b8060 move clean css back to fix minification on TS 2014-12-21 23:42:56 +00:00
John McLear
12aac2d0d0 Merge branch 'develop' of github.com:ether/etherpad-lite into hook_for_exportHTMLStyles 2014-12-21 23:12:59 +00:00
webzwo0i
69bad8b30c fix typo in addSavedRevisions 2014-12-17 01:10:20 +01:00
webzwo0i
b204aa2085 remove more dead requires. 2014-12-16 19:10:01 +01:00
John McLear
cfa3f15f94 Merge pull request #2373 from webzwo0i/avoid-global-vairables 
dont make local variables global
 2014-12-16 00:41:41 +00:00
webzwo0i
5d15f655f0 dont make local variables global 2014-12-14 22:01:28 +01:00
John McLear
197a41627d allow plugins to add multiple styles 2014-12-09 17:34:52 +00:00
John McLear
3a2669b704 additional tag support hook 2014-12-09 16:13:52 +00:00
John McLear
f2c155ee1a blah use async 2014-12-08 19:44:40 +00:00
John McLear
7cf0e4a9ae allow padId to be passed into the hook 2014-12-08 19:11:45 +00:00
John McLear
2218cbd252 docs 2014-12-08 19:08:12 +00:00
webzwo0i
5306f0c98a wrap appendRevision in try-catch block 2014-12-04 16:05:02 +01:00
John McLear
6fea3a25f8 stop death on no session 2014-11-30 21:21:58 +00:00
John McLear
12f25d8a45 bump cleancss 2014-11-29 01:31:04 +00:00
John McLear
3bf9f3cf1d Merge branch 'develop' of github.com:ether/etherpad-lite into require-kernel-change 2014-11-28 17:43:01 +00:00
John McLear
c13301966f yeah need htis too 2014-11-27 02:56:42 +00:00
John McLear
16f3ebb3ba handle auth fails 2014-11-26 17:34:44 +00:00
John McLear
0a84379364 make additional line break at end of imported doc 2014-11-26 15:19:22 +00:00
John McLear
8851b8ab6b Merge branch 'develop' of github.com:ether/etherpad-lite into jsdom-go-away 2014-11-25 22:48:09 +00:00
John McLear
881763f663 remove jsdom dep 2014-11-25 22:15:29 +00:00
John McLear
77de2d918b multiline 2014-11-25 22:14:48 +00:00
luto
5c3874c0a1 really recreate socketio-client in expressCreateServer, fixes #2342 
When using plugins, the express server gets restarted. When we do that,
the socketio-server should also get restarted. It doesn't. That means
that all the events in SocketIORouter.js are bound twice, which causes
chaos all over etherpad.

This changes our socketio.js so it fully recreates the io-instance when
we restart the server.

introduced in 95e7b0f156, but catching
that would have been hard.
 2014-11-25 22:38:22 +01:00
John McLear
2a062f8dc3 mheh no browser requirement at all 2014-11-25 18:18:42 +00:00
John McLear
c2c0cb6907 so yeah, prolly can do this anyway? 2014-11-25 18:07:34 +00:00
John McLear
60d44cd3df use cheerio instead of jsdom 2014-11-25 17:26:09 +00:00
John McLear
a3f6b2edb7 more fixes 2014-11-23 22:33:56 +00:00
John McLear
555d22245d Merge pull request #2335 from ether/javascript-bower 
swap out jquery browser for bower but expose browser object to all pages...
 2014-11-23 14:15:41 +00:00
John McLear
73bcbbcb89 final commit 2014-11-23 14:15:03 +00:00
John McLear
0eb7cc7864 Merge branch 'develop' of github.com:ether/etherpad-lite into fix-socket-admin-etc 2014-11-23 14:14:11 +00:00
John McLear
ae7da122d7 fix session management 2014-11-23 14:14:01 +00:00
John McLear
9b66c93d6b swap out jquery browser for bower but expose browser object to all pages also enable minification.. Seems to work well 2014-11-22 19:11:35 +00:00
John McLear
764b8af5e3 Merge pull request #2334 from luto/api-mystery-crash 
fix api mystery crash
 2014-11-22 15:50:23 +00:00
luto
4eee89ad12 fix api mystery crash 2014-11-22 16:46:37 +01:00
John McLear
703440acd7 missing socketio fix 2014-11-21 00:11:50 +00:00
John McLear
3e8f3cd938 hrm I dont trust this security 2014-11-18 14:56:40 +00:00
John McLear
ff603d7b58 stability restored now to handle the auth issues 2014-11-18 14:12:02 +00:00
John McLear
020b636b1f template of a semi-fix 2014-11-18 14:08:44 +00:00
John McLear
865829e159 Merge pull request #1682 from luto/fix-listSessionsOfGroup 
Don't error in listSessionsOfGroup when there are non-existing sessions
 2014-11-15 16:25:23 +00:00
John McLear
3bf108f3b4 Merge pull request #2203 from ether/setting-to-not-import-unknown-file-types 
Allow for a setting so you can stop unknown file types from being imported
 2014-11-15 15:41:08 +00:00
John McLear
cce2d7279a resolve merge issues 2014-11-15 15:34:18 +00:00
Cristo
0253156dbb Update APIHandler.js 2014-11-12 19:55:37 +01:00
Cristo
f7dd756642 Update API.js 2014-11-12 19:53:56 +01:00
Cristo
f59238fe58 Update API.js 2014-11-12 19:50:43 +01:00
Cristo
24ac082cae Update API.js 2014-11-12 19:49:08 +01:00
Cristo
9d39c9591a update pad clients 2014-11-12 19:46:50 +01:00
Stefan
573a912e4f Add check for special url characters to createPad API function 2014-11-08 17:26:40 +01:00
Cristo
46bc328896 new api ver 2014-11-08 01:41:23 +01:00
Cristo
c33c6e085e comment addded 2014-11-08 01:39:27 +01:00
Cristo
d246a191c6 Added option to restore revisions #1791 2014-11-08 01:12:40 +01:00
John McLear
053ff3097d whoops I missed this one 2014-11-04 23:29:45 +00:00
John McLear
9fa77cdea2 working handling of setting client ip and anonymizing etc 2014-11-04 23:25:18 +00:00
John McLear
f418dfa205 fix author notification handler 2014-11-04 22:37:10 +00:00
John McLear
af3e8e5e15 fix room client leave 2014-11-04 22:34:43 +00:00
John McLear
8391f902fb re-apply roomsize 2014-11-04 22:31:09 +00:00
John McLear
a6cbb4af40 working messages 2014-11-04 19:58:38 +00:00
John McLear
68eaa09708 Begin to repair damage done to rooms logic 2014-11-04 19:55:05 +00:00
John McLear
95e7b0f156 transports 2014-11-04 19:11:06 +00:00
John McLear
cb28d10963 move logging into debug environment variable .. sighs 2014-11-04 18:32:26 +00:00
John McLear
5d0ccb5f8f auth fix 2014-11-04 18:17:39 +00:00
John McLear
adef0af227 more stuff required to stop it crashing, now we have identified what needs fixing we can fix it 2014-11-04 18:01:41 +00:00
John McLear
1e53c4f5f0 identify which parts are causing issues and comment them out, obviously this needs fixing 2014-11-04 17:57:18 +00:00
John McLear
2c801cc558 no errors but no connections 2014-11-01 22:36:19 +00:00
John McLear
a67e805da0 basics, still not working 2014-11-01 21:25:49 +00:00
John McLear
124ae31137 blah push back for imports 2014-11-01 21:15:31 +00:00
John McLear
ff549db261 use latest jsdom 2014-11-01 20:58:56 +00:00
Prateek Saxena
437b2bfc64 Move title attribute of buttons from <span> to <a> 
The `.toolbar ul li a` that holds the `span.button` has a
padding of `4px 5px`. This means if the mouse is on the edge
of the button the `:hover` state is active but the relevant
tooltip does not show up. Moving the `title` attribute to
the `<a>` itself solves this problem.

Also removed some extra whitespace.
 2014-10-11 20:22:31 +05:30
Olivier Tétard
bfde869948 If exportFileName hook isn’t defined don’t return empty filename. 
This commit should fix #2251.

If ``exportFileName`` hook is not defined, ``hookFileName`` should be an empty array. Test the length of ``hookFileName`` before overriding ``fileName``, the export filename.
 2014-09-28 14:53:07 +02:00
John McLear
4b7562de58 Merge pull request #2184 from qknight/patch-1 
added /abs/path/settings.json handling
 2014-08-23 21:24:46 +01:00
Simon Gaeremynck
2f8b860e69 Added a userLeave hook that gets called when a user leaves a pad 2014-08-08 15:49:15 +01:00
Joachim Schiele
63b89b693d Update Settings.js 
added brackets to match etherpad lite devs' coding style
 2014-07-24 12:06:52 +02:00
John McLear
17f26b8c2c Support to allow for a setting so you can stop unknown file types from being imported 2014-07-22 15:46:31 +01:00
Mike DeRosa
25f6c9bf9a Checking if the author for the sessions match instead of comparing the entire session. 2014-07-12 16:40:59 -04:00
Mike DeRosa
7861cae763 Cleaning up switchToPad functionality so that we only need one call to the server("SWITCH_TO_PAD") instead of two (cleaning session info and client ready). 
Also Clearing chat messages when switchToPad is called in pad.js instead of having the server tell the client to clear the chat messages.
 2014-07-12 16:27:00 -04:00
Marcel Klehr
9d1eca42b3 Merge pull request #2174 from ether/fix/copy-pad-update-lists 
Fix #2136: update cache and group list when copying pads
 2014-07-08 19:07:35 +00:00
Marcel Klehr
3cafd689af Fix Pad#copy routine for updating group list 2014-07-07 21:14:00 +02:00
Joachim Schiele
e17044d60e added /abs/path/settings.json handling 
before this path, one could only supply a relative path like:
 --settings ../relative/path/settings.js
now one can also use it with absolute paths like:
 --settings /abs/path/settings.json
 2014-06-22 20:56:21 +02:00
Marcel Klehr
b1b972a2b4 Merge pull request #1787 from goldquest/dev_nopass_whensession 
Grant access for valid session to password protected group pads

so, if user has valid session, they don't need the password
 2014-06-17 14:01:16 +02:00
John McLear
c627608ea5 Merge pull request #1619 from ether/stricter-transport 
Enable HSTS on TLS connections
 2014-06-17 12:58:47 +01:00
Marcel Klehr
897f5189b0 Enable HSTS for TLS connections 
Don't use X-Frame-Options: deny for now
 2014-06-17 13:21:38 +02:00
John McLear
44cb676ba2 Merge pull request #2150 from ether/export-file-name-hook 
Server side hook to modify the export file name
 2014-06-16 16:47:15 +01:00
Mike DeRosa
4ccd7131d3 Added function to switch to a different pad without having to reload the whole page. 2014-06-14 14:25:56 -04:00
Marcel Klehr
c4f9828825 Fix #2136: update cache and group list when copying pads 2014-06-11 22:23:43 +02:00
Marcel Klehr
cd294c608b Merge pull request #2149 from ether/dont-use-abiword-for-html 
abiword shouldnt be used for HTML native documents
 2014-06-11 14:47:33 +02:00
Stephan Jauernick
fc3ce3429e Corrected the API Version number. 2014-06-01 21:21:08 +02:00
Stephan Jauernick
412bdd1857 Renamed the variable to prevent possible problems. 2014-06-01 21:19:15 +02:00
Stephan Jauernick
d42a9eb3a6 Enhanced the Example for the API Method getPadID and make the return value consistent to other functions 2014-05-31 11:53:44 +02:00
Stephan Jauernick
fffdde0c59 Implemented the the new API method getPadID for reversing the Readonly ID. Based on: ff88c19fc1 2014-05-31 00:43:31 +02:00
Stephan Jauernick
493636ec36 Added a new API method getPadID for reversing the Readonly ID and introduced the API level 1.4.1. Based on: 97402f60b8 2014-05-31 00:39:36 +02:00
Marcel Klehr
19be8763c9 Fix race condition 2014-05-15 12:47:28 +00:00
John McLear
c63cb812e8 Update ExportHandler.js 2014-05-15 10:53:37 +01:00
John McLear
44b1ac2b16 Merge pull request #1984 from ldidry/fix/getRevisionChangeset-crash 
Fix getRevisionChangeset API call making etherpad crash
 2014-05-14 14:10:44 +01:00
John McLear
a82823ede2 use full string not first char 2014-05-12 15:15:10 +01:00
John McLear
d09e66e271 use call first and update docs 2014-05-12 15:08:32 +01:00
John McLear
b74c43889e Update ImportHandler.js 2014-05-09 13:50:00 +01:00
John McLear
ec6dc4fa0e make async, please check 2014-05-07 16:27:41 +01:00
John McLear
69ba3cc104 remove eplite add etherpad 2014-05-07 15:17:14 +01:00
John McLear
1f7fcd54f1 working logic for allowing a server side hook to modify the export file name but NOT the extension 2014-05-06 21:13:22 +01:00
John McLear
6d38b05623 abiword shouldnt be used for HTML native documents 2014-05-06 17:32:45 +01:00
Marcel Klehr
6054cda473 Create a customizable timeslider toolbar 2014-03-30 13:02:41 +02:00
John McLear
56fd078469 Merge pull request #2092 from webzwo0i/fix-crash-with-queued-messages 
Fix crash with queued messages
 2014-03-26 19:39:19 +00:00
Marcel Klehr
f6f319960d Fix REQ_CS rev boundary check 
fixes #2096
 2014-03-20 21:34:01 +01:00
John McLear
e1fa43e640 quick formatting clean up 2014-03-17 19:20:32 +00:00
Marcel Klehr
da5970dda3 Refactor toolbar.js to use consistent naming 2014-03-16 15:14:21 +01:00
Marcel Klehr
a369347d86 Merge branch 'pr/1579' into toolbar-test 
Conflicts:
	settings.json.template
	src/static/js/pad_editbar.js
 2014-03-16 13:30:22 +01:00
goldquest
a00c505403 Sometimes, the author2session / group2session don't exist anymore, but the session does. 
It should be possible to delete a session, if they don't exist
 2014-03-14 17:50:37 +01:00
webzwo0i
8245e65d3f disconnect client if it submits an already accepted changeset based on an old revision 2014-02-20 18:13:30 +01:00
webzwo0i
fa681d43f7 remember user session because it can be gone when finalHandler is called 2014-02-20 17:38:25 +01:00
webzwo0i
c8c2866087 fix crash if disconnect happens for sessions that have messages queued 2014-02-20 16:33:42 +01:00
Simon Gaeremynck
cfdd57b487 Addressed a potential never finishing forEach in PadMessageHandler.padUsers 
If the session info for a client would be null or undefined, the forEach
callback would never get called which means the padUsers callback would
never get trigged. This could potentially block API request as this function
is exposed at an HTTP API endpoint.
 2014-02-19 10:48:15 +00:00
webzwo0i
a43123880a fix randomstring 2014-01-24 01:19:14 +01:00
Robert Helmer
348d9a838f convert over to server-side crypto 2014-01-15 11:44:57 -08:00
Robert Helmer
ae99c5ea6f new randomString function should take len arg 2014-01-15 11:44:41 -08:00
Robert Helmer
9ef709e7f7 mozilla bug 844796 - use node crypto module for randomString 2014-01-15 10:58:50 -08:00
Marcel Klehr
adf05576b2 Don't crash if CHANGESET_REQ fails 2013-12-17 16:20:57 +01:00
s1341
5add63165d Fix server side bug index overflow 
The server wasn't properly checking that the changesets it needed to
return for changeset_requests actually existed.
 2013-12-17 15:37:35 +02:00
John McLear
7d47d91a08 Merge pull request #1514 from ether/dont-die-on-bad-html 
dont die on bad html but only warn to api logger but dont tell client th...
 2013-12-16 03:08:42 -08:00
Lennart Brinkmann
dd8af99e2e Add input validation for html param in setHTML() 2013-12-14 21:14:56 +01:00
John McLear
58cd71dcce Merge branch 'fix-exporthtml-styling-tags' of https://github.com/webzwo0i/etherpad-lite into develop 2013-12-10 19:25:36 +00:00
John McLear
58bbfd8a65 resolve merge conflict 2013-12-09 21:55:04 +00:00
John McLear
24e96c4f8b Merge pull request #2028 from webzwo0i/remove-deadcode 
Remove deadcode
 2013-12-09 10:49:57 -08:00
John McLear
438f3fc717 Merge pull request #2030 from ether/import_hook 
Working import hooks
 2013-12-09 10:22:40 -08:00
John McLear
3180b96213 Remove console logs 2013-12-09 18:13:07 +00:00
webzwo0i
9400425b1e [virtual_lines] remove traces of virtual_lines/makeVirtualLineView. this code was used for FF2 key handling code and is long unused 2013-12-08 17:33:58 +01:00
webzwo0i
aadcfbb3d1 do not send globalPadId in clientvars - its not used anywhere 2013-12-08 17:29:41 +01:00
webzwo0i
ca6f877db2 [padDiff] remove unused functions a?lines_length 2013-12-08 17:28:43 +01:00
webzwo0i
e1fbb1d1aa fix loop 2013-12-08 13:53:26 +01:00
webzwo0i
9557dc9dba remove unused require 2013-12-08 13:48:21 +01:00
webzwo0i
c3081c046b function scope: variables only need to be declared once 2013-12-08 13:47:05 +01:00
webzwo0i
0fa0d6dc2c remove now unused code 2013-12-08 13:45:45 +01:00
webzwo0i
27e0c37779 refactor export of style attributes 
1. mark all attributes that are used
2. find the outermost attribute that is no longer used
3. close all tags upto this attribute
4. open all tags that are used and not open
(5. close all open tags)
 2013-12-08 13:39:50 +01:00
webzwo0i
f968b5a057 useless var statement (function scope) 2013-12-08 11:37:47 +01:00
webzwo0i
51769585a9 workaround so that at least one tag stays open if its the outermost tag. saves some space in the output 2013-12-08 11:37:07 +01:00
webzwo0i
656a558af9 be more clear about the value in propVals 2013-12-08 11:35:28 +01:00
webzwo0i
a534b1ec22 some more docs for attribute export and cleanup empty lines 2013-12-08 11:34:11 +01:00
webzwo0i
70c51d731b add some documentation for styling attributes export 2013-12-08 11:33:20 +01:00
webzwo0i
86791707cd fix export so no tags are omitted 2013-12-08 11:31:23 +01:00
webzwo0i
01c71085e4 fix closing of </title> tag 2013-12-07 00:18:36 +01:00
Luc Didry
3d8452b143 Replace tabs indentation with spaces indentation 
Some files are obviously external libraries, I didn't touch them
 2013-12-05 08:41:29 +01:00
John McLear
271dd663bf foo 2013-11-28 17:22:34 +00:00
John McLear
6fcc7c77f9 not working and erally confused 2013-11-27 00:23:11 +00:00
s1341
9b7203d4d2 have the server parse the settings file using minify and strip commas 2013-11-26 10:20:59 +02:00
s1341
45e0680484 move copy/move pad into a new api version 2013-11-24 22:34:56 +02:00
s1341
52a99eb9e5 fix bugs, add force option to overwrite destination 2013-11-18 08:25:46 +02:00
s1341
93fcab0461 change parameter names 2013-11-17 21:01:02 +02:00
s1341
29d8bb7716 add pad copy/move API functions 2013-11-17 17:02:44 +00:00
Luc Didry
4a9602cc57 Fix getRevisionChangeset API call making etherpad crash 2013-11-07 22:49:20 +01:00
Marcel Klehr
8ab2442cc9 Update padList correctly 
fixes #1971
 2013-11-01 14:16:26 +01:00
Marcel Klehr
7b84e7308b Merge branch 'metrics' into develop 
Conflicts:
	src/node/handler/PadMessageHandler.js
 2013-10-28 12:11:25 +01:00
Marcel Klehr
3ad4b1b837 stats: Add http500, memoryUsage, pendingEdits gauges 
and turn edits metric into a timer instead of a simple meter
 2013-10-27 21:43:32 +01:00
Marcel Klehr
387091c5c9 Expose current stats at /stats 2013-10-27 18:11:50 +01:00
Marcel Klehr
940f114a84 Record metrics with 'measured' 2013-10-27 17:42:55 +01:00
Kenan Sulayman
7ab65d7112 Refactors APIHandler:callAPI 
Refactors and optimizes the APIHandler->callAPI.
 2013-10-25 12:14:22 +02:00
Grant Woodford
fbe4e43c3d Privacy: Add an option to disable IP logging 2013-10-19 21:37:11 +02:00
John McLear
a120d78b7e Merge pull request #1943 from ether/fix/listAllPads-fix 
Pad list cache: You can't change the cache if it's not initiated
 2013-10-14 09:21:27 -07:00
Marcel Klehr
22b0bafafd Pad list cache: You can't change the cache if it's not initiated 
(as per 200f250717 - doh.)
 2013-10-14 18:20:24 +02:00
vileda
77c2313025 pass correct padID to checkAccess if pad is requested via readOnly link 2013-10-13 22:31:41 +02:00
Marcel Klehr
200f250717 You don't need the padList if you want to alter it 
Don't query the db for caching a list of pads if you only want to alter the list
 2013-10-13 21:20:19 +02:00
John McLear
680d9a2811 Don't try to populate padlist on each req 
This is an important fix, prolly wants merging into master ASAP.  

Before this fix each new pad request would re-populate the all pads object, this is a blocking procedure and slows down the loading to a point where it's almost useless :(

Testing didn't find this because our testing stack isn't populated with pad data :|  TLDR.  Our tests still suck, hard.
 2013-10-13 16:39:45 +01:00
Marcel Klehr
64392542f9 Merge pull request #1938 from ether/fix/unknown-connection-message 
Drop messages from unknown connections
 2013-10-12 11:24:51 -07:00
Marcel Klehr
aa77a615da Drop messages from unknown connections 
fixes #1908
 2013-10-12 18:51:04 +02:00
Marcel Klehr
048d55a64c Don't create new pad if a non-existant read-only pad is accessed 
fixes #1848
 2013-10-12 18:41:48 +02:00
Marcel Klehr
7f10b9a42f Add explanations for more disconnect scenarios 2013-10-10 21:11:15 +02:00
Marcel Klehr
de50efc71a Merge pull request #1927 from ether/fix/client-side-error-logging-in-server-log 
Polish logging of client-side errors on the server
 2013-10-10 11:14:54 -07:00
Marcel Klehr
b7c7685dc7 Polish logging of client-side errors on the server 2013-10-10 18:45:22 +02:00
Marcel Klehr
d4c99d40b8 Never keep processing a changeset if it's corrupted 2013-10-10 18:19:25 +02:00
Marcel Klehr
6689a3c02e Catch errors during preparation of client vars 
... and disconnect the user
 2013-10-10 16:38:41 +02:00
John McLear
d86d99bc16 Merge pull request #1925 from ether/move-padlist-init 
Move padlist init
 2013-10-09 11:45:59 -07:00
John McLear
2992e3ea2b clean up 2013-10-09 16:34:50 +01:00
John McLear
40a65bd41c more warns 2013-10-09 16:17:36 +01:00
John McLear
c93acdfc87 suggestion 2013-10-09 16:14:16 +01:00
Marcel Klehr
de73de38b1 Filter author attribs in client_vars.historicalAuthorData 2013-10-07 18:58:20 +02:00
Marcel Klehr
9fac515885 Revert "do not pass historical author data to read only users" 
This reverts commit b32aaaeb1b.
 2013-10-07 18:54:57 +02:00
John McLear
d7088031fa remove white space 2013-10-06 15:16:32 +01:00
John McLear
b32aaaeb1b do not pass historical author data to read only users 2013-10-06 15:15:43 +01:00
John McLear
37586d646e Merge pull request #1920 from ether/allow-err-msg-from-listpadsof-author 
allow author manager to use custom error module
 2013-10-03 06:46:17 -07:00
John McLear
bf1e1c3007 allow author manager to use custom error module 2013-10-03 14:45:23 +01:00
Marcel Klehr
7b17bd58ae Merge branch 'pr/1756' into develop 
Conflicts:
	src/node/handler/SocketIORouter.js
 2013-09-29 16:45:12 +02:00
Eric Schrijver
b34224559d ‘Etherpad Lite’ -> ‘Etherpad’ 2013-09-29 13:57:37 +02:00
John McLear
f59df2bb80 Merge pull request #1902 from ether/fix/handle-message-continuation 
Don't stop processing changesets if there is an error
 2013-09-28 23:38:26 -07:00
John McLear
c615ccf514 dont crash on importing blank html 2013-09-27 14:47:34 +01:00
Marcel Klehr
7f7d506ff3 Don't stop processing changesets if there is an error 
fixes #1895
 2013-09-23 16:38:55 +02:00
John McLear
4bea3a348e strip title out of html during import, pesky abiword behavior 2013-09-21 23:29:32 +01:00
John McLear
204118eea5 dont crash on malformed HTML import 2013-09-21 16:11:56 +01:00
Marcel Klehr
182ce5c48d API: fix createGroup for mapper endpoint for cases when a mapped group has been deleted 
fixes #1890
 2013-09-18 16:04:10 +02:00
John McLear
c4fcedbb8d Merge pull request #1879 from Gared/binary-upload-fix 
Add check if uploaded file only contains ascii chars when abiword disabled
 2013-09-10 13:48:26 -07:00
Gared
b336e38637 Add check if uploaded file only contains ascii chars when abiword disabled 2013-09-10 21:58:28 +02:00
vileda
43e1af93c1 allow users to have colons in password 2013-09-10 16:00:36 +02:00
tonoman3g
e60591a4d5 fix padUsers http api call in PadMessageHandler.js. 
Add callback() function call to iterator function.
 2013-09-09 21:24:41 +07:00