aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* ported changes from old versionAlexander Sulfrian2010-06-0817-535/+31
* Merge remote branch 'upstream/master'Alexander Sulfrian2010-06-081228-34143/+21668
|\
| * Set Maintainer to the correct emailEgil Moeller2010-05-102-1/+7
| * Bugfix for git-buildpackage and the translation systemEgil Moeller2010-05-081-2/+2
| * Refer to http://github.com/ether/pad as source in control and copyrightMikko Rantalainen2010-05-072-2/+2
| * Updated Maintainer in debian/controlMikko Rantalainen2010-05-071-1/+1
| * Updated .gitignoreMikko Rantalainen2010-05-061-1/+2
| * Added lintian overrides to silent an invalid error and an invalid warningMikko Rantalainen2010-05-061-0/+8
| * Improved packaging buildingMikko Rantalainen2010-05-063-89/+61
| * Allow localization of packagingMikko Rantalainen2010-05-064-6/+150
| * Added #DEBHELPER# marker to scriptsMikko Rantalainen2010-05-064-0/+11
| * Remove obsolete filesMikko Rantalainen2010-05-064-4884/+0
| * Added debian/etherpad.initMikko Rantalainen2010-05-061-6/+6
| * Fixed debian/copyrightMikko Rantalainen2010-05-061-22/+32
| * Change executable bit of two files to much the intent of the files.Mikko Rantalainen2010-05-062-0/+0
| * Make scala library JAR location configurableMikko Rantalainen2010-05-062-4/+5
| * Removed dummy README.DebianMikko Rantalainen2010-05-061-6/+0
| * Removed obsolete file etherpad/bin/etherpad.initMikko Rantalainen2010-05-061-164/+0
| * Fixed debian installation scriptsMikko Rantalainen2010-05-064-3/+11
| * Fixed init.d/etherpad script for debian/ubuntuMikko Rantalainen2010-05-061-10/+15
| * Updated dependenciesEgil Moeller2010-05-031-1/+1
| * Added installation instructionsEgil Moeller2010-05-031-0/+31
| * Oupsi, dbconfig-common is a pre-dependsEgil Moeller2010-04-281-0/+1
| * Ignoring all files generated by git-buildpackageEgil Moeller2010-04-281-0/+5
| * Added generated jars to gitignoreEgil Moeller2010-04-281-0/+1
| * git-buildpackage-converted debian packagingEgil Moeller2010-04-2838-776/+506
| * Merge branch 'master' of git://github.com/avtobiff/padEgil Moeller2010-04-221-0/+0
| |\
| | * updated jbcrypt jar.Per Andersson2010-04-201-0/+0
| * | Bugfix regession from IFRAME+IE bugs. Closes GH-70Simon B @piratpartiet2010-04-222-2/+16
| * | Merge commit 'mainline/master'Simon B @piratpartiet2010-04-2159-1105/+1526
| |\ \
| | * | 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-176-13/+18
| | |\ \ \
| | | * \ \ Merge commit 'cd2bbd0e602244403ca379f9f4d9d15bbde545a7'Michael Prasuhn2010-04-163-3/+3
| | | |\ \ \
| | | * \ \ \ Merge branch 'master' of http://github.com/sesam/padPeter Martischka2010-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
| | | |\ \ \ \ \ \
| | * | | | | | | | 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
generated by cgit v1.2.3 (git 2.25.1) at 2024-12-26 18:07:24 +0000