summaryrefslogtreecommitdiffstats
path: root/etherpad/src
Commit message (Expand)AuthorAgeFilesLines
* Merge commit 'mainline/master'Simon B @piratpartiet2010-04-2157-1100/+1514
|\
| * 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-1039-589/+723
| |\| | |
| | * | | Oups, wrong path used beforeEgil Moeller2010-04-1035-2/+2
| | * | | Added theme supportEgil Moeller2010-04-1035-2/+6
| | * | | 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
| |_|_|/ |/| | |
* | | | Replacing 'etherpad.com' with 'main site' in some code commentsSimon Bohlin2010-04-152-2/+2
| |_|/ |/| |
* | | Add clarifying commentsSimon Bohlin2010-04-141-8/+12
* | | Add forgotten static file robots.txtSimon Bohlin2010-04-141-0/+1
|/ /
* | 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 lice...Jeff Mitchell2010-04-083-46/+3
* | 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
|/
* 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
* | Revert "Fix typo in previous conversion from SUPERDOMAINS"Egil Moeller2010-04-081-1/+1
* | Fix typo in previous conversion from SUPERDOMAINSJeff Mitchell2010-04-081-1/+1
* | Merge branch 'jefferai' of git://github.com/jefferai/padPeter Martischka2010-04-085-13/+34
|\|
| * Actually use the new teamsite color.Jeff Mitchell2010-04-071-4/+4
| * I didn't realize someone had gotten rid of SUPERDOMAINS. Use domainEnabled in...Jeff Mitchell2010-04-071-1/+1
generated by cgit v1.2.3-1-g7c22 (git 2.25.1) at 2024-06-27 14:51:53 +0000