Permalink
Commits on May 14, 2013
  1. Merge pull request #324 from tuxdna/master

    Please pull one liner to fix openjdk 64 bit setup on ubuntu
    rhelmer committed May 14, 2013
Commits on Nov 26, 2012
  1. Merge pull request #325 from jmendeth/patch-1

    Correct repo link at README
    JohnMcLear committed Nov 26, 2012
  2. Correct repo link at README

    jmendeth committed Nov 26, 2012
Commits on Nov 6, 2012
  1. Detect java-openjdk-amd64 on Ubuntu

    Detect Java 64bit installation location of OpenJDK on Ubuntu
    tuxdna committed Nov 6, 2012
Commits on May 30, 2012
  1. Update README.md

    JohnMcLear committed May 30, 2012
Commits on Feb 10, 2012
  1. Update README.md

    JohnMcLear committed Feb 10, 2012
Commits on Nov 12, 2011
  1. Fixes #301

    JohnMcLear committed Nov 12, 2011
Commits on Oct 21, 2011
  1. .gitignore for favicon.ico and robots.txt -- the default files can co…

    …me along on first checkout but should then stay out of the way from git-status
    sesam committed Oct 21, 2011
  2. Merge pull request #297 from fmarier/issue_288

    Fix "Share this pad" button. Closes 288. Closes 293.
    sesam committed Oct 21, 2011
  3. Fix "Share this pad" button (issue 288)

    This is just applying the fix that erdgeist put on issue 293.
    Francois Marier committed Oct 21, 2011
  4. Merge pull request #296 from fmarier/missing_images

    Resurrect missing images
    JohnMcLear committed Oct 21, 2011
  5. Resurrect missing images

    These two images were removed in 8f38b84
    but are still used here:
    
      src/themes/nano/js/pad2.js
      src/themes/micro/js/pad2.js
      src/static/js/pad2.js
    
    This was causing a bunch of 404s to show up in Firebug.
    Francois Marier committed Oct 21, 2011
Commits on Oct 3, 2011
  1. Merge pull request #294 from fmarier/issue140

    Make sure the /var/log/etherpad directory always exists (issue #140)
    JohnMcLear committed Oct 3, 2011
  2. Make sure the /var/log/etherpad directory always exists (issue #140)

    Prior to this change, reconfiguring the package would delete the
    /var/log/etherpad directory (see prerm file) and not recreate it
    afterwards.
    Francois Marier committed Oct 3, 2011
Commits on Sep 5, 2011
  1. Merge pull request #292 from Gared/patch-1

    Fixed error when opening "Application Configuration" on pro-pads
    JohnMcLear committed Sep 5, 2011
Commits on Aug 14, 2011
  1. Merge pull request #291 from btuduri/master

    Deconf french po.
    Egil Möller committed Aug 14, 2011
Commits on Jul 18, 2011
  1. Merge pull request #284 from absynce/master

    Add TLS support to SMTP server configuration
    Egil Möller committed Jul 18, 2011
Commits on Jul 14, 2011
  1. Merge pull request #285 from Gared/master

    Delete pads
    Egil Möller committed Jul 14, 2011
  2. Merge pull request #280 from johnuren1980/master

    pad_control.js change to fix a bug found in my instance of Etherpad.
    Egil Möller committed Jul 14, 2011
  3. Merge pull request #282 from Yuuji/maxlines_bug239

    Bugfix #239: Remove max height in ace
    Egil Möller committed Jul 14, 2011
  4. Merge pull request #283 from Yuuji/admin_rights_268

    Bugfix: pro account admin pages are now secured (Bug #268)
    Egil Möller committed Jul 14, 2011
Commits on Jul 13, 2011
  1. Add support for smtp starttls (required for gmail as smtp server) - n…

    …ew config: config.smtpStartTls, default: false
    absynce committed Jul 13, 2011
  2. Bugfix #239: Remove max height in ace

    sMesHer committed Jul 13, 2011
Commits on Jun 30, 2011
  1. Added errorMessage variable declaration to prevent "reconnect" calls …

    …causing a java exception
    johnuren1980 committed Jun 30, 2011
Commits on Jun 24, 2011
  1. Merge pull request #279 from ouvrages/master

    fixed missing '[[' when dash is the default shell
    JohnMcLear committed Jun 24, 2011
Commits on Jun 21, 2011
  1. This small fix reduces the load time of a 19k revisions pad from 2 mi…

    …nutes to 20s, cause we skip creating rough changests biger then 1k
    Pita committed with Pita Poison Jun 21, 2011
Commits on Jun 1, 2011
  1. Merge pull request #270 from kingkaeru/master

    Modifications to support cygwin
    JohnMcLear committed Jun 1, 2011
Commits on May 31, 2011
  1. modifications to support cygwin building and running. credit goes to …

    …gyokuro for his work in getting earlier pad versions to build with cygwin.
    randyho-kk committed May 31, 2011