Permalink
Commits on Apr 15, 2012
  1. Tweaked travis.yaml

    josephg committed Apr 15, 2012
  2. Tweaked travis.yaml

    josephg committed Apr 15, 2012
  3. Hopefully fixed travisCI build

    josephg committed Apr 15, 2012
Commits on Apr 14, 2012
  1. Merge pull request #80 from espadrine/master

    josephg committed Apr 14, 2012
    CodeMirror text editor plug-in
Commits on Mar 21, 2012
  1. CodeMirror: got rid of snapshot.

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

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

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

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

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

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

    espadrine committed Mar 19, 2012
    - Based on the ace mode.
    - Efficiently updates the DOM.
    - Deals with insert and delete events.
    
    Signed-off-by: Thaddee Tyl <thaddee.tyl@gmail.com>
Commits on Mar 16, 2012
Commits on Mar 6, 2012
  1. Merge pull request #74 from CrypticSwarm/json-api-text-to-textarea

    josephg committed Mar 6, 2012
    allows use of attach_textarea on json sub doc that is text.
Commits on Mar 5, 2012
  1. Merge pull request #76 from espadrine/master

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

    espadrine committed Mar 4, 2012
    Signed-off-by: Thaddee Tyl <thaddee.tyl@gmail.com>
Commits on Feb 26, 2012
  1. Changes a get call to getText for attach_textarea.

    CrypticSwarm committed Feb 26, 2012
    Seems it needs to use getText.
    JSON api provides get
    Text api doesn't
Commits on Feb 24, 2012
  1. adds extension point for Doc.

    CrypticSwarm committed Feb 24, 2012
    This allows new types to hook into it.
    JSON SubDoc type hooks into it.
Commits on Feb 11, 2012
  1. Merge pull request #68 from dcolens/master

    josephg committed Feb 11, 2012
    HEAD request + testing
Commits on Feb 10, 2012
  1. testing for HEAD requests

    dcolens committed Feb 10, 2012
  2. Cleaned up some error handling code in REST frontend, and added a spa…

    josephg committed Feb 10, 2012
    …ce after most responses.
Commits on Feb 9, 2012
Commits on Feb 1, 2012
  1. Merge pull request #57 from wmertens/meta

    josephg committed Feb 1, 2012
    Start of metadata operations and "shout" broadcasting
Commits on Jan 27, 2012
  1. Fix race condition between shouts and ops

    wmertens committed Jan 27, 2012
    Metadata ops were getting acknowledged and the client side code in doc
    allowed for a race condition when shouting while ops were being sent.
Commits on Jan 26, 2012
  1. Merge branch 'master' into meta

    wmertens committed Jan 26, 2012
Commits on Jan 25, 2012
  1. Rebuild client js with shout

    wmertens committed Jan 25, 2012
  2. Merge branch 'master' into meta

    wmertens committed Jan 25, 2012