Permalink
Switch branches/tags
Nothing to show
Commits on Jan 27, 2012
  1. Added update script to .gitignore

    Etherpad Server committed Jan 27, 2012
  2. Merge 'upstream/master' into appendto-changes

    Etherpad Server committed Jan 27, 2012
  3. Levi's changes for the appendTo version

    Etherpad Server committed Jan 27, 2012
  4. Beautifying 0ips commit to give settings option, also add warning pri…

    …or to altering everyones view and moved everyones view stuff into my view only that needed to be moved..
    JohnMcLear committed Jan 27, 2012
  5. Fix minor styling isue where focus chat box would try to show up even…

    … if chat was stuck to screen
    JohnMcLear committed Jan 27, 2012
Commits on Jan 26, 2012
  1. Merge pull request #362 from 0ip/nf

    reworked pad.html, added settings menu, sticky chat, ...  Some minor bugs I will sort later tonight..  mostly UI stuff.  Merging for now to allow people to start building other items into settings menu
    JohnMcLear committed Jan 26, 2012
  2. Revert "Text color changes based on author color"

    This reverts commit 4906117.
    Pita committed Jan 26, 2012
Commits on Jan 25, 2012
  1. Merge pull request #359 from booo/master

    close issue #281?
    Pita committed Jan 25, 2012
  2. fix issue #281?

    booo committed Jan 25, 2012
  3. Merge pull request #354 from cnelsonsic/patch-1

    Changing openssl dev package name for Fedora to what it actually is.
    JohnMcLear committed Jan 25, 2012
Commits on Jan 22, 2012
  1. Merge pull request #343 from cweider/modulize

    Modulize
    Pita committed Jan 22, 2012
  2. Merge pull request #344 from cweider/misc-fixins

    Miscellaneous Fixes
    Pita committed Jan 22, 2012
  3. Implement `require` of dependencies for all `pad_*` modules.

    Create a lazily-defined local reference for pad on initialization in each pad module in order to avoid circular dependency. At some point in the future this dependency should instead be injected into each module on initialization.
    cweider committed Jan 16, 2012
  4. Add missing dependency for `timeslider.js`.

    When dependencies are made explicity `pad_savedrevs.js` will be required by several of the `pad_*.js`.
    cweider committed Jan 16, 2012
  5. Isolate all files in a closure.

    cweider committed Jan 16, 2012
  6. Factor out taring process.

    cweider committed Jan 17, 2012
  7. Always use the JS assets processed by Minify.

    This allows the preprocessing that will restrict scope of files to be done once in Minify.
    cweider committed Jan 17, 2012