| Age | Commit message (Collapse) | Author | |
|---|---|---|---|
| 2013-06-15 | Merge pull request #1807 from dummys/develop | John McLear | |
| added log4js 0.6.6 | |||
| 2013-06-15 | Merge pull request #1810 from clkao/travis-fixes | John McLear | |
| Fix sauce configuration | |||
| 2013-06-15 | Merge pull request #1811 from clkao/author-style-hook | John McLear | |
| Document author style hook and provide outer_ace dynamic css manager | |||
| 2013-06-15 | Update sauce key | Chia-liang Kao | |
| 2013-06-15 | document aceSetAuthorStyle | Chia-liang Kao | |
| 2013-06-15 | allow cssmanager to manage outer_ace | Chia-liang Kao | |
| 2013-06-13 | added log4js 0.6.6 | dummys | |
| 2013-06-12 | Merge pull request #1805 from rgbkrk/proto_cleanup | John McLear | |
| Delete URL schemes which don't have an RFC standard | |||
| 2013-06-12 | Only kept URL schemes which have an RFC standard | Kyle Kelley | |
| 2013-06-12 | Merge pull request #1804 from rgbkrk/proto_cleanup | John McLear | |
| Cleaning out gophers | |||
| 2013-06-12 | Cleanup gophers | Kyle Kelley | |
| 2013-06-10 | Localisation updates from http://translatewiki.net. | Siebrand Mazeland | |
| 2013-06-09 | Merge pull request #1797 from clkao/author-style-hook | John McLear | |
| Author style hook | |||
| 2013-06-07 | use SAUCE_ACCESS_KEY | Chia-liang Kao | |
| 2013-06-06 | new hook: aceSetAuthorStyle | Chia-liang Kao | |
| 2013-06-06 | refactor setAuthorStyle | Chia-liang Kao | |
| 2013-06-02 | Merge pull request #1786 from clkao/saferun | John McLear | |
| Fix safeRun that tries to shift on subsequent restarts | |||
| 2013-05-29 | Fix safeRun that tries to shift on subsequent restarts | Chia-liang Kao | |
| 2013-05-26 | Merge pull request #1785 from interesse/saferun_args | John McLear | |
| Pass arguments from safeRun.sh to run.sh | |||
| 2013-05-26 | Pass arguments from safeRun.sh to run.sh | Jens Herrmann | |
| 2013-05-26 | Localisation updates from http://translatewiki.net. | Siebrand Mazeland | |
| 2013-05-20 | Localisation updates from http://translatewiki.net. | Siebrand Mazeland | |
| 2013-05-12 | Localisation updates from http://translatewiki.net. | Siebrand Mazeland | |
| 2013-05-09 | Localisation updates from http://translatewiki.net. | Siebrand Mazeland | |
| 2013-05-08 | Merge pull request #1751 from goldquest/dev_IE8-fix | Marcel Klehr | |
| Fixing IE8 errors | |||
| 2013-05-04 | Merge pull request #1770 from ether/feature/travis_fix | John McLear | |
| Fixed sauce labs key in travis config file | |||
| 2013-05-04 | Let travis use sauce labs key of the etherpad user | Peter 'Pita' Martischka | |
| 2013-04-28 | Merge pull request #1740 from ether/feature/add-cs-queue | John McLear | |
| add a changeset queue | |||
| 2013-04-28 | Merge pull request #1760 from bemeric1/develop | John McLear | |
| Issue #1652: Fix to client-side-induced changeset spamming. | |||
| 2013-04-28 | Localisation updates from http://translatewiki.net. | Siebrand Mazeland | |
| 2013-04-27 | Add a server-side changeset queue per pad | Marcel Klehr | |
| fixes #1573 | |||
| 2013-04-24 | Issue #1625: Fix to client-side-induced changeset spamming. | Brian Emerick | |
| 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-21 | Localisation updates from http://translatewiki.net. | Siebrand Mazeland | |
| 2013-04-18 | Merge pull request #1754 from goldquest/patch-1 | John McLear | |
| Just a missing character in README | |||
| 2013-04-18 | Just a missing character | Timo Welde | |
| 2013-04-17 | fixed spacing | goldquest | |
| 2013-04-17 | Merge pull request #1750 from ether/fix/authorship-once-and-4-all | John McLear | |
| Fix authorship sanitization | |||
| 2013-04-17 | use document, not doc | goldquest | |
| 2013-04-17 | IE8 don't knows the Array.forEach function (simple version fix) | goldquest | |
| 2013-04-17 | IE8 complains, if catch block is missing | goldquest | |
| 2013-04-17 | Remove console.log in content collector | Marcel Klehr | |
| fixes #1731 | |||
| 2013-04-17 | Fix authorship sanitization | Marcel Klehr | |
| author colors wouldn't get disttributed, if their id was greater than 9 (due to apool encoding them to base 36) | |||
| 2013-04-16 | Merge branch 'develop' of github.com:ether/etherpad-lite into develop | John McLear | |
| 2013-04-16 | still express is stuck at 3.1.0 | John McLear | |
| 2013-04-15 | Merge pull request #1745 from ether/master | John McLear | |
| Pull tags | |||
| 2013-04-15 | Merge pull request #1743 from ether/dont-crash-on-export-abiword | John McLear | |
| catch error on export | |||
| 2013-04-15 | catch error on export | John McLear | |
| 2013-04-15 | Refactor SocketIORouter | Marcel Klehr | |
| 2013-04-15 | Merge pull request #1739 from ether/update-connect | John McLear | |
| Update connect and express | |||
| 2013-04-15 | Merge branch 'develop' of github.com:ether/etherpad-lite into update-connect | John McLear | |
 |
index : etherpad-lite | |
| Really real-time collaborative document editing. http://etherpad.org | cos |
| summaryrefslogtreecommitdiff |