aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Cleaned up the docbar hook code a bitEgil Moeller2010-04-201-1/+1
|
* Bugfixes to the docbar css for buttons w/o imageEgil Moeller2010-04-201-9/+9
|
* Merge branch 'master' of git://github.com/shomeya/padEgil Moeller2010-04-176-13/+18
|\
| * Merge commit 'cd2bbd0e602244403ca379f9f4d9d15bbde545a7'Michael Prasuhn2010-04-163-3/+3
| |\
| | * Replacing 'etherpad.com' with 'main site' in some code commentsSimon Bohlin2010-04-153-3/+3
| | |
| * | Merge branch 'master' of http://github.com/sesam/padPeter Martischka2010-04-151-2/+2
| |\|
| | * Linkify linksSimon Bohlin2010-04-151-2/+2
| | |
| * | Merge branch 'master' of http://github.com/redhog/padPeter Martischka2010-04-158-230/+477
| |\ \
| * \ \ Merge branch 'master' of http://github.com/ether/padPeter Martischka2010-04-152-8/+13
| |\ \ \ | | | |/ | | |/|
| | * | Add clarifying commentsSimon Bohlin2010-04-141-8/+12
| | | |
| | * | Add forgotten static file robots.txtSimon Bohlin2010-04-141-0/+1
| | | |
* | | | Fixed so that parts of a URL query can be modified w/o affecting the rest of ↵Egil Moeller2010-04-175-11/+37
| |_|/ |/| | | | | | | | the query
* | | 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-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 ↵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
| | |
| * | 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: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
| |_|_|/ |/| | | | | | | | | | | This reverts commit b2661df17ef0765d07fbb9233f1f37fec96e1dfe.
* | | | Add another REMOVED_COS_OF_COSJeff Mitchell2010-04-081-0/+1
| | | |
* | | | Add needed jars which someone removed and needed code to actually make ↵Jeff Mitchell2010-04-086-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 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 '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
| | | | | | | | 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
| |