Commit graph

3974 commits

Author SHA1 Message Date
vileda
43e1af93c1 allow users to have colons in password 2013-09-10 16:00:36 +02:00
Siebrand Mazeland
c08a4dd01f Localisation updates from http://translatewiki.net. 2013-09-09 18:49:10 +00:00
John McLear
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
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
goldquest
842e09a7ad Merge branch 'upstream/develop' 2013-09-04 15:30:37 +02:00
Siebrand Mazeland
7ecf5f8c52 Localisation updates from http://translatewiki.net. 2013-09-02 18:50:54 +00:00
Wikinaut
4305bb16ed utf-8 without BOM; removed trailing white spaces 2013-08-14 21:46:57 +02:00
Wikinaut
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
Siebrand Mazeland
cb3ab51ee1 Localisation updates from http://translatewiki.net. 2013-07-30 17:46:04 +00:00
Marcel Klehr
40f578cfbd Merge pull request #1816 from bit/sessioninfos
export sessioninfos
2013-07-23 05:14:45 -07:00
Marcel Klehr
c39eb4f443 Make use of the new plural macro 2013-07-23 12:43:30 +02:00
Marcel Klehr
dabba91152 Update html10n.js 2013-07-23 12:42:55 +02:00
Siebrand Mazeland
100c4627ec Localisation updates from http://translatewiki.net. 2013-07-22 15:44:42 +00:00
Marcel Klehr
5e3abb7054 Update en.sjon translation
pad.importExport.abiword.innerHTML
2013-07-22 15:52:48 +02:00
John McLear
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
Siebrand Mazeland
3a9ef306a6 Localisation updates from http://translatewiki.net. 2013-07-14 21:25:00 +00:00
Dave Longley
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
John McLear
98a9a24d02 repo url as latest npm shows warn if non existant 2013-06-26 20:19:38 +01:00
John McLear
53529cd031 Merge pull request #1815 from bit/patches
Some Patches
2013-06-25 06:54:51 -07:00
John McLear
ba1a5da76d bump and changelog 2013-06-24 13:35:17 +01:00
John McLear
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
j
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
j@mailb.org
9dd6471921 Add userLeave hook 2013-06-17 15:53:01 +02:00
j@mailb.org
bc5dc74f90 pass pad in postAceInit hook
no way for plugins to access current pad otherwise.
2013-06-17 15:52:51 +02:00
j@mailb.org
a554552bed Simpify CSS for sticky chat 2013-06-17 14:47:28 +02:00
Siebrand Mazeland
315e229c83 Localisation updates from http://translatewiki.net. 2013-06-17 11:28:14 +00:00
John McLear
3d65f3d052 Merge pull request #1807 from dummys/develop
added log4js 0.6.6
2013-06-15 00:17:50 -07:00
John McLear
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
Chia-liang Kao
f31db205da allow cssmanager to manage outer_ace 2013-06-15 01:38:46 +08:00
dummys
8278ef3c7c added log4js 0.6.6 2013-06-13 15:10:32 +02:00
Kyle Kelley
82de797642 Only kept URL schemes which have an RFC standard 2013-06-12 12:31:38 -05:00
Kyle Kelley
b4f155c028 Cleanup gophers 2013-06-12 11:20:36 -05:00
Siebrand Mazeland
4c264aec4d Localisation updates from http://translatewiki.net. 2013-06-10 08:45:19 +00:00
Chia-liang Kao
548f31a46a new hook: aceSetAuthorStyle 2013-06-06 13:03:40 +08:00
Chia-liang Kao
eae9faa28c refactor setAuthorStyle 2013-06-06 12:30:48 +08:00
goldquest
7528ddf610 typo 2013-05-29 16:54:39 +02:00
goldquest
121c02c74f Grant access, when valid session is available and sessionNoPassword is set 2013-05-29 16:53:14 +02:00
Siebrand Mazeland
7d81a6d042 Localisation updates from http://translatewiki.net. 2013-05-26 09:36:03 +00:00
Siebrand Mazeland
9c69753a35 Localisation updates from http://translatewiki.net. 2013-05-20 09:30:23 +00:00
Siebrand Mazeland
8ee15d4003 Localisation updates from http://translatewiki.net. 2013-05-12 18:40:40 +00:00
Siebrand Mazeland
923c01745b Localisation updates from http://translatewiki.net. 2013-05-09 13:39:04 +00:00
Marcel Klehr
90d1598688 Merge pull request #1751 from goldquest/dev_IE8-fix
Fixing IE8 errors
2013-05-08 07:19:15 -07:00
John McLear
2273cf9ed6 Merge pull request #1740 from ether/feature/add-cs-queue
add a changeset queue
2013-04-28 13:58:08 -07:00
John McLear
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
Siebrand Mazeland
702a300164 Localisation updates from http://translatewiki.net. 2013-04-28 17:48:19 +00:00
Marcel Klehr
2c855de6f6 Add a server-side changeset queue per pad
fixes #1573
2013-04-27 23:04:42 +02:00
Brian Emerick
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
Spruce (Felix Fichte)
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
spruce
6ea5efbcc3 Update SocketIORouter.js
Changed the setting of client.remoteAddress
2013-04-22 23:01:41 +03:00
Siebrand Mazeland
f0f98b41fe Localisation updates from http://translatewiki.net. 2013-04-21 12:29:25 +00:00