Permalink
Commits on Sep 19, 2011
Commits on Sep 16, 2011
  1. Merge branch 'polotek'

    marogers committed Sep 16, 2011
  2. don't throw errors, just log them and keep going

    marogers committed Sep 16, 2011
  3. expose api method getAuthorsForRevisionSet

    marogers committed Sep 16, 2011
  4. don't throw errors, just log them and keep going

    marogers committed Sep 16, 2011
  5. expose api method getAuthorsForRevisionSet

    marogers committed Sep 16, 2011
Commits on Sep 15, 2011
  1. Merge branch 'master' of github.com:yammer/etherpad-lite

    * 'master' of github.com:yammer/etherpad-lite:
      be more forgiving with api key file
      wrong key
      temporarily adding static api key
      update deploy files
      Test for yammer environment to prevent breakage
      fix global var leak
      add api support for retrieving pad html
      make html export module more flexible
      fix username being set in querystrings
      Fix directory traversal fixing RegExp
      Fix directory traversal
    
    Conflicts:
    	static/js/pad2.js
    Techwraith committed Sep 15, 2011
  2. Publish on client ready

    Techwraith committed Sep 15, 2011
  3. be more forgiving with api key file

    marogers committed Sep 15, 2011
  4. wrong key

    marogers committed Sep 15, 2011
Commits on Sep 14, 2011
  1. temporarily adding static api key

    marogers committed Sep 14, 2011
  2. fix pad html

    marogers committed Sep 14, 2011
  3. improve graceful showtdown routine

    marogers committed Sep 14, 2011
  4. allow passing in a listening port

    marogers committed Sep 14, 2011
  5. update deploy files

    marogers committed Sep 14, 2011
Commits on Sep 9, 2011
  1. Test for yammer environment to prevent breakage

    marogers committed Sep 9, 2011
  2. Merge branch 'polotek'

    Conflicts:
    	static/js/pad2.js
    marogers committed Sep 9, 2011
  3. fix global var leak

    marogers committed Sep 9, 2011
  4. add api support for retrieving pad html

    marogers committed Sep 9, 2011
  5. make html export module more flexible

    - export function now takes an options object
    - option to return full or partial html
    - back compat maintained via type checking
    marogers committed Sep 9, 2011
Commits on Sep 8, 2011
  1. Merge branch 'mikeal' into polotek

    Conflicts:
    	node/server.js
    marogers committed Sep 8, 2011
  2. fix yammer.js. what is it for?

    marogers committed Sep 8, 2011
Commits on Sep 2, 2011
  1. Merge pull request #152 from chapel/main

    fix username being set in querystrings
    JohnMcLear committed Sep 2, 2011
  2. trying to disable chat

    Dan Erickson committed Sep 2, 2011
  3. another pass at fixing ace.js file includes

    marogers committed Sep 2, 2011
  4. add name to user leave message

    marogers committed Sep 2, 2011
  5. paddies not pages

    marogers committed Sep 2, 2011
  6. always include name in user update messages

    marogers committed Sep 2, 2011