aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Another "unneeded" file that's actually needed...Jeff Mitchell2010-04-081-0/+28
* Remove unneeded parts of the configuration block, since no need to check lice...Jeff Mitchell2010-04-083-46/+3
* Can't really use SSL when checking for it always returns false, right?Jeff Mitchell2010-04-081-8/+0
* Add back pro-config.js, which was mistakenly thought of as "unneeded" -- not ...Jeff Mitchell2010-04-081-0/+55
* Merge branch 'master' of git@github.com:redhog/padEgil Moeller2010-04-080-0/+0
|\
| * Revert "Fix typo in previous conversion from SUPERDOMAINS"Egil Moeller2010-04-081-1/+1
| * Revert "added localbox.info to the topdomains of the config file, i think it'...Egil Moeller2010-04-081-1/+1
| * added localbox.info to the topdomains of the config file, i think it's better...Peter Martischka2010-04-081-1/+1
| * Fix typo in previous conversion from SUPERDOMAINSJeff Mitchell2010-04-081-1/+1
* | Merge branch 'jefferai' of git://github.com/jefferai/padEgil Moeller2010-04-081-1/+1
|\ \
| * | Fix typo in previous conversion from SUPERDOMAINSJeff Mitchell2010-04-081-1/+1
* | | Merge branch 'master' of git://github.com/Pita/padEgil Moeller2010-04-081-1/+1
|\ \ \
| * | | added localbox.info to the topdomains of the config file, i think it's better...Peter Martischka2010-04-081-1/+1
| | |/ | |/|
* | | Revert "Fix typo in previous conversion from SUPERDOMAINS"Egil Moeller2010-04-081-1/+1
* | | Revert "added localbox.info to the topdomains of the config file, i think it'...Egil Moeller2010-04-081-1/+1
* | | added localbox.info to the topdomains of the config file, i think it's better...Peter Martischka2010-04-081-1/+1
* | | Fix typo in previous conversion from SUPERDOMAINSJeff Mitchell2010-04-081-1/+1
|/ /
* | Merge branch 'jefferai' of git://github.com/jefferai/padPeter Martischka2010-04-0812-25/+58
|\|
| * Actually use the new teamsite color.Jeff Mitchell2010-04-071-4/+4
| * I didn't realize someone had gotten rid of SUPERDOMAINS. Use domainEnabled in...Jeff Mitchell2010-04-071-1/+1
| * Modify to add some templates for the added parameters, plus rearrange into al...Jeff Mitchell2010-04-071-3/+6
| * Add REMOVED_COS_OF_COS markers so those that want to enable support provided ...Jeff Mitchell2010-04-072-1/+8
| * Add useHttpsUrls and hidePorts config optionsJeff Mitchell2010-04-071-0/+5
| * Many users may add the cos.jar file for import/export; place in .gitignore so...Jeff Mitchell2010-04-071-0/+1
| * Always render the navigation menu in the administration page; there aren't li...Jeff Mitchell2010-04-071-2/+0
| * Put in CSS to show the new teamsite link in a different color. I think the co...Jeff Mitchell2010-04-071-0/+14
| * If hidePorts is enabled, don't show port numbers in e.g. emails. Useful when ...Jeff Mitchell2010-04-071-2/+2
| * Instead of only working with superdomains that have two parts, consume each p...Jeff Mitchell2010-04-071-3/+6
| * Fix up getTempSigninUrl option so that it uses https when appropriate and htt...Jeff Mitchell2010-04-071-4/+10
| * Forgot the -p on the end of the mysql lines...this fixes my previous commit p...Jeff Mitchell2010-04-071-2/+2
| * You need to have the root mysql password -- so there is really no need to als...Jeff Mitchell2010-04-071-5/+0
| * Look for the etherpad.local.properties file in the logical location (same dir...Jeff Mitchell2010-04-072-1/+2
* | Merge branch 'master' of git://github.com/ether/padPeter Martischka2010-04-083-3/+3
|\|
| * Fixing commit of local-configEgil Moeller2010-04-071-1/+1
| * Merge branch 'master' of git://github.com/Pita/padEgil Moeller2010-04-0719-61/+97
| |\
| * | Styling bugfixesEgil Moeller2010-04-062-2/+2
* | | Reduced the height of the docbar about 5pxPeter Martischka2010-04-089-18/+17
* | | Fixed some little design bugs of editbarPeter Martischka2010-04-072-33/+37
| |/ |/|
* | Fixed little design bug of the save buttonPeter Martischka2010-04-071-2/+1
* | Merge branch 'master' of git://github.com/redhog/padPeter Martischka2010-04-0715-86/+259
|\|
| * Better plugin descriptionsEgil Moeller2010-04-062-2/+2
| * More plugin manager stylingEgil Moeller2010-04-062-1/+27
| * Changed button-specific coloring to a classEgil Moeller2010-04-062-2/+2
| * Changed right hand rounded corner to silverEgil Moeller2010-04-061-1/+1
| * Styling for plugin managerEgil Moeller2010-04-062-10/+59
| * Updated SUPERDOMAINS to use /etc/etherpad.localdev-default.propertiesEgil Moeller2010-04-055-11/+13
| * Revert "Changed the default setup to a production setup, use 'dev' as a param...Egil Moeller2010-04-051-3/+4
| * Plugin-support for docbar menuEgil Moeller2010-04-051-12/+18
| * Merge branch 'master' of git://github.com/cjb/padEgil Moeller2010-04-056-52/+141
| |\
| | * Revamped the environment variable testing section, which now asks for values ...Jeppe Toustrup2010-04-051-38/+73