Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Commits on Oct 2, 2012
Commits on Sep 30, 2012
Commits on Sep 29, 2012
  1. @Pita
Commits on Sep 28, 2012
  1. @marcelklehr

    Merge pull request #1025 from amtep/develop

    marcelklehr authored
    Fix race condition and a stack error caused by too old changesets
Commits on Sep 27, 2012
  1. @amtep

    Prettify session handling in handleUserChanges

    amtep authored
    Also add a comment to explain what's going on with thisSession.
    No changes in behavior.
Commits on Sep 26, 2012
  1. @amtep

    Fix crash when client submits changeset based on too-old revision

    amtep authored
    We had a problem with the server running out of stack space if a client
    submitted a changeset based on a revision more than about 1000 revs old.
    (944 was our cutoff but yours may vary). This happened in the wild with
    about 30 people editing via flaky wifi. A disconnected client would try
    to submit a fairly old changeset when reconnecting, and a few minutes
    was enough for 30 people to generate that many revs.
    
    The stack kept growing because pad.getRevisionChangeset was being answered
    from the cache, so no I/O interrupted the callback chain. (This was seen with
    mysql, I don't know about other backends.)
    
    This patch forces a nextTick every 200 revisions to solve this problem.
  2. @amtep

    Fix sessioninfos race that can cause crash during USER_CHANGES handling

    amtep authored
    When stress testing etherpad-lite we occasionally got this error:
    
    TypeError: Cannot read property 'author' of undefined
        at /home/etherpad/etherpad-lite/src/node/handler/PadMessageHandler.js:556:47
    
    handleUserChanges was accessing sessioninfos[client.id].author in a callback,
    after spending some time in the loop that updates the changeset to the
    latest revision. It's possible for a disconnect request to be processed
    during that loop so the session might no longer be there.
    
    This patch fixes it by looking up the author at the start of the function.
Commits on Sep 22, 2012
  1. @marcelklehr

    Merge pull request #1018 from cweider/fix-windows

    marcelklehr authored
    Upgrade to Yajsml with another Windows backslash fix.
  2. @JohnMcLear

    Merge pull request #1019 from marcelklehr/feature/github-contributing…

    JohnMcLear authored
    …-file
    
    Let Github know our Dev Guidelines
  3. @marcelklehr
  4. @cweider
Commits on Sep 19, 2012
  1. @JohnMcLear

    Merge pull request #1015 from marcelklehr/fix/multiSession-foreach

    JohnMcLear authored
    Fix async.forEach in MultiSession code
  2. @marcelklehr
  3. @marcelklehr

    Revert "Fixed foreach loop on session IDs, was breaking EP on single …

    marcelklehr authored
    …session in cookie."
    
    This reverts commit 443a71b.
    
    	modified:   src/node/db/SecurityManager.js
Commits on Sep 18, 2012
  1. @JohnMcLear

    Merge pull request #1014 from marcelklehr/feature/list-all-groups

    JohnMcLear authored
    Add listAllGroups API endpoint
  2. @JohnMcLear

    Merge pull request #1013 from eldiddio/develop

    JohnMcLear authored
    Fixed foreach loop on session IDs, was breaking EP on single session in cookie
  3. @JohnMcLear
  4. @JohnMcLear

    List 12 plugins instead of 4

    JohnMcLear authored
    4 was a bit stingy :)  12 is a bit more friendly from a UX persepctive.
Commits on Sep 17, 2012
  1. @JohnMcLear

    Merge pull request #1008 from marcelklehr/fix/api-v1.1

    JohnMcLear authored
    Still support API endpoints of v1 in v1.1
  2. @marcelklehr

    Add listAllGroups API endpoint

    marcelklehr authored
    Adds a database key that lists all groups
  3. @marcelklehr
  4. @JohnMcLear

    Merge pull request #1005 from cweider/fix-ie

    JohnMcLear authored
    Remember, the `class` symbol is reserved in some environments.
  5. @cweider

    Remember, the `class` symbol is reserved in some environments.

    cweider authored
    Fixes issue introduced in 9be69ef.
Commits on Sep 15, 2012
  1. @marcelklehr

    Resolve merge conflicts

    marcelklehr authored
    Conflicts:
    	README.md
Commits on Sep 14, 2012
  1. @JohnMcLear

    Update src/package.json

    JohnMcLear authored
    Bump to v 1.1.2
  2. @JohnMcLear

    Merge pull request #992 from gedion/develop

    JohnMcLear authored
    Added hooks and made some ace functions available to editorInfo Object
  3. @JohnMcLear

    Merge pull request #999 from lepidum/develop

    JohnMcLear authored
    Fixed international composition issues (e.g., Japanese Input method)
  4. Merge pull request #2 from ayokura/fix-international-composition

    lepidum authored
    Fixed international composition issues (e.g., Japanese Input method)
Commits on Sep 13, 2012
  1. @ayokura

    fix for InternationalComposition(e.g., Japanese Input)

    ayokura authored
    moved inInternationalComposition from Ace2Inner to top window
    fix bindTheEventHandlers() because ie9 implement CompositionEvent
    when inInternationalComposition, NEW_CHANGES msg and ACCEPT_COMMIT msg
    are pushed msgQueue.
    when handleUserChanges(), apply msgQueue.
  2. @JohnMcLear

    Merge pull request #998 from marcelklehr/bump/api-version-1.1

    JohnMcLear authored
    Bump API version to v1.1
  3. @marcelklehr

    Bump API version to v1.1

    marcelklehr authored
Commits on Sep 12, 2012
  1. @JohnMcLear

    Merge pull request #996 from marcelklehr/doc/hook-return-values

    JohnMcLear authored
    Document, how return values of hooks are handled.
  2. @marcelklehr
Something went wrong with that request. Please try again.