aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Remove obsolete filesMikko Rantalainen2010-05-064-4884/+0
| | | | These files were probably included by mistake.
* Added debian/etherpad.initMikko Rantalainen2010-05-061-6/+6
| | | | | As far as I know, this is the correct way to do init.d scripts in a debian package.
* Fixed debian/copyrightMikko Rantalainen2010-05-061-22/+32
| | | | | | The copyright file contained placeholders that I filled in. In addition, the copyright file contained wrong license (BSD) instead of the Apache License 2.0 claimed in the source files.
* Change executable bit of two files to much the intent of the files.Mikko Rantalainen2010-05-062-0/+0
| | | | Make lintian happier.
* Make scala library JAR location configurableMikko Rantalainen2010-05-062-4/+5
| | | | | scala-library.jar may be in $SCALA_HOME/lib or in $SCALA_HOME. Make it possible to point directly to scala-library.jar anywhere.
* Removed dummy README.DebianMikko Rantalainen2010-05-061-6/+0
|
* Removed obsolete file etherpad/bin/etherpad.initMikko Rantalainen2010-05-061-164/+0
| | | | According to redhog (Egil Möller), this file is no longer needed.
* Fixed debian installation scriptsMikko Rantalainen2010-05-064-3/+11
| | | | | | | | | | | | | | | | | | Directory /usr/share/etherpad/etherpad/data was not created which caused install process to stop with error message: Adding system-user for etherpad chown: cannot access `/usr/share/etherpad/etherpad/data': No such file or directory dpkg: error processing etherpad (--install): subprocess installed post-installation script returned error exit status 1 Processing triggers for ureadahead ... Errors were encountered while processing: etherpad Fixed location of scala-library.jar in Ubuntu. This may need changes in the future to help building the JAR on both Debian based systems and other systems. Added scala-library to Build-Depends in addition to scala dependency.
* Fixed init.d/etherpad script for debian/ubuntuMikko Rantalainen2010-05-061-10/+15
| | | | | | | | | | | | | | | For some reason that I cannot yet understand, there are two init.d scripts with different content. The files are: bin/etherpad.init.d etherpad/bin/etherpad.init I rewrote bin/etherpad.init.d to make start, stop and status functions to work pretty much as intended. The status message currently says "could not access PID file for etherpad" instead of "etherpad is not running", when status is queried when etherpad is not running. This needs to be fixed later. This change has been tested with Ubuntu 9.10.
* 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
| | |_|/ / / / / | |/| | | | | | | | | | | | | | | | | | | | | | the query
| * | | | | | | 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 ↵Egil Moeller2010-04-112-0/+71
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | them in a separate, searchable table, but it doesn't actually provide a way to use this info.
| | * | | | | | 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 ↵Egil Moeller2010-04-103-530/+594
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | adding actual pad stuff.
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-25 00:02:38 +0000