aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
| | * | | | | | 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.
* | | | | | | | | | Remove unused fileSimon Bohlin2010-04-211-1984/+0
| | | | | | | | | |
* | | | | | | | | | Drive-by optimization. Motivation: every keypress invokes callHooks()Simon Bohlin2010-04-211-4/+5
| | | | | | | | | |
* | | | | | | | | | Add code origin commentsSimon Bohlin2010-04-211-0/+3
| | | | | | | | | |
* | | | | | | | | | Fix IE lacking Array#map. Closes #70Simon B @piratpartiet2010-04-211-0/+11
| | | | | | | | | |
* | | | | | | | | | Fix IFRAME bug. Closes #70Simon B @piratpartiet2010-04-213-3/+4
| | | | | | | | | |
* | | | | | | | | | Merge branch 'master' of http://github.com/ether/padSimon B @piratpartiet2010-04-214-0/+211
|\ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|/ / / |/| | | | | | | | / | | |_|_|_|_|_|_|/ | |/| | | | | | |
| * | | | | | | | security: updated jbcrypt jar to version 0.3.Per Andersson2010-04-182-0/+0
| | |_|_|_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | updated jbcrypt jar to version 0.3 due to jbcrypt security advisory [0]. nb. password hashes with non US-ASCII characters created with jbcrypt < 0.3 are not compatible with jbcrypt 0.3. [0] http://www.mindrot.org/files/jBCrypt/internat.adv
| * | | | | | | corrections and additions to init script defaults.Per Andersson2010-04-171-4/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * corrected classpath so it has the correct path. * added missing and corrected erroneus options passed to java.
| * | | | | | | init script checks that etherpad jar exists.Per Andersson2010-04-171-1/+2
| | | | | | | |
| * | | | | | | cleaned up init script from unused variables.Per Andersson2010-04-171-2/+0
| | | | | | | |
| * | | | | | | added option to configure uid:gid to run daemon as.Per Andersson2010-04-172-2/+14
| | | | | | | |
| * | | | | | | added init script and default settings for it.Per Andersson2010-04-172-0/+199
| | |_|_|_|/ / | |/| | | | |
* | | | | | | Replacing 'etherpad.com' with 'main site' in some code commentsSimon Bohlin2010-04-153-3/+3
| |_|_|_|_|/ |/| | | | |
* | | | | | Linkify linksSimon Bohlin2010-04-151-2/+2
|/ / / / /
* | | | | Add clarifying commentsSimon Bohlin2010-04-141-8/+12
| | | | |
* | | | | Add forgotten static file robots.txtSimon Bohlin2010-04-141-0/+1
|/ / / /
* | | | 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
| |
* | 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
|/ /
* | 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
| |
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-22 13:24:58 +0000