summaryrefslogtreecommitdiffstats
path: root/etherpad
Commit message (Collapse)AuthorAgeFilesLines
* Git the urlIndexer to nearly work (the links for tags / queries are all wrong)Egil Moeller2010-04-145-25/+220
|
* Bugfix for inheritance and overrideEgil Moeller2010-04-141-1/+2
|
* Added inheritance between templates for different pluginsEgil Moeller2010-04-131-5/+15
|
* Moved some more stuff to the modelEgil Moeller2010-04-122-19/+25
|
* Moved some more stuff to the modelEgil Moeller2010-04-122-18/+30
|
* Separated the twitterStyleTags model stuff out in a separate fileEgil Moeller2010-04-123-170/+193
|
* Merge branch 'master' of git://github.com/redhog/padPeter Martischka2010-04-1113-279/+254
|\
| * Removed some slow debug printingEgil Moeller2010-04-112-4/+4
| |
| * Added an URL indexer, it currently only greps out URLs from pads and stores ↵Egil Moeller2010-04-112-0/+71
| | | | | | | | them in a separate, searchable table, but it doesn't actually provide a way to use this info.
| * CSS bugfixEgil Moeller2010-04-111-1/+1
| |
| * Made twitterStyleTags use page.ejsEgil Moeller2010-04-112-120/+73
| |
| * Made the plugin manager use page.ejsEgil Moeller2010-04-102-118/+52
| |
| * Generalized the page.ejs a bit more so that it can be used by all pages for realEgil Moeller2010-04-105-38/+55
| |
* | 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-1040-589/+724
|\|
| * 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 ↵Egil Moeller2010-04-103-530/+594
| | | | | | | | adding actual pad stuff.
| * 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
| |
* | Revert "Can't really use SSL when checking for it always returns false, right?"Peter Martischka2010-04-091-0/+8
| | | | | | | | This reverts commit b2661df17ef0765d07fbb9233f1f37fec96e1dfe.
* | 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 ↵Jeff Mitchell2010-04-083-46/+3
| | | | | | | | licensing.
* | 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
|/ | | | true!
* 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
| |
* | added localbox.info to the topdomains of the config file, i think it's ↵Peter Martischka2010-04-081-1/+1
| | | | | | | | better for testing
* | Merge branch 'jefferai' of git://github.com/jefferai/padPeter Martischka2010-04-088-24/+43
|\|
| * 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
| * 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-071-1/+1
| | | | | | | | 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
| |
generated by cgit v1.2.3-1-g7c22 (git 2.25.1) at 2024-07-02 03:22:28 +0000