Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | added init script and default settings for it. | Per Andersson | 2010-04-17 | 2 | -0/+199 |
| | |||||
* | Add clarifying comments | Simon Bohlin | 2010-04-14 | 1 | -8/+12 |
| | |||||
* | Add forgotten static file robots.txt | Simon Bohlin | 2010-04-14 | 1 | -0/+1 |
| | |||||
* | Add another REMOVED_COS_OF_COS | Jeff Mitchell | 2010-04-08 | 1 | -0/+1 |
| | |||||
* | Add needed jars which someone removed and needed code to actually make ↵ | Jeff Mitchell | 2010-04-08 | 6 | -6/+104 |
| | | | | import/export work. Have tested it and it works well. Note that if you don't have a soffice server running, it just doesn't do anything, so this is safe to have active. | ||||
* | Another "unneeded" file that's actually needed... | Jeff Mitchell | 2010-04-08 | 1 | -0/+28 |
| | |||||
* | Remove unneeded parts of the configuration block, since no need to check ↵ | Jeff Mitchell | 2010-04-08 | 3 | -46/+3 |
| | | | | licensing. | ||||
* | Can't really use SSL when checking for it always returns false, right? | Jeff Mitchell | 2010-04-08 | 1 | -8/+0 |
| | |||||
* | Add back pro-config.js, which was mistakenly thought of as "unneeded" -- not ↵ | Jeff Mitchell | 2010-04-08 | 1 | -0/+55 |
| | | | | true! | ||||
* | Merge branch 'master' of git@github.com:redhog/pad | Egil Moeller | 2010-04-08 | 0 | -0/+0 |
|\ | |||||
| * | Revert "Fix typo in previous conversion from SUPERDOMAINS" | Egil Moeller | 2010-04-08 | 1 | -1/+1 |
| | | | | | | | | This reverts commit 7ff9c56cd6f45246ee85933f55e38cdb526970b8. | ||||
| * | 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 b4ccd31eafa1a65a3fb58c9394b3f71b9779dea8. | ||||
| * | 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 | 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 ↵ | 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 |
| | |