aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* 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 ↵Egil Moeller2010-04-091-5/+11
| | | | store/restore template-generated content.
* Merge branch 'master' of git@github.com:ether/padEgil Moeller2010-04-080-0/+0
|\
| * Merge branch 'master' of git@github.com:redhog/padEgil Moeller2010-04-080-0/+0
| |\
* | | Merge branch 'master' of git@github.com:ether/padEgil Moeller2010-04-082-2/+2
|\| | | |/ |/|
| * 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 ↵Peter Martischka2010-04-081-1/+1
| | | | | | | | | | | | | | | | better for testing
| * | | Revert "Fix typo in previous conversion from SUPERDOMAINS"Egil Moeller2010-04-081-1/+1
| | | | | | | | | | | | | | | | This reverts commit 746609a16cd1c1b8bb725f89fef1869af0875d5e.
| * | | Revert "added localbox.info to the topdomains of the config file, i think ↵Egil Moeller2010-04-081-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 Martischka2010-04-081-1/+1
| | | | | | | | | | | | | | | | better for testing
| * | | Fix typo in previous conversion from SUPERDOMAINSJeff Mitchell2010-04-081-1/+1
| |/ /
* | | Revert "Fix typo in previous conversion from SUPERDOMAINS"Egil Moeller2010-04-081-1/+1
| | | | | | | | | | | | This reverts commit 7ff9c56cd6f45246ee85933f55e38cdb526970b8.
* | | Revert "added localbox.info to the topdomains of the config file, i think ↵Egil Moeller2010-04-081-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 Martischka2010-04-081-1/+1
| | | | | | | | | | | | better for testing
* | | 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 ↵Jeff Mitchell2010-04-071-1/+1
| | | | | | | | instead.
| * Modify to add some templates for the added parameters, plus rearrange into ↵Jeff Mitchell2010-04-071-3/+6
| | | | | | | | alphabetical order
| * Add REMOVED_COS_OF_COS markers so those that want to enable support provided ↵Jeff Mitchell2010-04-072-1/+8
| | | | | | | | by cos.jar can easily find what to uncomment.
| * 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 ↵Jeff Mitchell2010-04-071-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 Mitchell2010-04-071-2/+0
| | | | | | | | licenses anymore after all.
| * Put in CSS to show the new teamsite link in a different color. I think the ↵Jeff Mitchell2010-04-071-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 Mitchell2010-04-071-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 Mitchell2010-04-071-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 Mitchell2010-04-071-4/+10
| | | | | | | | http otherwise.
| * Forgot the -p on the end of the mysql lines...this fixes my previous commit ↵Jeff Mitchell2010-04-071-2/+2
| | | | | | | | properly
| * You need to have the root mysql password -- so there is really no need to ↵Jeff Mitchell2010-04-071-5/+0
| | | | | | | | also be the root user.
| * Look for the etherpad.local.properties file in the logical location (same ↵Jeff Mitchell2010-04-072-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/padPeter Martischka2010-04-083-3/+3
|\|
| * Fixing commit of local-configEgil Moeller2010-04-071-1/+1
| |
| * Merge branch 'master' of git://github.com/Pita/padEgil Moeller2010-04-0719-61/+97
| |\
| * | Styling bugfixesEgil Moeller2010-04-062-2/+2
| | |
* | | Reduced the height of the docbar about 5pxPeter Martischka2010-04-089-18/+17
| | |
* | | Fixed some little design bugs of editbarPeter Martischka2010-04-072-33/+37
| |/ |/|
* | Fixed little design bug of the save buttonPeter Martischka2010-04-071-2/+1
| |
* | Merge branch 'master' of git://github.com/redhog/padPeter Martischka2010-04-0715-86/+259
|\|
| * Better plugin descriptionsEgil Moeller2010-04-062-2/+2
| |
| * More plugin manager stylingEgil Moeller2010-04-062-1/+27
| |
| * Changed button-specific coloring to a classEgil Moeller2010-04-062-2/+2
| |
| * Changed right hand rounded corner to silverEgil Moeller2010-04-061-1/+1
| |
| * Styling for plugin managerEgil Moeller2010-04-062-10/+59
| |
| * Updated SUPERDOMAINS to use /etc/etherpad.localdev-default.propertiesEgil Moeller2010-04-055-11/+13
| |
| * Revert "Changed the default setup to a production setup, use 'dev' as a ↵Egil Moeller2010-04-051-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 menuEgil Moeller2010-04-051-12/+18
| |
| * Merge branch 'master' of git://github.com/cjb/padEgil Moeller2010-04-056-52/+141
| |\
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-22 12:27:09 +0000