| Commit message (Expand) | Author | Age | Files | Lines |
* | 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 |
* | | added localbox.info to the topdomains of the config file, i think it's better... | Peter Martischka | 2010-04-08 | 1 | -1/+1 |
* | | Merge branch 'jefferai' of git://github.com/jefferai/pad | Peter Martischka | 2010-04-08 | 8 | -24/+43 |
|\| |
|
| * | 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 |
| * | 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 | 1 | -1/+1 |
* | | 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 | 13 | -44/+215 |
|\| |
|
| * | 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 | 4 | -10/+97 |
| |\ |
|
| | * | 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 |
| | * | Make config parsing more robust | Chris Ball | 2010-04-05 | 3 | -3/+7 |
| | * | Attempt to check for Sun javac, and warn the user if we don't find it. | Chris Ball | 2010-04-05 | 1 | -0/+16 |
| | * | Add depschecking; check environment variables are pointing at existing files | Chris Ball | 2010-04-05 | 1 | -0/+26 |
| | * | Silence `which growlnotify` output | Chris Ball | 2010-04-05 | 1 | -1/+1 |
| | * | If fastjar 0.97/0.98 is installed, use jar instead. | Chris Ball | 2010-04-05 | 1 | -2/+9 |
* | | | Redesign of the editbar | Peter Martischka | 2010-04-07 | 19 | -61/+98 |
|/ / |
|
* | | Merge branch 'master' of git://github.com/Pita/pad | Egil Moeller | 2010-04-05 | 2 | -35/+13 |
|\ \ |
|
| * | | Little fix of topbar layout, using nowrap insted of tables | Peter Martischka | 2010-04-05 | 2 | -35/+13 |
* | | | Merge branch 'master' of git://github.com/Pita/pad | Egil Moeller | 2010-04-05 | 306 | -2407/+101 |
|\| | |
|
| * | | added some pictures | Peter Martischka | 2010-04-05 | 9 | -0/+0 |
| * | | Redesign of the topbar + deleted unused css & images | Peter Martischka | 2010-04-05 | 297 | -2407/+101 |
* | | | Fixed some styling bugs in the plugin manager | Egil Moeller | 2010-04-05 | 1 | -26/+34 |
* | | | Updated the plugin manager to use the admin auth system | Egil Moeller | 2010-04-05 | 2 | -5/+14 |
* | | | Merge branch 'master' of git://github.com/Pita/pad | Egil Moeller | 2010-04-04 | 54 | -2531/+45 |
|\| | |
|
| * | | Merge branch 'master' of git://github.com/redhog/pad | Peter Martischka | 2010-04-04 | 2 | -15/+18 |
| |\ \ |
|
| * \ \ | Merge branch 'master' of git://github.com/redhog/pad | Peter Martischka | 2010-04-04 | 6 | -0/+249 |
| |\ \ \ |
|