eb32835ea1
Updated npm version.
2014-02-24 13:29:21 +01:00
fa681d43f7
remember user session because it can be gone when finalHandler is called
2014-02-20 17:38:25 +01:00
c8c2866087
fix crash if disconnect happens for sessions that have messages queued
2014-02-20 16:33:42 +01:00
0e6019344e
fix for infinite loop on bad changeset
2014-02-20 14:08:49 +04:00
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
44062ae765
escape rendered npm package info
2014-02-17 11:40:30 -05:00
f798e287fb
Localisation updates from https://translatewiki.net .
2014-02-09 15:22:15 +00:00
65a3344f46
Localisation updates from https://translatewiki.net .
2014-02-02 12:36:23 +00:00
7151e7827a
allow tabs to be cycled when focus is in editor
2014-02-01 07:05:25 +00:00
3f31445abf
don't call ace_getInInternationalComposition if editor is not fully loaded
2014-01-28 14:07:26 +01:00
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
728958e131
Localisation updates from https://translatewiki.net .
2014-01-24 19:51:24 +00:00
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
a43123880a
fix randomstring
2014-01-24 01:19:14 +01:00
bf6ec18ead
Fix #1835 Enable import buttons after failed import (timeout)
2014-01-19 20:04:09 +01:00
3715535f86
Fix #2058 Add square brackets to url characters
2014-01-19 19:23:11 +01:00
348d9a838f
convert over to server-side crypto
2014-01-15 11:44:57 -08:00
ae99c5ea6f
new randomString function should take len arg
2014-01-15 11:44:41 -08:00
9ef709e7f7
mozilla bug 844796 - use node crypto module for randomString
2014-01-15 10:58:50 -08:00
2f9a9d8695
Localisation updates from https://translatewiki.net .
2014-01-11 16:47:39 +00:00
a35254c772
Localisation updates from https://translatewiki.net .
2014-01-06 11:01:26 +00:00
9c64b6e268
Try to find related languages as a fallback
...
fixes #2029
2013-12-30 13:06:13 +01:00
1e0456c7ed
Localisation updates from https://translatewiki.net .
2013-12-28 17:43:47 +00:00
44f817da01
Localisation updates from https://translatewiki.net .
2013-12-23 20:11:18 +00:00
333d2f119b
expose update browser selection function
2013-12-18 22:13:03 +00:00
1a138438eb
dont error when pressing del on rep 0 0
2013-12-18 18:34:35 +00:00
33ecd3d52f
Merge pull request #2041 from ether/fix-get-attr
...
better handling for attribute queries
2013-12-17 12:49:28 -08:00
8313083cd9
better handling for attribute queries
2013-12-17 20:48:19 +00:00
adf05576b2
Don't crash if CHANGESET_REQ fails
2013-12-17 16:20:57 +01:00
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
6f6a86faa6
Localisation updates from https://translatewiki.net .
2013-12-17 08:52:50 +00:00
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
dd8af99e2e
Add input validation for html param in setHTML()
2013-12-14 21:14:56 +01:00
58cd71dcce
Merge branch 'fix-exporthtml-styling-tags' of https://github.com/webzwo0i/etherpad-lite into develop
2013-12-10 19:25:36 +00:00
58bbfd8a65
resolve merge conflict
2013-12-09 21:55:04 +00:00
24e96c4f8b
Merge pull request #2028 from webzwo0i/remove-deadcode
...
Remove deadcode
2013-12-09 10:49:57 -08:00
438f3fc717
Merge pull request #2030 from ether/import_hook
...
Working import hooks
2013-12-09 10:22:40 -08:00
3180b96213
Remove console logs
2013-12-09 18:13:07 +00:00
505dc70df5
Merge pull request #2013 from ether/getAttributeOnSelection
...
getAttributeOnSelection function
2013-12-09 09:46:57 -08:00
bae77666a4
Merge pull request #2027 from webzwo0i/fix-import
...
fix closing of </title> tag
2013-12-09 06:56:22 -08:00
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
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
ab797c9831
[pad_connectionstatus] padeditbar is not used anywhere in pad_connectionstatus
2013-12-08 17:31:46 +01:00
906ab1820b
[timeslider] do not include underscore, as its not (longer) used
2013-12-08 17:31:18 +01:00
1fa8c2a7e6
[collab_client] remove unused function getStats
2013-12-08 17:30:48 +01:00
6aaf4c4065
[collab_client] remove keys function, which was not used and variable reconnectTimes which was used for some long gone disconnect tracking code
2013-12-08 17:30:25 +01:00
aadcfbb3d1
do not send globalPadId in clientvars - its not used anywhere
2013-12-08 17:29:41 +01:00
ca6f877db2
[padDiff] remove unused functions a?lines_length
2013-12-08 17:28:43 +01:00
021db28a02
[Changeset] a?lines_length was not used within inverse function
2013-12-08 17:27:48 +01:00
e04f46d477
[ace2_inner] init() has replaced setup(), reflect this change in the comments and remove the unused setup()
2013-12-08 17:25:12 +01:00
020bd3915c
remove empty&unused overlaysdiv
2013-12-08 17:24:12 +01:00
4dd3584532
[ace2inner] remove unused function boldColorFromColor
2013-12-08 17:22:55 +01:00
a714f63597
[ace2inner] remove unused recolorLineByKey that was part of old recolor module
2013-12-08 17:22:20 +01:00
3dc844eb08
[ace2_inner] remove unused getLineKeyForOffset that was part of old recolor module
2013-12-08 17:21:53 +01:00
eee355979d
[ace2_inner] remove unused function htmlForRemovedChild
2013-12-08 17:21:27 +01:00
8175af3017
[collab_client] remove socketid because its not used
2013-12-08 17:20:53 +01:00
f25fed1c25
[ace2_inner] remove incorpIfQuick because its unused since July
2013-12-08 17:15:38 +01:00
4044d5ae47
remove hidden input field padId which is send on every import but not used
2013-12-08 17:14:01 +01:00
e1fbb1d1aa
fix loop
2013-12-08 13:53:26 +01:00
9557dc9dba
remove unused require
2013-12-08 13:48:21 +01:00
c3081c046b
function scope: variables only need to be declared once
2013-12-08 13:47:05 +01:00
0fa0d6dc2c
remove now unused code
2013-12-08 13:45:45 +01:00
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
f968b5a057
useless var statement (function scope)
2013-12-08 11:37:47 +01:00
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
656a558af9
be more clear about the value in propVals
2013-12-08 11:35:28 +01:00
a534b1ec22
some more docs for attribute export and cleanup empty lines
2013-12-08 11:34:11 +01:00
70c51d731b
add some documentation for styling attributes export
2013-12-08 11:33:20 +01:00
86791707cd
fix export so no tags are omitted
2013-12-08 11:31:23 +01:00
8a547b24ba
resolve issue where first char showed all formatting
2013-12-07 17:37:52 +00:00
98c4e32a14
Merge pull request #2026 from ether/afterEditHook
...
after Edit eejs block
2013-12-07 08:55:04 -08:00
01c71085e4
fix closing of </title> tag
2013-12-07 00:18:36 +01:00
03d5acfd0c
Localisation updates from https://translatewiki.net .
2013-12-05 22:01:36 +00:00
37442d301c
Merge pull request #2021 from ldidry/fix-no-tab-indent
...
Replace tabs indentation with spaces indentation
2013-12-05 06:22:33 -08:00
60017e9190
Merge pull request #2019 from ether/lighter-colors
...
allow for lighter colors
2013-12-05 05:42:14 -08:00
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
20b27c602c
Merge branch 'afterEditHook' of github.com:ether/etherpad-lite into getAttributeOnSelection
2013-12-04 23:36:26 +00:00
749e557b84
after Edit eejs block
2013-12-04 23:17:32 +00:00
378e07964b
allow for lighter colors
2013-12-04 23:01:08 +00:00
03ff5563f4
Merge pull request #2017 from eloydegen/master
...
Update pad.html
2013-12-02 08:21:38 -08:00
de3a657c6b
Update pad.html
...
Select the URL when click at the text.
2013-12-02 16:43:52 +01:00
f2e63df9cb
Localisation updates from https://translatewiki.net .
2013-12-02 08:26:08 +00:00
30f577e8f4
dont assume formatting is on the start of any line
2013-12-01 20:01:17 +00:00
95db100f12
remove white space
2013-12-01 18:56:05 +00:00
39f81fdb9e
remove post ace event
2013-12-01 18:55:42 +00:00
3791ad4186
ends of line shouldn't show incorrect formatted status
2013-12-01 18:54:46 +00:00
b4877f002d
handle logic for line lengths with 0
2013-12-01 18:06:56 +00:00
e9f7583793
some nice css to that reflect when a button is active
2013-11-28 17:44:37 +00:00
dee2dab7c4
getAttributeOnSelection function
2013-11-28 17:27:52 +00:00
271dd663bf
foo
2013-11-28 17:22:34 +00:00
6fcc7c77f9
not working and erally confused
2013-11-27 00:23:11 +00:00
5181b3e467
add josnminify to package.json
2013-11-26 10:28:33 +02:00
9b7203d4d2
have the server parse the settings file using minify and strip commas
2013-11-26 10:20:59 +02:00
7550be0921
strip off trailing commas
2013-11-26 10:11:32 +02:00
b527ef2bc5
Merge pull request #2010 from ether/sticky-chat-resize
...
Sticky chat resize
2013-11-25 09:36:44 -08:00
3be1ee5967
slightly cleaner
2013-11-25 17:36:24 +00:00
252be19885
make sticky chat mroe responsive to changes in top bar
2013-11-25 17:33:33 +00:00
45e0680484
move copy/move pad into a new api version
2013-11-24 22:34:56 +02:00
5d803a0523
Fix walking caret bug
...
white-space css prop must be set to pre-wrap to keep trailing spaces
fixes #1766
2013-11-22 17:18:30 +01:00
117a4ab1a8
Localisation updates from http://translatewiki.net .
2013-11-21 06:39:40 +00:00
106661712d
Localisation updates from http://translatewiki.net .
2013-11-19 06:43:22 +00:00
52a99eb9e5
fix bugs, add force option to overwrite destination
2013-11-18 08:25:46 +02:00
93fcab0461
change parameter names
2013-11-17 21:01:02 +02:00
29d8bb7716
add pad copy/move API functions
2013-11-17 17:02:44 +00:00
1ee7c7000f
Localisation updates from http://translatewiki.net .
2013-11-12 13:44:57 +00:00
8e5af48f79
en.json: Add keyboard shortcuts for indent and outdent to translations
2013-11-08 15:18:23 +00:00
4a9602cc57
Fix getRevisionChangeset API call making etherpad crash
2013-11-07 22:49:20 +01:00
c9b80c6120
Localisation updates from http://translatewiki.net .
2013-11-04 16:04:11 +00:00
8ab2442cc9
Update padList correctly
...
fixes #1971
2013-11-01 14:16:26 +01:00
975eae350e
Merge pull request #1963 from eyesonlyhack/allLinksTranslatingToHTTP
...
Fix #1776 - All links regardless of protocol translate to http:// links
2013-10-28 04:15:17 -07:00
7b84e7308b
Merge branch 'metrics' into develop
...
Conflicts:
src/node/handler/PadMessageHandler.js
2013-10-28 12:11:25 +01:00
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
84b19a56d5
Localisation updates from http://translatewiki.net .
2013-10-27 19:17:18 +00:00
387091c5c9
Expose current stats at /stats
2013-10-27 18:11:50 +01:00
940f114a84
Record metrics with 'measured'
2013-10-27 17:42:55 +01:00
7ab65d7112
Refactors APIHandler:callAPI
...
Refactors and optimizes the APIHandler->callAPI.
2013-10-25 12:14:22 +02:00
c3a58f42e7
Added a better way of detecting when a url does not have a protocol specified
2013-10-21 22:15:46 +02:00
e8c69a5474
Update changelog and bump version
2013-10-21 20:18:16 +02:00
d43945db07
Merge pull request #1950 from eyesonlyhack/disableIPlogging
...
Privacy: Add an option to disable IP logging
2013-10-21 08:05:05 -07:00
fbe4e43c3d
Privacy: Add an option to disable IP logging
2013-10-19 21:37:11 +02:00
b1b801e7c7
Localisation updates from http://translatewiki.net .
2013-10-19 19:37:02 +00:00
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
22b0bafafd
Pad list cache: You can't change the cache if it's not initiated
...
(as per 200f250717
2013-10-14 18:20:24 +02:00
96c366b1e1
Consistent spelling style
...
Spotted by Shirayuki in https://translatewiki.net/wiki/Thread:Support/About_EtherpadLite:Pad.modals.badChangeset.cause/en
2013-10-14 11:11:31 +00:00
e308c265af
Localisation updates from http://translatewiki.net .
2013-10-14 08:55:30 +00:00
77c2313025
pass correct padID to checkAccess if pad is requested via readOnly link
2013-10-13 22:31:41 +02:00
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
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
8c9e543b91
Fix disconnect modals
2013-10-12 22:29:03 +02:00
614ca6bd90
Merge branch 'develop' into release/1.2.12
2013-10-12 20:29:49 +02:00
64392542f9
Merge pull request #1938 from ether/fix/unknown-connection-message
...
Drop messages from unknown connections
2013-10-12 11:24:51 -07:00
aa77a615da
Drop messages from unknown connections
...
fixes #1908
2013-10-12 18:51:04 +02:00
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
74bc2bd761
Prepare release
2013-10-12 14:16:06 +02:00
7f10b9a42f
Add explanations for more disconnect scenarios
2013-10-10 21:11:15 +02:00
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
22e9e5fdcd
Merge pull request #1926 from ether/fix/no-connect-to-corrupt-pad
...
Fix a whole range of bugs related to corrupted changesets
2013-10-10 11:07:37 -07:00
46511d6144
Polish the error messages of the easysync lib
2013-10-10 20:02:13 +02:00
b7c7685dc7
Polish logging of client-side errors on the server
2013-10-10 18:45:22 +02:00
d4c99d40b8
Never keep processing a changeset if it's corrupted
2013-10-10 18:19:25 +02:00
6689a3c02e
Catch errors during preparation of client vars
...
... and disconnect the user
2013-10-10 16:38:41 +02:00
ccf4683558
Easysync: Throw an error if an unknown attrib is referneced
2013-10-10 16:38:16 +02:00
d86d99bc16
Merge pull request #1925 from ether/move-padlist-init
...
Move padlist init
2013-10-09 11:45:59 -07:00
2992e3ea2b
clean up
2013-10-09 16:34:50 +01:00
40a65bd41c
more warns
2013-10-09 16:17:36 +01:00
c93acdfc87
suggestion
2013-10-09 16:14:16 +01:00
de73de38b1
Filter author attribs in client_vars.historicalAuthorData
2013-10-07 18:58:20 +02:00
9fac515885
Revert "do not pass historical author data to read only users"
...
This reverts commit b32aaaeb1b
2013-10-07 18:54:57 +02:00
d7088031fa
remove white space
2013-10-06 15:16:32 +01:00
b32aaaeb1b
do not pass historical author data to read only users
2013-10-06 15:15:43 +01:00
eb611e2b36
Localisation updates from http://translatewiki.net .
2013-10-05 21:56:44 +00:00
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
bf1e1c3007
allow author manager to use custom error module
2013-10-03 14:45:23 +01:00
6dc4240985
Merge pull request #1919 from ether/make-username-show-properly
...
use val not value, broken with newer jq
2013-10-02 16:37:29 -07:00
d69df91709
use val not value, broken with newer jq
2013-10-03 00:36:15 +01:00
7b17bd58ae
Merge branch 'pr/1756' into develop
...
Conflicts:
src/node/handler/SocketIORouter.js
2013-09-29 16:45:12 +02:00
b34224559d
‘Etherpad Lite’ -> ‘Etherpad’
2013-09-29 13:57:37 +02:00
716e929e64
works but hides caret on full line and not on X too, X is much harder to do
2013-09-29 08:19:57 +01:00
6e4d94069f
Merge pull request #1906 from ether/down-arrow-dont-be-weird
...
Down arrow dont be weird
2013-09-28 23:38:45 -07:00
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
e573461c9b
Merge pull request #1909 from ether/dont-crash-blank-html-import
...
dont crash on importing blank html
2013-09-27 12:06:05 -07:00
c615ccf514
dont crash on importing blank html
2013-09-27 14:47:34 +01:00
7d1d73f8a6
doh, wasnt supposed to add this background
2013-09-25 22:20:13 +01:00
ed04842801
more sensible reload without cache message
2013-09-25 22:18:51 +01:00
c8109b7398
sanity also control home support
2013-09-25 15:56:56 +01:00
487f1a969f
vast improvement on movement of caret due to isolation of cause of problem - TLDR is Chrome detects blank rows line heights as incorrect
2013-09-25 14:57:02 +01:00
6a02302fc9
/admin/plugins: Fix search algorithm (use string match in lower case)
...
fix #1903
2013-09-23 19:55:35 +02:00
7f7d506ff3
Don't stop processing changesets if there is an error
...
fixes #1895
2013-09-23 16:38:55 +02:00
4bea3a348e
strip title out of html during import, pesky abiword behavior
2013-09-21 23:29:32 +01:00
240a96221a
Merge branch 'develop' of github.com:ether/etherpad-lite into import-button-styling
2013-09-21 16:23:12 +01:00
e35c45e9b5
make export clearly seperated from import
2013-09-21 16:22:43 +01:00
ca680a32b6
fix padding so export icons show properly
2013-09-21 16:17:19 +01:00
05a8ae7acc
padding on import now button
2013-09-21 16:15:59 +01:00
204118eea5
dont crash on malformed HTML import
2013-09-21 16:11:56 +01:00
96adb4d626
The #importsubmitinput button was too small and hidden its value
2013-09-21 12:39:45 +02:00
6de3a400e1
The import/export columns were not displayed correctly
2013-09-21 12:38:26 +02:00
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
1cfde05139
fix .popup CSS to fit in small spaces, like thin iframe
2013-09-17 11:26:11 -06:00
2b46bc40a1
Beautify infinite scroll
2013-09-12 16:37:37 +02:00
8073c62de3
Merge pull request #1882 from fviard/develop
...
Fix to check if searchTerm is not "undefined" before trying to use it to...
2013-09-12 05:50:39 -07:00
c2e60a3919
Merge pull request #1850 from Wikinaut/develop
...
adding backlinks to main page on admin pages
2013-09-12 05:46:14 -07:00
6f478c4de1
Fix to check if searchTerm is not "undefined" before trying to use it to filter search results.
...
Signed-off-by: Florent Viard <fviard@lacie.com>
2013-09-11 11:36:09 +02:00
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
b336e38637
Add check if uploaded file only contains ascii chars when abiword disabled
2013-09-10 21:58:28 +02:00
43e1af93c1
allow users to have colons in password
2013-09-10 16:00:36 +02:00
c08a4dd01f
Localisation updates from http://translatewiki.net .
2013-09-09 18:49:10 +00:00
527b7ad7f8
Merge pull request #1874 from tonoman3g/fix-padUsers-http-api-call
...
fix padUsers http api call in PadMessageHandler.js.
2013-09-09 08:00:11 -07:00
e60591a4d5
fix padUsers http api call in PadMessageHandler.js.
...
Add callback() function call to iterator function.
2013-09-09 21:24:41 +07:00
842e09a7ad
Merge branch 'upstream/develop'
2013-09-04 15:30:37 +02:00
7ecf5f8c52
Localisation updates from http://translatewiki.net .
2013-09-02 18:50:54 +00:00
4305bb16ed
utf-8 without BOM; removed trailing white spaces
2013-08-14 21:46:57 +02:00
c3bffc2623
adding backlinks to main page in Admin pages; fix for https://github.com/ether/etherpad-lite/issues/1277
2013-08-14 21:42:59 +02:00
cb3ab51ee1
Localisation updates from http://translatewiki.net .
2013-07-30 17:46:04 +00:00
40f578cfbd
Merge pull request #1816 from bit/sessioninfos
...
export sessioninfos
2013-07-23 05:14:45 -07:00
c39eb4f443
Make use of the new plural macro
2013-07-23 12:43:30 +02:00
dabba91152
Update html10n.js
2013-07-23 12:42:55 +02:00
100c4627ec
Localisation updates from http://translatewiki.net .
2013-07-22 15:44:42 +00:00
5e3abb7054
Update en.sjon translation
...
pad.importExport.abiword.innerHTML
2013-07-22 15:52:48 +02:00
53fb4fc3fe
Merge pull request #1833 from digitalbazaar/fix-chrome-longlines-slowdown
...
Make pads with long lines usable with chrome.
2013-07-14 14:59:21 -07:00
3a9ef306a6
Localisation updates from http://translatewiki.net .
2013-07-14 21:25:00 +00:00
3a47e719d4
Make pads with long lines usable with chrome.
...
- Do not use incorpIfQuick on keyup because it's not ever quick
on chrome. Calling incorpIfQuick calls incorporateUserChanges
which sets a flag on the current callstack state indicating
that the selection has changed (since something was typed).
Whenever this flag is set, the event handler will run code
to update the selection (and possibly scroll the view as
well), which is a very costly operation in webkit browsers.
Instead let the user changes be incorporated by the idle worker,
scheduling it to run ASAP on keyup. This isn't a perfect
solution, but may make pads running on webkit browsers more
usable with otherwise fairly unnoticeable changes in the UI.
2013-07-14 01:51:39 -04:00
98a9a24d02
repo url as latest npm shows warn if non existant
2013-06-26 20:19:38 +01:00
53529cd031
Merge pull request #1815 from bit/patches
...
Some Patches
2013-06-25 06:54:51 -07:00
ba1a5da76d
bump and changelog
2013-06-24 13:35:17 +01:00
ee8af3454c
Merge pull request #1753 from ether/dont-crash-noauth
...
dont crash on no auth, just a bandaid
2013-06-18 07:52:34 -07:00
a62593e9a0
export sessioninfos so plugins can access it
...
allows plugins to map client.id to author id
2013-06-17 16:54:02 +02:00
9dd6471921
Add userLeave hook
2013-06-17 15:53:01 +02:00
bc5dc74f90
pass pad in postAceInit hook
...
no way for plugins to access current pad otherwise.
2013-06-17 15:52:51 +02:00
a554552bed
Simpify CSS for sticky chat
2013-06-17 14:47:28 +02:00
315e229c83
Localisation updates from http://translatewiki.net .
2013-06-17 11:28:14 +00:00
3d65f3d052
Merge pull request #1807 from dummys/develop
...
added log4js 0.6.6
2013-06-15 00:17:50 -07:00
ae78c6731d
Merge pull request #1811 from clkao/author-style-hook
...
Document author style hook and provide outer_ace dynamic css manager
2013-06-15 00:17:09 -07:00
f31db205da
allow cssmanager to manage outer_ace
2013-06-15 01:38:46 +08:00
8278ef3c7c
added log4js 0.6.6
2013-06-13 15:10:32 +02:00
82de797642
Only kept URL schemes which have an RFC standard
2013-06-12 12:31:38 -05:00
b4f155c028
Cleanup gophers
2013-06-12 11:20:36 -05:00
4c264aec4d
Localisation updates from http://translatewiki.net .
2013-06-10 08:45:19 +00:00
548f31a46a
new hook: aceSetAuthorStyle
2013-06-06 13:03:40 +08:00
eae9faa28c
refactor setAuthorStyle
2013-06-06 12:30:48 +08:00
7528ddf610
typo
2013-05-29 16:54:39 +02:00
121c02c74f
Grant access, when valid session is available and sessionNoPassword is set
2013-05-29 16:53:14 +02:00
7d81a6d042
Localisation updates from http://translatewiki.net .
2013-05-26 09:36:03 +00:00
9c69753a35
Localisation updates from http://translatewiki.net .
2013-05-20 09:30:23 +00:00
8ee15d4003
Localisation updates from http://translatewiki.net .
2013-05-12 18:40:40 +00:00
923c01745b
Localisation updates from http://translatewiki.net .
2013-05-09 13:39:04 +00:00
90d1598688
Merge pull request #1751 from goldquest/dev_IE8-fix
...
Fixing IE8 errors
2013-05-08 07:19:15 -07:00
2273cf9ed6
Merge pull request #1740 from ether/feature/add-cs-queue
...
add a changeset queue
2013-04-28 13:58:08 -07:00
9f2bab2ba3
Merge pull request #1760 from bemeric1/develop
...
Issue #1652 : Fix to client-side-induced changeset spamming.
2013-04-28 13:11:34 -07:00
702a300164
Localisation updates from http://translatewiki.net .
2013-04-28 17:48:19 +00:00
2c855de6f6
Add a server-side changeset queue per pad
...
fixes #1573
2013-04-27 23:04:42 +02:00
e7d8f124ad
Issue #1625 : Fix to client-side-induced changeset spamming.
...
THE BUG - HIGH LEVEL:
- When client A sends out an attribute change, client B applies that change to itself but
also thinks that it made the change itself, which is incorrect. This means that when client B
next makes a change, he will send out that he made the attrib change that A actually made.
- Ex: Have 2 clients on the same pad. Have A apply bold on some text. Next, have B type a character.
B will broadcast that it both added a character AND applied bold, when in reality it did NOT
apply bold at all, that change was done by the other client and this client incorrectly adopted it as its own.
- This root bug behavior results in clients continuing to think that they each made the other client's change,
thus resulting in an infinite loop of changeset spamming that bogs down clients and harms server stability.
THE BUG - IN DEPTH:
- The root issue is in the way that Changesets are combined in Changeset.follow(). Specifically, in the case of a
changeset with ONLY new attrib changes (no text changes) being merged with an identity changeset (has no ops).
- In this case, Changeset.follow() copies the ops of the new CS and fully overrides the other CS.
- applyChangesToBase invokes Changeset.follow to determine the final client document CS state after applying the new CS.
If the final client document CS state is NOT the identity CS, then the client broadcasts that it made a change.
- When client A changes just attribs, client B's applyChangesToBase calls Changeset.follow() and passes client A's
changeset (attrib change) and Client B's current changeset state (identity).
- As per the noted bug, Changeset.follow() returns client A's changeset as a result, causing client B to adopt
client A's changeset as its own document state. Thus, client A ends up thinking it has made client B's changes.
THE FIX:
- Changeset.follow() should NOT copy the ops of the new CS passed in if those changes are only attrib changes.
This allows applyChangesToBase to properly set the client's CS back to the identity after applying an
external attrib change, instead of incorrectly adopting the external client's changes.
2013-04-24 15:18:25 -07:00
fb0bc31056
updated to use settings
...
updated handler/SocketIORouter.js to use new setting
updated hooks/express.js to use new setting
updated utils/Settings.js to accept new setting
updated settings.json.template so new setting is present
2013-04-24 12:19:41 +02:00
6ea5efbcc3
Update SocketIORouter.js
...
Changed the setting of client.remoteAddress
2013-04-22 23:01:41 +03:00
f0f98b41fe
Localisation updates from http://translatewiki.net .
2013-04-21 12:29:25 +00:00
bf4c86ed94
better message for admins
2013-04-17 23:48:11 +01:00
63b00b9010
Merge branch 'feature/add-cs-queue' of github.com:ether/etherpad-lite into dont-crash-noauth
2013-04-17 20:04:25 +01:00
3b8621c6a0
dont crash on no auth, ust a bandaid
2013-04-17 19:50:05 +01:00
98c43aff43
fixed spacing
2013-04-17 18:17:14 +02:00
f478f99995
Merge pull request #1750 from ether/fix/authorship-once-and-4-all
...
Fix authorship sanitization
2013-04-17 08:13:22 -07:00
896f72311f
use document, not doc
2013-04-17 16:51:54 +02:00
566034ddf0
IE8 don't knows the Array.forEach function (simple version fix)
2013-04-17 16:51:43 +02:00
b08a6e522f
IE8 complains, if catch block is missing
2013-04-17 16:51:21 +02:00
146c75e703
Remove console.log in content collector
...
fixes #1731
2013-04-17 16:37:45 +03:00
560fd55bf2
Fix authorship sanitization
...
author colors wouldn't get disttributed, if their id was greater than 9
(due to apool encoding them to base 36)
2013-04-17 15:24:40 +02:00
cd288c70cb
Don't block changeset queue with delivering changeset
2013-04-17 14:26:11 +02:00
1c8b7a3661
Add a server-side changeset queue per pad
...
fixes #1573
2013-04-17 14:25:23 +02:00
e7a80b7b77
still express is stuck at 3.1.0
2013-04-16 00:12:11 +01:00
602380abb7
passing the ToolbarItem to the callback
2013-04-15 16:06:32 -07:00
f987299a5d
catch error on export
2013-04-15 23:01:08 +01:00
0c52fb5e30
Normalizing how select and button commands are triggered.
2013-04-15 11:32:59 -07:00
vvision