| Commit message (Expand) | Author | Age | Files | Lines |
* | Merge branch 'master' of http://github.com/redhog/pad | Peter Martischka | 2010-04-10 | 41 | -594/+735 |
|\ |
|
| * | Oups, wrong path used before | Egil Moeller | 2010-04-10 | 35 | -2/+2 |
| * | Added theme support | Egil Moeller | 2010-04-10 | 36 | -2/+7 |
| * | Template fallback from plugin to /templates | Egil Moeller | 2010-04-10 | 1 | -3/+16 |
| * | Separated the padpage into a common part (page.ejs) and an inheriting part ad... | Egil Moeller | 2010-04-10 | 3 | -530/+594 |
| * | Added example usage of template.use/define/inherit | Egil Moeller | 2010-04-09 | 3 | -10/+38 |
| * | Added a default templatye.use('body') at the end of each template | Egil Moeller | 2010-04-09 | 1 | -1/+2 |
| * | Added template.use, template.define and template.inherit to templates | Egil Moeller | 2010-04-09 | 1 | -0/+24 |
| * | Adde support for <%: %> and ejs_data in ejs-files, allowing templates to stor... | Egil Moeller | 2010-04-09 | 1 | -5/+11 |
| * | Merge branch 'master' of git@github.com:ether/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 |
| |\ \ |
|
* | | | | Revert "Can't really use SSL when checking for it always returns false, right?" | Peter Martischka | 2010-04-09 | 1 | -0/+8 |
* | | | | 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 import... | Jeff Mitchell | 2010-04-08 | 6 | -6/+104 |
* | | | | 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 lice... | Jeff Mitchell | 2010-04-08 | 3 | -46/+3 |
* | | | | 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 |
| |_|/
|/| | |
|
* | | | 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 |
| * | 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 | 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 |
|/ / |
|
* | | 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 |