summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Fixed a a serious Security Bug, HTML injection!Peter Martischka2010-04-111-1/+1
* Fixed a little design bug of the save buttonPeter Martischka2010-04-101-2/+2
* Merge branch 'master' of http://github.com/redhog/padPeter Martischka2010-04-1041-594/+735
|\
| * Oups, wrong path used beforeEgil Moeller2010-04-1035-2/+2
| * Added theme supportEgil Moeller2010-04-1036-2/+7
| * Template fallback from plugin to /templatesEgil Moeller2010-04-101-3/+16
| * Separated the padpage into a common part (page.ejs) and an inheriting part ad...Egil Moeller2010-04-103-530/+594
| * Added example usage of template.use/define/inheritEgil Moeller2010-04-093-10/+38
| * Added a default templatye.use('body') at the end of each templateEgil Moeller2010-04-091-1/+2
| * Added template.use, template.define and template.inherit to templatesEgil Moeller2010-04-091-0/+24
| * Adde support for <%: %> and ejs_data in ejs-files, allowing templates to stor...Egil Moeller2010-04-091-5/+11
| * Merge branch 'master' of git@github.com:ether/padEgil Moeller2010-04-080-0/+0
| |\
| * \ Merge branch 'master' of git@github.com:ether/padEgil Moeller2010-04-082-2/+2
| |\ \
* | | | Revert "Can't really use SSL when checking for it always returns false, right?"Peter Martischka2010-04-091-0/+8
* | | | Add another REMOVED_COS_OF_COSJeff Mitchell2010-04-081-0/+1
* | | | Add needed jars which someone removed and needed code to actually make import...Jeff Mitchell2010-04-086-6/+104
* | | | Another "unneeded" file that's actually needed...Jeff Mitchell2010-04-081-0/+28
* | | | Remove unneeded parts of the configuration block, since no need to check lice...Jeff Mitchell2010-04-083-46/+3
* | | | Can't really use SSL when checking for it always returns false, right?Jeff Mitchell2010-04-081-8/+0
* | | | Add back pro-config.js, which was mistakenly thought of as "unneeded" -- not ...Jeff Mitchell2010-04-081-0/+55
| |_|/ |/| |
* | | Merge branch 'master' of git@github.com:redhog/padEgil Moeller2010-04-080-0/+0
|\| | | |/ |/|
| * Revert "Fix typo in previous conversion from SUPERDOMAINS"Egil Moeller2010-04-081-1/+1
| * Revert "added localbox.info to the topdomains of the config file, i think it'...Egil Moeller2010-04-081-1/+1
| * added localbox.info to the topdomains of the config file, i think it's better...Peter Martischka2010-04-081-1/+1
| * Fix typo in previous conversion from SUPERDOMAINSJeff Mitchell2010-04-081-1/+1
* | Merge branch 'jefferai' of git://github.com/jefferai/padEgil Moeller2010-04-081-1/+1
|\ \
| * | Fix typo in previous conversion from SUPERDOMAINSJeff Mitchell2010-04-081-1/+1
* | | Merge branch 'master' of git://github.com/Pita/padEgil Moeller2010-04-081-1/+1
|\ \ \
| * | | added localbox.info to the topdomains of the config file, i think it's better...Peter Martischka2010-04-081-1/+1
| | |/ | |/|
* | | Revert "Fix typo in previous conversion from SUPERDOMAINS"Egil Moeller2010-04-081-1/+1
* | | Revert "added localbox.info to the topdomains of the config file, i think it'...Egil Moeller2010-04-081-1/+1
* | | added localbox.info to the topdomains of the config file, i think it's better...Peter Martischka2010-04-081-1/+1
* | | Fix typo in previous conversion from SUPERDOMAINSJeff Mitchell2010-04-081-1/+1
|/ /
* | Merge branch 'jefferai' of git://github.com/jefferai/padPeter Martischka2010-04-0812-25/+58
|\|
| * Actually use the new teamsite color.Jeff Mitchell2010-04-071-4/+4
| * I didn't realize someone had gotten rid of SUPERDOMAINS. Use domainEnabled in...Jeff Mitchell2010-04-071-1/+1
| * Modify to add some templates for the added parameters, plus rearrange into al...Jeff Mitchell2010-04-071-3/+6
| * Add REMOVED_COS_OF_COS markers so those that want to enable support provided ...Jeff Mitchell2010-04-072-1/+8
| * Add useHttpsUrls and hidePorts config optionsJeff Mitchell2010-04-071-0/+5
| * Many users may add the cos.jar file for import/export; place in .gitignore so...Jeff Mitchell2010-04-071-0/+1
| * Always render the navigation menu in the administration page; there aren't li...Jeff Mitchell2010-04-071-2/+0
| * Put in CSS to show the new teamsite link in a different color. I think the co...Jeff Mitchell2010-04-071-0/+14
| * If hidePorts is enabled, don't show port numbers in e.g. emails. Useful when ...Jeff Mitchell2010-04-071-2/+2
| * Instead of only working with superdomains that have two parts, consume each p...Jeff Mitchell2010-04-071-3/+6
| * Fix up getTempSigninUrl option so that it uses https when appropriate and htt...Jeff Mitchell2010-04-071-4/+10
| * Forgot the -p on the end of the mysql lines...this fixes my previous commit p...Jeff Mitchell2010-04-071-2/+2
| * You need to have the root mysql password -- so there is really no need to als...Jeff Mitchell2010-04-071-5/+0
| * Look for the etherpad.local.properties file in the logical location (same dir...Jeff Mitchell2010-04-072-1/+2
* | Merge branch 'master' of git://github.com/ether/padPeter Martischka2010-04-083-3/+3
|\|
| * Fixing commit of local-configEgil Moeller2010-04-071-1/+1