Commit Graph

3476 Commits

Author SHA1 Message Date
John McLear 26869d29b3 Merge pull request #2101 from ether/preProcessDomLine
preprocessor for domline attributes
2014-03-11 17:44:56 +00:00
John McLear f5716a3b26 cleaner logic 2014-03-05 21:44:32 +00:00
John McLear df205a4ef4 docs 2014-03-05 21:44:22 +00:00
John McLear 89d7ba0dc0 merge 2014-03-05 21:27:12 +00:00
John McLear 432438a40d fix dintenation 2014-03-04 23:36:16 +00:00
John McLear c3d62c5fa4 preprocessor for domline attributes 2014-03-04 23:14:15 +00:00
Marcel Klehr 6940106829 Merge pull request #2095 from vvision/develop
Fix plugins not being fetched (update npm)
2014-02-26 23:30:39 +01:00
Marcel Klehr af50001769 Merge pull request #2074 from webzwo0i/fix-disconnect-on-new-changes-in-padinitialization
don't call ace_getInInternationalComposition if editor is not fully load...
2014-02-26 22:52:30 +01:00
Marcel Klehr 8b572b888c Merge pull request #2088 from simong/padUsersCallback
Addressed a potential never finishing forEach in PadMessageHandler.padUsers
2014-02-26 22:50:29 +01:00
vvision eb32835ea1 Updated npm version. 2014-02-24 13:29:21 +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
John McLear ca8dce1840 Merge pull request #2086 from bnchdrff/cleanse-npm-values
escape rendered npm package info
2014-02-17 16:51:07 +00:00
Benjamin Chodoroff 44062ae765 escape rendered npm package info 2014-02-17 11:40:30 -05:00
Siebrand Mazeland f798e287fb Localisation updates from https://translatewiki.net. 2014-02-09 15:22:15 +00:00
Siebrand Mazeland 65a3344f46 Localisation updates from https://translatewiki.net. 2014-02-02 12:36:23 +00:00
webzwo0i 3f31445abf don't call ace_getInInternationalComposition if editor is not fully loaded 2014-01-28 14:07:26 +01:00
Marcel Klehr b6f354a2de Merge pull request #2052 from ether/fix/l10n-fallbacks-related-langs
Try to find related languages as a fallback
2014-01-25 05:34:11 -08:00
Siebrand Mazeland 728958e131 Localisation updates from https://translatewiki.net. 2014-01-24 19:51:24 +00:00
Marcel Klehr fd4dd915ce Merge pull request #2062 from Gared/enable_import_buttons
Fix #1835 Enable import buttons after failed import (timeout)
2014-01-24 08:26:37 -08:00
Marcel Klehr 4b87f77aae Merge pull request #2068 from webzwo0i/fix-randomstring
fix randomstring
2014-01-24 07:43:19 -08:00
webzwo0i a43123880a fix randomstring 2014-01-24 01:19:14 +01:00
Gared bf6ec18ead Fix #1835 Enable import buttons after failed import (timeout) 2014-01-19 20:04:09 +01:00
John McLear e4fbf4bbcd Merge pull request #2061 from Gared/url_square_brackets
Fix #2058 Add square brackets to url characters
2014-01-19 10:26:16 -08:00
Gared 3715535f86 Fix #2058 Add square brackets to url characters 2014-01-19 19:23:11 +01:00
John McLear be4adec122 Merge pull request #2060 from rhelmer/bug844796-session-token-generation
Bug844796 session token generation
2014-01-15 11:46:55 -08: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
John McLear 346c03911d Merge pull request #2059 from rhelmer/bug844796-session-token-generation
mozilla bug 844796 - use node crypto module for randomString
2014-01-15 11:14:55 -08:00
Robert Helmer 9ef709e7f7 mozilla bug 844796 - use node crypto module for randomString 2014-01-15 10:58:50 -08:00
Siebrand Mazeland 2f9a9d8695 Localisation updates from https://translatewiki.net. 2014-01-11 16:47:39 +00:00
Siebrand Mazeland a35254c772 Localisation updates from https://translatewiki.net. 2014-01-06 11:01:26 +00:00
Marcel Klehr 9c64b6e268 Try to find related languages as a fallback
fixes #2029
2013-12-30 13:06:13 +01:00
Siebrand Mazeland 1e0456c7ed Localisation updates from https://translatewiki.net. 2013-12-28 17:43:47 +00:00
Siebrand Mazeland 44f817da01 Localisation updates from https://translatewiki.net. 2013-12-23 20:11:18 +00:00
John McLear b5ca52a5e5 Merge pull request #2045 from ether/exposeUpdateBrowserSel
expose update browser selection function
2013-12-18 14:13:50 -08:00
John McLear 333d2f119b expose update browser selection function 2013-12-18 22:13:03 +00:00
John McLear 1c2f05cb96 Merge pull request #2044 from ether/ff-del-firstchar
dont error when pressing del on rep 0 0
2013-12-18 10:35:25 -08:00
John McLear 1a138438eb dont error when pressing del on rep 0 0 2013-12-18 18:34:35 +00:00
John McLear 33ecd3d52f Merge pull request #2041 from ether/fix-get-attr
better handling for attribute queries
2013-12-17 12:49:28 -08:00
John McLear 8313083cd9 better handling for attribute queries 2013-12-17 20:48:19 +00:00
John McLear af5b8d3e24 Merge pull request #2039 from ether/fix/dont-crash-on-failed-changeset_req
Don't crash if CHANGESET_REQ fails
2013-12-17 07:42:05 -08:00
Marcel Klehr adf05576b2 Don't crash if CHANGESET_REQ fails 2013-12-17 16:20:57 +01:00
John McLear d1cad04647 Merge pull request #2038 from s1341/fix/server_not_checking_changeset_req_bounds
Server doesn't check bounds on CHANGESET_REQ arguments
2013-12-17 06:45:40 -08: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
Siebrand Mazeland 6f6a86faa6 Localisation updates from https://translatewiki.net. 2013-12-17 08:52:50 +00: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
John McLear 3d8edef926 Merge pull request #2035 from lebrinkma/dont-die-on-bad-html
Add input validation for html param in setHTML()
2013-12-16 03:07:50 -08:00
Lennart Brinkmann dd8af99e2e Add input validation for html param in setHTML() 2013-12-14 21:14:56 +01:00
Lennart Brinkmann 7dd29454e9 Remove duplicate doc entry for setHTML() 2013-12-14 21:11:37 +01:00
John McLear 7c4479d5aa Merge branch 'develop' of github.com:ether/etherpad-lite into develop 2013-12-12 00:22:27 +00:00