John McLear
cc03f5374c
Merge pull request #2089 from dmitryuv/changesetslib-fixes
...
fix for infinite loop on bad changeset
2014-03-13 14:39:19 +00:00
John McLear
e12093eb19
Merge pull request #2080 from ether/ignore-ctrl-pageup
...
allow tabs to be cycled when focus is in editor
2014-03-13 00:49:20 +00:00
Siebrand Mazeland
96d06abac0
Localisation updates from https://translatewiki.net .
2014-03-12 12:42:31 +00:00
John McLear
f5716a3b26
cleaner logic
2014-03-05 21:44:32 +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
vvision
eb32835ea1
Updated npm version.
2014-02-24 13:29:21 +01:00
Dmitry Uvarov
0e6019344e
fix for infinite loop on bad changeset
2014-02-20 14:08:49 +04: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
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
John McLear
7151e7827a
allow tabs to be cycled when focus is in editor
2014-02-01 07:05:25 +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
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
Gared
3715535f86
Fix #2058 Add square brackets to url characters
2014-01-19 19:23:11 +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
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
333d2f119b
expose update browser selection function
2013-12-18 22:13:03 +00: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
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
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
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
John McLear
505dc70df5
Merge pull request #2013 from ether/getAttributeOnSelection
...
getAttributeOnSelection function
2013-12-09 09:46:57 -08:00
John McLear
bae77666a4
Merge pull request #2027 from webzwo0i/fix-import
...
fix closing of </title> tag
2013-12-09 06:56:22 -08:00
webzwo0i
77cf2aafac
[pad_modals] remove unused variables. for the hide/show functions jquery's default variables are used everywhere
2013-12-08 17:35:11 +01: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
ab797c9831
[pad_connectionstatus] padeditbar is not used anywhere in pad_connectionstatus
2013-12-08 17:31:46 +01:00
