Skip to content
Commits on May 5, 2012
  1. @josephg

    Merge pull request #87 from CrypticSwarm/make-examples-use-uncompress…

    …edjs
    
    points the examples to use uncompressed js
    josephg committed May 4, 2012
  2. @josephg

    Merge pull request #86 from andtan/master

    Options to socketio could not be set
    josephg committed May 4, 2012
Commits on Apr 24, 2012
  1. @nornagon

    Merge pull request #89 from woloski/patch-1

    Use coffee-script =1.1.0 instead of ">", doesn't compile with 1.3 yet
    nornagon committed Apr 24, 2012
  2. @woloski

    use coffee-script =1.1.0 instead of ">", there seems to be an issue w…

    …ith 1.3.1 (more investigation needed to understand if this comes from the usage of coffee on sharejs or it's a bug on coffee, for now this would be a short-term fix)
    woloski committed Apr 24, 2012
Commits on Apr 19, 2012
  1. @CrypticSwarm

    points the examples to use uncompressed js

    Closes issue #59
    (share#59)
    sed is my friend
    CrypticSwarm committed Apr 19, 2012
  2. @gorillatron
Commits on Apr 15, 2012
  1. @josephg

    Tweaked travis.yaml

    josephg committed Apr 15, 2012
  2. @josephg

    Tweaked travis.yaml

    josephg committed Apr 15, 2012
  3. @josephg

    Hopefully fixed travisCI build

    josephg committed Apr 15, 2012
  4. @josephg
  5. @josephg
Commits on Apr 14, 2012
  1. @josephg

    Merge pull request #80 from espadrine/master

    CodeMirror text editor plug-in
    josephg committed Apr 14, 2012
Commits on Mar 21, 2012
  1. @espadrine

    CodeMirror: got rid of snapshot.

    Signed-off-by: Thaddee Tyl <thaddee.tyl@gmail.com>
    espadrine committed Mar 21, 2012
  2. @espadrine

    CodeMirror: using extendDoc.

    Thanks to Wout Mertens for pointing this out.
    
    Signed-off-by: Thaddee Tyl <thaddee.tyl@gmail.com>
    espadrine committed Mar 21, 2012
Commits on Mar 19, 2012
  1. @espadrine

    CodeMirror: small renaming

    detach_ace → detach_cm
    
    Signed-off-by: Thaddee Tyl <thaddee.tyl@gmail.com>
    espadrine committed Mar 19, 2012
  2. @espadrine

    CodeMirror: example page CSS tweaks.

    Signed-off-by: Thaddee Tyl <thaddee.tyl@gmail.com>
    espadrine committed Mar 19, 2012
  3. @espadrine

    CodeMirror: Merge from ShareJS.

    Conflicts:
    	webclient/share.js
    
    Signed-off-by: Thaddee Tyl <thaddee.tyl@gmail.com>
    espadrine committed Mar 19, 2012
  4. @espadrine

    CodeMirror editor: Example page.

    Signed-off-by: Thaddee Tyl <thaddee.tyl@gmail.com>
    espadrine committed Mar 19, 2012
  5. @espadrine

    CodeMirror text editor plug-in.

    - Based on the ace mode.
    - Efficiently updates the DOM.
    - Deals with insert and delete events.
    
    Signed-off-by: Thaddee Tyl <thaddee.tyl@gmail.com>
    espadrine committed Mar 19, 2012
Commits on Mar 16, 2012
  1. @wmertens
Commits on Mar 6, 2012
  1. @josephg

    Merge pull request #74 from CrypticSwarm/json-api-text-to-textarea

    allows use of attach_textarea on json sub doc that is text.
    josephg committed Mar 6, 2012
Commits on Mar 5, 2012
  1. @josephg

    Merge pull request #76 from espadrine/master

    Duplicate assignment to same variable in text.coffee (trivial fix).
    josephg committed Mar 4, 2012
Commits on Mar 4, 2012
  1. @espadrine

    text.coffee: duplicate assignment to same variable

    Signed-off-by: Thaddee Tyl <thaddee.tyl@gmail.com>
    espadrine committed Mar 4, 2012
Commits on Feb 26, 2012
  1. @CrypticSwarm

    Changes a get call to getText for attach_textarea.

    Seems it needs to use getText.
    JSON api provides get
    Text api doesn't
    CrypticSwarm committed Feb 25, 2012
Commits on Feb 24, 2012
  1. @CrypticSwarm

    adds extension point for Doc.

    This allows new types to hook into it.
    JSON SubDoc type hooks into it.
    CrypticSwarm committed Feb 24, 2012
  2. @CrypticSwarm
Commits on Feb 11, 2012
  1. @josephg

    Merge pull request #68 from dcolens/master

    HEAD request + testing
    josephg committed Feb 10, 2012
Commits on Feb 10, 2012
  1. @dcolens
  2. @dcolens

    testing for HEAD requests

    dcolens committed Feb 10, 2012
  3. @josephg

    Cleaned up some error handling code in REST frontend, and added a spa…

    …ce after most responses.
    josephg committed Feb 10, 2012
  4. @josephg
Commits on Feb 9, 2012
  1. @josephg
Commits on Feb 1, 2012
  1. @josephg

    Merge pull request #57 from wmertens/meta

    Start of metadata operations and "shout" broadcasting
    josephg committed Jan 31, 2012
Commits on Jan 27, 2012
  1. @wmertens
  2. @wmertens

    Fix race condition between shouts and ops

    Metadata ops were getting acknowledged and the client side code in doc
    allowed for a race condition when shouting while ops were being sent.
    wmertens committed Jan 27, 2012
Something went wrong with that request. Please try again.