summaryrefslogtreecommitdiffstats
path: root/etherpad/src/etherpad/pro/pro_utils.js
Commit message (Expand)AuthorAgeFilesLines
* Merge remote branch 'upstream/master'Alexander Sulfrian2010-06-081-0/+169
|\
| * Fix typo in previous conversion from SUPERDOMAINSJeff Mitchell2010-04-081-1/+1
| * I didn't realize someone had gotten rid of SUPERDOMAINS. Use domainEnabled in...Jeff Mitchell2010-04-071-1/+1
| * Instead of only working with superdomains that have two parts, consume each p...Jeff Mitchell2010-04-071-3/+6
| * Updated SUPERDOMAINS to use /etc/etherpad.localdev-default.propertiesEgil Moeller2010-04-051-2/+2
| * Opportunity to enable/disable the Pro Feature with a config flagPeter Martischka2010-04-041-1/+4
| * reorganizing the first level of folders (trunk/branch folders are not the git...Elliot Kroo2010-03-111-0/+163
* reverted folder structure change for better mergeing with upstreamAlexander Sulfrian2010-06-081-165/+0
* fixed superdomain handlingalexanders@b2ef00c0-3703-41da-baef-cfe82387ac0c2010-02-031-11/+9
* fixed handling of superdomainsalexanders@b2ef00c0-3703-41da-baef-cfe82387ac0c2010-02-031-3/+4
* fixed handling of superdomainsalexanders@b2ef00c0-3703-41da-baef-cfe82387ac0c2010-02-031-4/+7
* changed hardcoded etherpad.com domainsalexanders@b2ef00c0-3703-41da-baef-cfe82387ac0c2010-02-031-1/+1
* removed obsolete svn folder from hg treealexanders@b2ef00c0-3703-41da-baef-cfe82387ac0c2010-02-031-0/+163