aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'master' of git://github.com/avtobiff/padEgil Moeller2010-04-202-0/+0
|\
| * security: updated jbcrypt jar to version 0.3.Per Andersson2010-04-182-0/+0
* | Merge branch 'master' of git@github.com:ether/padEgil Moeller2010-04-202-0/+211
|\|
| * corrections and additions to init script defaults.Per Andersson2010-04-171-4/+5
| * 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
* | Home & pad/url search buttonsEgil Moeller2010-04-205-4/+28
* | 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
| |_|/ |/| |
* | | 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 t...Egil Moeller2010-04-112-0/+71
| * | 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 ad...Egil Moeller2010-04-103-530/+594
| * | 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 stor...Egil Moeller2010-04-091-5/+11
| * | 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
| |_|_|/ |/| | |
* | | | Add another REMOVED_COS_OF_COSJeff Mitchell2010-04-081-0/+1
* | | | Add needed jars which someone removed and needed code to actually make import...Jeff Mitchell2010-04-086-6/+104
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-21 23:09:54 +0000