Permalink
Commits on Jun 3, 2015
  1. Merge pull request #10 from floatingatoll/pull-1

    extend account view restrictions to get/post for all account manage functions
    floatingatoll committed Jun 3, 2015
Commits on Jun 1, 2015
  1. Merge pull request #9 from floatingatoll/pull-1

    account admins may only view account details for accounts associated with their pad
    floatingatoll committed Jun 1, 2015
Commits on Mar 13, 2015
  1. don't source /etc/sysconfig/etherpad here

    We do that in the update script that *calls* this, and that update script also works around a bug caused by mismatched paths. Seems nicer to leave the fix there.
    
    That path could possibly use $ETHERPADDIR as defined here, but I'm not entirely sure that will work on the end system and don't have the time to test properly.
    superawesome committed Mar 13, 2015
Commits on Mar 10, 2015
  1. Merge pull request #8 from floatingatoll/bug1034677

    disable and hide PDF/ODT/DOC import/export [#1034677]
    floatingatoll committed Mar 10, 2015
Commits on Mar 5, 2015
Commits on Jan 20, 2015
  1. reserve a tiny bit more memory for java

    From 75% of free up to 80% of free. Just squeezing a bit more out of a dedicated system.
    superawesome committed Jan 20, 2015
Commits on Dec 31, 2014
  1. now that we're on JDK7, we can use G1GC

    This simplifies some of the run command by removing tuning that is no
    longer needed/recommended.
    Jake Maul committed Dec 31, 2014
Commits on Dec 26, 2014
  1. Adding New Relic module - newrelic-java-3.12.1.zip

    Needs JAVA_OPTS to be exported to call this
    Also needs a newrelic.yml file to know about app, license, etc
    Jake Maul committed Dec 26, 2014
Commits on Dec 19, 2014
  1. switch to jdk7 compatible jcaptcha

    meyarivan committed with Jake Maul Sep 15, 2014
Commits on Jun 21, 2014
  1. Merge pull request #5 from cturra/master

    bug 1026574
    cturra committed Jun 21, 2014
Commits on Jun 17, 2014
  1. Merge pull request #4 from cturra/master

    internal bug 1026574 to support google search appliance.
    cturra committed Jun 17, 2014
Commits on Mar 11, 2014
  1. Merge pull request #2 from Chaasof/master

    Changing BrowserID by Persona
    superawesome committed Mar 11, 2014
Commits on Sep 3, 2013
  1. Merge pull request #3 from rhelmer/bug909352-turn-off-spellcheck

    fixes bug 909352 - turn off spellcheck for pads
    superawesome committed Sep 3, 2013
Commits on Aug 26, 2013
Commits on Mar 6, 2013
  1. Need more Perm Gen space... multiple fixes

    add MAXPERM, to set -XX:MaxPermSize java option
    add -XX:+CMSClassUnloadingEnabled option to hopefully trim down Perm Gen
    
    Unrelated:
    
    remove dead code/comments
    move GC logs to /var/log/etherpad
    make GC logs be hostname and time-dependent, so we don't overwrite them
    Jake Maul committed Mar 6, 2013
Commits on Jan 26, 2013
  1. Changing BrowserID by Persona

    Chaasof committed Jan 26, 2013
Commits on Jan 23, 2013
  1. Merge branch 'master' of github.com:mozilla/pad

    Jake Maul committed Jan 23, 2013
Commits on Jan 9, 2013
  1. Merge pull request #1 from fmarier/new_persona_urls

    Update the BrowserID/Persona URLs to the new ones
    superawesome committed Jan 9, 2013
Commits on Dec 29, 2012
  1. New column Public/Private in padlist

    Gared committed with Jake Maul Oct 9, 2011
  2. Added possibility for every user to deactivate your own account

    from:
    Gared@c403f6d
    manual merge due to BrowserID changes in mozilla/pad
    Jake Maul committed Dec 29, 2012
  3. Removed possibility to change other user names on pad

    (cherry picked from commit d2c9ad8)
    Gared committed with Jake Maul Apr 15, 2012
  4. iOS Patch

    (cherry picked from commit d247b41b02fa58c7fd17bbd783222c1b81fe9971)
    Yuuji committed with Jake Maul Oct 27, 2011
  5. Ability to full text save existing pads

    (cherry picked from commit 707d77d)
    Egil Moeller committed with Jake Maul Sep 23, 2011
  6. Full text save

    (cherry picked from commit c196016)
    Egil Moeller committed with Jake Maul Sep 16, 2011
  7. Added pro config to make new team pads public by default

    (cherry picked from commit e7c03c6)
    Gared committed with Jake Maul Dec 26, 2012
Commits on Dec 26, 2012
  1. cleanup, use 80% of free mem, more GC details, and switch to G1GC fro…

    …m CMS
    Jake Maul committed Dec 26, 2012
Commits on Dec 14, 2012
  1. allow higher MXRAM and a bigger young generation

    Jake Maul committed Dec 14, 2012
Commits on Dec 11, 2012
  1. Update the BrowserID/Persona URLs to the new ones

    This will eliminate an unnecessary redirection.
    fmarier committed Dec 11, 2012
Commits on Nov 27, 2012
  1. various run-local.sh changes

    higher MXRAM cap (2GB->10GB)
    remove MAXTHREADS settings... don't think we need this
    remove CMS incremental mode, use plain CMS mode (we have lots of cores)
    explicitly set -XX:NewRatio=3...
        otherwise young gen is *much* smaller, 3 is *not* the default!
    Jake Maul committed Nov 27, 2012