summaryrefslogtreecommitdiffstats
path: root/etherpad/src/main.js
Commit message (Expand)AuthorAgeFilesLines
* Merge remote branch 'upstream/master'Alexander Sulfrian2010-06-081-0/+434
|\
| * Merge branch 'master' of http://github.com/ether/padPeter Martischka2010-04-151-8/+12
| |\
| | * Add clarifying commentsSimon Bohlin2010-04-141-8/+12
| * | Revert "Can't really use SSL when checking for it always returns false, right?"Peter Martischka2010-04-091-0/+8
| |/
| * Can't really use SSL when checking for it always returns false, right?Jeff Mitchell2010-04-081-8/+0
| * Updated SUPERDOMAINS to use /etc/etherpad.localdev-default.propertiesEgil Moeller2010-04-051-1/+1
| * Merge branch 'master' of git://github.com/cjb/padEgil Moeller2010-04-051-1/+2
| |\
| | * Make config parsing more robustChris Ball2010-04-051-1/+2
| * | Updated the plugin manager to use the admin auth systemEgil Moeller2010-04-051-2/+0
| * | Bugfix to handlePath hooks, and to the array concatenation in callHookEgil Moeller2010-04-041-14/+16
| |/
| * Made handlePaths from plugins override paths from mainEgil Moeller2010-03-271-13/+14
| * Merge branch 'master' into plugin-frameworkEgil Moeller2010-03-221-1/+11
| * reorganizing the first level of folders (trunk/branch folders are not the git...Elliot Kroo2010-03-111-0/+422
* reverted folder structure change for better mergeing with upstreamAlexander Sulfrian2010-06-081-418/+0
* rebranded for pad.spline.inf.fu-berlin.deAlexander Sulfrian2010-02-161-5/+3
* removed help/billing, changed some email adessesalexanders@b2ef00c0-3703-41da-baef-cfe82387ac0c2010-02-031-2/+0
* fixed handling of superdomainsalexanders@b2ef00c0-3703-41da-baef-cfe82387ac0c2010-02-031-1/+1
* 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/+422
generated by cgit v1.2.3-1-g7c22 (git 2.25.1) at 2024-06-10 15:39:29 +0000