Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'master' of http://github.com/sesam/pad | Peter Martischka | 2010-04-15 | 1 | -2/+2 |
|\ | |||||
| * | Linkify links | Simon Bohlin | 2010-04-15 | 1 | -2/+2 |
| | | |||||
* | | Merge branch 'master' of http://github.com/redhog/pad | Peter Martischka | 2010-04-15 | 8 | -230/+477 |
|\ \ | |||||
| * | | Git the urlIndexer to nearly work (the links for tags / queries are all wrong) | Egil Moeller | 2010-04-14 | 5 | -25/+220 |
| | | | |||||
| * | | Bugfix for inheritance and override | Egil Moeller | 2010-04-14 | 1 | -1/+2 |
| | | | |||||
| * | | Added inheritance between templates for different plugins | Egil Moeller | 2010-04-13 | 1 | -5/+15 |
| | | | |||||
| * | | Moved some more stuff to the model | Egil Moeller | 2010-04-12 | 2 | -19/+25 |
| | | | |||||
| * | | Moved some more stuff to the model | Egil Moeller | 2010-04-12 | 2 | -18/+30 |
| | | | |||||
| * | | Separated the twitterStyleTags model stuff out in a separate file | Egil Moeller | 2010-04-12 | 3 | -170/+193 |
| | | | |||||
* | | | Merge branch 'master' of http://github.com/ether/pad | Peter Martischka | 2010-04-15 | 2 | -8/+13 |
|\ \ \ | |/ / |/| / | |/ | |||||
| * | Add clarifying comments | Simon Bohlin | 2010-04-14 | 1 | -8/+12 |
| | | |||||
| * | Add forgotten static file robots.txt | Simon Bohlin | 2010-04-14 | 1 | -0/+1 |
| | | |||||
* | | Merge branch 'master' of git://github.com/redhog/pad | Peter Martischka | 2010-04-11 | 13 | -279/+254 |
|\ \ | |||||
| * | | Removed some slow debug printing | Egil Moeller | 2010-04-11 | 2 | -4/+4 |
| | | | |||||
| * | | Added an URL indexer, it currently only greps out URLs from pads and stores ↵ | Egil Moeller | 2010-04-11 | 2 | -0/+71 |
| | | | | | | | | | | | | them in a separate, searchable table, but it doesn't actually provide a way to use this info. | ||||
| * | | CSS bugfix | Egil Moeller | 2010-04-11 | 1 | -1/+1 |
| | | | |||||
| * | | Made twitterStyleTags use page.ejs | Egil Moeller | 2010-04-11 | 2 | -120/+73 |
| | | | |||||
| * | | Made the plugin manager use page.ejs | Egil Moeller | 2010-04-10 | 2 | -118/+52 |
| | | | |||||
| * | | Generalized the page.ejs a bit more so that it can be used by all pages for real | Egil Moeller | 2010-04-10 | 5 | -38/+55 |
| | | | |||||
* | | | Fixed a a serious Security Bug, HTML injection! | Peter Martischka | 2010-04-11 | 1 | -1/+1 |
| | | | |||||
* | | | Fixed a little design bug of the save button | Peter Martischka | 2010-04-10 | 1 | -2/+2 |
| | | | |||||
* | | | 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 ↵ | Egil Moeller | 2010-04-10 | 3 | -530/+594 |
| | | | | | | | | | | | | adding actual pad stuff. | ||||
| * | | 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 ↵ | Egil Moeller | 2010-04-09 | 1 | -5/+11 |
| | | | | | | | | | | | | store/restore template-generated content. | ||||
| * | | 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 |
| |_|_|/ |/| | | | | | | | | | | | This reverts commit b2661df17ef0765d07fbb9233f1f37fec96e1dfe. | ||||
* | | | | 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 ↵ | Jeff Mitchell | 2010-04-08 | 6 | -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 Mitchell | 2010-04-08 | 1 | -0/+28 |
| | | | | |||||
* | | | | Remove unneeded parts of the configuration block, since no need to check ↵ | Jeff Mitchell | 2010-04-08 | 3 | -46/+3 |
| | | | | | | | | | | | | | | | | licensing. | ||||
* | | | | 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 |
| |_|/ |/| | | | | | | | | true! | ||||
* | | | 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 |
| | | | | | | | | This reverts commit 7ff9c56cd6f45246ee85933f55e38cdb526970b8. | ||||
| * | Revert "added localbox.info to the topdomains of the config file, i think ↵ | Egil Moeller | 2010-04-08 | 1 | -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 Martischka | 2010-04-08 | 1 | -1/+1 |
| | | | | | | | | better for testing | ||||
| * | 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 ↵ | Peter Martischka | 2010-04-08 | 1 | -1/+1 |
| | |/ | |/| | | | | | | | better for testing | ||||
* | | | Revert "Fix typo in previous conversion from SUPERDOMAINS" | Egil Moeller | 2010-04-08 | 1 | -1/+1 |
| | | | | | | | | | | | | This reverts commit 746609a16cd1c1b8bb725f89fef1869af0875d5e. | ||||
* | | | Revert "added localbox.info to the topdomains of the config file, i think ↵ | Egil Moeller | 2010-04-08 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | | it's better for testing" This reverts commit f6d14dabc09bd18a82bb191f8bea8006d12358d0. |