aboutsummaryrefslogtreecommitdiffstats
path: root/etherpad (follow)
Commit message (Expand)AuthorAgeFilesLines
* removed ip/user-agent from tooltipsHEADmasterAlexander Sulfrian2011-02-012-4/+0
* fixed headlinesAlexander Sulfrian2010-06-082-2/+3
* fix startpageAlexander Sulfrian2010-06-081-2/+2
* ported changes from old versionAlexander Sulfrian2010-06-0811-19/+31
* Merge remote branch 'upstream/master'Alexander Sulfrian2010-06-08352-0/+49733
|\
| * Change executable bit of two files to much the intent of the files.Mikko Rantalainen2010-05-061-0/+0
| * Removed obsolete file etherpad/bin/etherpad.initMikko Rantalainen2010-05-061-164/+0
| * git-buildpackage-converted debian packagingEgil Moeller2010-04-282-2/+24
| * Merge branch 'master' of git://github.com/avtobiff/padEgil Moeller2010-04-221-0/+0
| |\
| | * updated jbcrypt jar.Per Andersson2010-04-201-0/+0
| * | Merge commit 'mainline/master'Simon B @piratpartiet2010-04-2158-1100/+1515
| |\ \
| | * \ Merge branch 'master' of git://github.com/avtobiff/padEgil Moeller2010-04-202-0/+0
| | |\ \ | | | |/
| | * | Merge branch 'master' of git@github.com:ether/padEgil Moeller2010-04-202-0/+211
| | |\ \
| | * | | 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-174-10/+15
| | |\ \ \
| | | * \ \ Merge commit 'cd2bbd0e602244403ca379f9f4d9d15bbde545a7'Michael Prasuhn2010-04-162-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
| | | |\ \ \ \ \
| | * | | | | | | 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-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 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
| | * | | | | | Revert "Can't really use SSL when checking for it always returns false, right?"Peter Martischka2010-04-091-0/+8
| * | | | | | | 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
| * | | | | | | 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
| | | |_|_|/ | | |/| | |
generated by cgit v1.2.1 (git 2.18.0) at 2024-04-29 06:52:24 +0000