Commit message (Collapse) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
| | * | | 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 ↵ | Peter Martischka | 2010-04-08 | 1 | -1/+1 | |
| | | |/ | | |/| | | | | | | | | | better for testing | |||||
| * | | | Revert "Fix typo in previous conversion from SUPERDOMAINS" | Egil Moeller | 2010-04-08 | 1 | -1/+1 | |
| | | | | | | | | | | | | | | | | This reverts commit 746609a16cd1c1b8bb725f89fef1869af0875d5e. | |||||
| * | | | Revert "added localbox.info to the topdomains of the config file, i think ↵ | Egil Moeller | 2010-04-08 | 1 | -1/+1 | |
| | | | | | | | | | | | | | | | | | | | | | | | | it's better for testing" This reverts commit f6d14dabc09bd18a82bb191f8bea8006d12358d0. | |||||
| * | | | added localbox.info to the topdomains of the config file, i think it's ↵ | Peter Martischka | 2010-04-08 | 1 | -1/+1 | |
| | | | | | | | | | | | | | | | | better for testing | |||||
| * | | | 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 ↵ | Jeff Mitchell | 2010-04-07 | 1 | -1/+1 | |
| | | | | | | | | | | | | instead. | |||||
| | * | Modify to add some templates for the added parameters, plus rearrange into ↵ | Jeff Mitchell | 2010-04-07 | 1 | -3/+6 | |
| | | | | | | | | | | | | alphabetical order | |||||
| | * | Add REMOVED_COS_OF_COS markers so those that want to enable support provided ↵ | Jeff Mitchell | 2010-04-07 | 2 | -1/+8 | |
| | | | | | | | | | | | | by cos.jar can easily find what to uncomment. | |||||
| | * | 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 ↵ | Jeff Mitchell | 2010-04-07 | 1 | -0/+1 | |
| | | | | | | | | | | | | so those users don't constantly have git whining at them. | |||||
| | * | Always render the navigation menu in the administration page; there aren't ↵ | Jeff Mitchell | 2010-04-07 | 1 | -2/+0 | |
| | | | | | | | | | | | | licenses anymore after all. | |||||
| | * | Put in CSS to show the new teamsite link in a different color. I think the ↵ | Jeff Mitchell | 2010-04-07 | 1 | -0/+14 | |
| | | | | | | | | | | | | | | | | | | color chosen goes together pretty well, but more importantly it makes it immediately obvious that they are two buttons that do two different things. Plus, variety is the spice of life :-) | |||||
| | * | If hidePorts is enabled, don't show port numbers in e.g. emails. Useful when ↵ | Jeff Mitchell | 2010-04-07 | 1 | -2/+2 | |
| | | | | | | | | | | | | you're running behind a proxy but EP doesn't know it, so that it doesn't tack on :9000 in links in emails. | |||||
| | * | Instead of only working with superdomains that have two parts, consume each ↵ | Jeff Mitchell | 2010-04-07 | 1 | -3/+6 | |
| | | | | | | | | | | | | part of the request and compare against valid superdomains. This lets you run a site with arbitrary lengths for the domains, e.g. mypads.etherpad.mysite.com. | |||||
| | * | Fix up getTempSigninUrl option so that it uses https when appropriate and ↵ | Jeff Mitchell | 2010-04-07 | 1 | -4/+10 | |
| | | | | | | | | | | | | http otherwise. | |||||
| | * | Forgot the -p on the end of the mysql lines...this fixes my previous commit ↵ | Jeff Mitchell | 2010-04-07 | 1 | -2/+2 | |
| | | | | | | | | | | | | properly | |||||
| | * | You need to have the root mysql password -- so there is really no need to ↵ | Jeff Mitchell | 2010-04-07 | 1 | -5/+0 | |
| | | | | | | | | | | | | also be the root user. | |||||
| | * | Look for the etherpad.local.properties file in the logical location (same ↵ | Jeff Mitchell | 2010-04-07 | 2 | -1/+2 | |
| | | | | | | | | | | | | directory as the default file) instead of the nonexistent data directory. Also update the .gitignore to ignore this file. | |||||
| * | | 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 ↵ | Egil Moeller | 2010-04-05 | 1 | -3/+4 | |
| | | | | | | | | | | | | | | | | | | | | | | | | parameter if you want a development setup." This stuff seems broken. Fix and recommit another time? This reverts commit 13bf676f0ce8201de185c83fedda0a16564eb53e. | |||||
| | * | 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 | |
| | | | | | | | | | | | | | | | | of variables not entered, and tries to guess paths to 'java' and 'scala' binaries. | |||||
| | | * | Changed the default setup to a production setup, use 'dev' as a parameter if ↵ | Jeppe Toustrup | 2010-04-05 | 1 | -4/+3 | |
| | | | | | | | | | | | | | | | | you want a development setup. | |||||
| | | * | Made check to see if we are on Solaris, and if we are, then don't use '-u' ↵ | Jeppe Toustrup | 2010-04-05 | 1 | -41/+43 | |
| | | | | | | | | | | | | | | | | | | | | | | | | on the cp command. Also, convertion of spaces to tabs. | |||||
| | | * | Make config parsing more robust | Chris Ball | 2010-04-05 | 4 | -4/+8 | |
| | | | | | | | | | | | | | | | | | | | | Previously, config booleans like etherpad.isProduction accepted only "true", and not "true " or " true" or "True" or "TRUE". Fix that. | |||||
| | | * | 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 | |
| | | | | | | | | | | | | | | | | | | | | Otherwise the build will crash, due to: http://lists.gnu.org/archive/html/fastjar-dev/2009-12/msg00000.html | |||||
| * | | | 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 | |
| | | | |