| Commit message (Expand) | Author | Age | Files | Lines |
* | Merge branch 'master' of git@github.com:ether/pad | Egil Moeller | 2010-04-08 | 0 | -0/+0 |
|\ |
|
| * | Merge branch 'master' of git@github.com:redhog/pad | Egil Moeller | 2010-04-08 | 0 | -0/+0 |
| |\ |
|
* | | | Merge branch 'master' of git@github.com:ether/pad | Egil Moeller | 2010-04-08 | 2 | -2/+2 |
|\| |
| |/
|/| |
|
| * | Merge branch 'jefferai' of git://github.com/jefferai/pad | Egil Moeller | 2010-04-08 | 1 | -1/+1 |
| |\ |
|
| | * | Fix typo in previous conversion from SUPERDOMAINS | Jeff Mitchell | 2010-04-08 | 1 | -1/+1 |
| * | | Merge branch 'master' of git://github.com/Pita/pad | Egil Moeller | 2010-04-08 | 1 | -1/+1 |
| |\ \ |
|
| | * | | added localbox.info to the topdomains of the config file, i think it's better... | Peter Martischka | 2010-04-08 | 1 | -1/+1 |
| * | | | Revert "Fix typo in previous conversion from SUPERDOMAINS" | Egil Moeller | 2010-04-08 | 1 | -1/+1 |
| * | | | Revert "added localbox.info to the topdomains of the config file, i think it'... | Egil Moeller | 2010-04-08 | 1 | -1/+1 |
| * | | | added localbox.info to the topdomains of the config file, i think it's better... | Peter Martischka | 2010-04-08 | 1 | -1/+1 |
| * | | | Fix typo in previous conversion from SUPERDOMAINS | Jeff Mitchell | 2010-04-08 | 1 | -1/+1 |
| |/ / |
|
* | | | Revert "Fix typo in previous conversion from SUPERDOMAINS" | Egil Moeller | 2010-04-08 | 1 | -1/+1 |
* | | | Revert "added localbox.info to the topdomains of the config file, i think it'... | Egil Moeller | 2010-04-08 | 1 | -1/+1 |
* | | | added localbox.info to the topdomains of the config file, i think it's better... | Peter Martischka | 2010-04-08 | 1 | -1/+1 |
* | | | Fix typo in previous conversion from SUPERDOMAINS | Jeff Mitchell | 2010-04-08 | 1 | -1/+1 |
|/ / |
|
* | | Merge branch 'jefferai' of git://github.com/jefferai/pad | Peter Martischka | 2010-04-08 | 12 | -25/+58 |
|\| |
|
| * | Actually use the new teamsite color. | Jeff Mitchell | 2010-04-07 | 1 | -4/+4 |
| * | I didn't realize someone had gotten rid of SUPERDOMAINS. Use domainEnabled in... | Jeff Mitchell | 2010-04-07 | 1 | -1/+1 |
| * | Modify to add some templates for the added parameters, plus rearrange into al... | Jeff Mitchell | 2010-04-07 | 1 | -3/+6 |
| * | Add REMOVED_COS_OF_COS markers so those that want to enable support provided ... | Jeff Mitchell | 2010-04-07 | 2 | -1/+8 |
| * | Add useHttpsUrls and hidePorts config options | Jeff Mitchell | 2010-04-07 | 1 | -0/+5 |
| * | Many users may add the cos.jar file for import/export; place in .gitignore so... | Jeff Mitchell | 2010-04-07 | 1 | -0/+1 |
| * | Always render the navigation menu in the administration page; there aren't li... | Jeff Mitchell | 2010-04-07 | 1 | -2/+0 |
| * | Put in CSS to show the new teamsite link in a different color. I think the co... | Jeff Mitchell | 2010-04-07 | 1 | -0/+14 |
| * | If hidePorts is enabled, don't show port numbers in e.g. emails. Useful when ... | Jeff Mitchell | 2010-04-07 | 1 | -2/+2 |
| * | Instead of only working with superdomains that have two parts, consume each p... | Jeff Mitchell | 2010-04-07 | 1 | -3/+6 |
| * | Fix up getTempSigninUrl option so that it uses https when appropriate and htt... | Jeff Mitchell | 2010-04-07 | 1 | -4/+10 |
| * | Forgot the -p on the end of the mysql lines...this fixes my previous commit p... | Jeff Mitchell | 2010-04-07 | 1 | -2/+2 |
| * | You need to have the root mysql password -- so there is really no need to als... | Jeff Mitchell | 2010-04-07 | 1 | -5/+0 |
| * | Look for the etherpad.local.properties file in the logical location (same dir... | Jeff Mitchell | 2010-04-07 | 2 | -1/+2 |
* | | Merge branch 'master' of git://github.com/ether/pad | Peter Martischka | 2010-04-08 | 3 | -3/+3 |
|\| |
|
| * | Fixing commit of local-config | Egil Moeller | 2010-04-07 | 1 | -1/+1 |
| * | Merge branch 'master' of git://github.com/Pita/pad | Egil Moeller | 2010-04-07 | 19 | -61/+97 |
| |\ |
|
| * | | Styling bugfixes | Egil Moeller | 2010-04-06 | 2 | -2/+2 |
* | | | Reduced the height of the docbar about 5px | Peter Martischka | 2010-04-08 | 9 | -18/+17 |
* | | | Fixed some little design bugs of editbar | Peter Martischka | 2010-04-07 | 2 | -33/+37 |
| |/
|/| |
|
* | | Fixed little design bug of the save button | Peter Martischka | 2010-04-07 | 1 | -2/+1 |
* | | Merge branch 'master' of git://github.com/redhog/pad | Peter Martischka | 2010-04-07 | 15 | -86/+259 |
|\| |
|
| * | Better plugin descriptions | Egil Moeller | 2010-04-06 | 2 | -2/+2 |
| * | More plugin manager styling | Egil Moeller | 2010-04-06 | 2 | -1/+27 |
| * | Changed button-specific coloring to a class | Egil Moeller | 2010-04-06 | 2 | -2/+2 |
| * | Changed right hand rounded corner to silver | Egil Moeller | 2010-04-06 | 1 | -1/+1 |
| * | Styling for plugin manager | Egil Moeller | 2010-04-06 | 2 | -10/+59 |
| * | Updated SUPERDOMAINS to use /etc/etherpad.localdev-default.properties | Egil Moeller | 2010-04-05 | 5 | -11/+13 |
| * | Revert "Changed the default setup to a production setup, use 'dev' as a param... | Egil Moeller | 2010-04-05 | 1 | -3/+4 |
| * | Plugin-support for docbar menu | Egil Moeller | 2010-04-05 | 1 | -12/+18 |
| * | Merge branch 'master' of git://github.com/cjb/pad | Egil Moeller | 2010-04-05 | 6 | -52/+141 |
| |\ |
|
| | * | Revamped the environment variable testing section, which now asks for values ... | Jeppe Toustrup | 2010-04-05 | 1 | -38/+73 |
| | * | Changed the default setup to a production setup, use 'dev' as a parameter if ... | Jeppe Toustrup | 2010-04-05 | 1 | -4/+3 |
| | * | Made check to see if we are on Solaris, and if we are, then don't use '-u' on... | Jeppe Toustrup | 2010-04-05 | 1 | -41/+43 |