Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Allow localization of packaging | Mikko Rantalainen | 2010-05-06 | 4 | -6/+150 |
| | | | | | The debian/templates should always allow localization. A nice software for creating a new localization is "virtaal". | ||||
* | Added #DEBHELPER# marker to scripts | Mikko Rantalainen | 2010-05-06 | 4 | -0/+11 |
| | | | | This marker is required by dh_* scripts used in debian/rules. | ||||
* | Remove obsolete files | Mikko Rantalainen | 2010-05-06 | 4 | -4884/+0 |
| | | | | These files were probably included by mistake. | ||||
* | Added debian/etherpad.init | Mikko Rantalainen | 2010-05-06 | 1 | -6/+6 |
| | | | | | As far as I know, this is the correct way to do init.d scripts in a debian package. | ||||
* | Fixed debian/copyright | Mikko Rantalainen | 2010-05-06 | 1 | -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 Rantalainen | 2010-05-06 | 2 | -0/+0 |
| | | | | Make lintian happier. | ||||
* | Make scala library JAR location configurable | Mikko Rantalainen | 2010-05-06 | 2 | -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.Debian | Mikko Rantalainen | 2010-05-06 | 1 | -6/+0 |
| | |||||
* | Removed obsolete file etherpad/bin/etherpad.init | Mikko Rantalainen | 2010-05-06 | 1 | -164/+0 |
| | | | | According to redhog (Egil Möller), this file is no longer needed. | ||||
* | Fixed debian installation scripts | Mikko Rantalainen | 2010-05-06 | 4 | -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/ubuntu | Mikko Rantalainen | 2010-05-06 | 1 | -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 dependencies | Egil Moeller | 2010-05-03 | 1 | -1/+1 |
| | |||||
* | Added installation instructions | Egil Moeller | 2010-05-03 | 1 | -0/+31 |
| | |||||
* | Oupsi, dbconfig-common is a pre-depends | Egil Moeller | 2010-04-28 | 1 | -0/+1 |
| | |||||
* | Ignoring all files generated by git-buildpackage | Egil Moeller | 2010-04-28 | 1 | -0/+5 |
| | |||||
* | Added generated jars to gitignore | Egil Moeller | 2010-04-28 | 1 | -0/+1 |
| | |||||
* | git-buildpackage-converted debian packaging | Egil Moeller | 2010-04-28 | 38 | -776/+506 |
| | |||||
* | Merge branch 'master' of git://github.com/avtobiff/pad | Egil Moeller | 2010-04-22 | 1 | -0/+0 |
|\ | |||||
| * | updated jbcrypt jar. | Per Andersson | 2010-04-20 | 1 | -0/+0 |
| | | |||||
* | | Bugfix regession from IFRAME+IE bugs. Closes GH-70 | Simon B @piratpartiet | 2010-04-22 | 2 | -2/+16 |
| | | |||||
* | | Merge commit 'mainline/master' | Simon B @piratpartiet | 2010-04-21 | 59 | -1105/+1526 |
|\ \ | |||||
| * | | Merge branch 'master' of git://github.com/avtobiff/pad | Egil Moeller | 2010-04-20 | 2 | -0/+0 |
| |\| | |||||
| * | | Merge branch 'master' of git@github.com:ether/pad | Egil Moeller | 2010-04-20 | 2 | -0/+211 |
| |\ \ | |||||
| * | | | Home & pad/url search buttons | Egil Moeller | 2010-04-20 | 5 | -4/+28 |
| | | | | |||||
| * | | | Cleaned up the docbar hook code a bit | Egil Moeller | 2010-04-20 | 1 | -1/+1 |
| | | | | |||||
| * | | | Bugfixes to the docbar css for buttons w/o image | Egil Moeller | 2010-04-20 | 1 | -9/+9 |
| | | | | |||||
| * | | | Merge branch 'master' of git://github.com/shomeya/pad | Egil Moeller | 2010-04-17 | 6 | -13/+18 |
| |\ \ \ | |||||
| | * \ \ | Merge commit 'cd2bbd0e602244403ca379f9f4d9d15bbde545a7' | Michael Prasuhn | 2010-04-16 | 3 | -3/+3 |
| | |\ \ \ | |||||
| | * \ \ \ | Merge branch 'master' of http://github.com/sesam/pad | Peter Martischka | 2010-04-15 | 1 | -2/+2 |
| | |\ \ \ \ | |||||
| | * \ \ \ \ | Merge branch 'master' of http://github.com/redhog/pad | Peter Martischka | 2010-04-15 | 8 | -230/+477 |
| | |\ \ \ \ \ | |||||
| | * \ \ \ \ \ | Merge branch 'master' of http://github.com/ether/pad | Peter Martischka | 2010-04-15 | 2 | -8/+13 |
| | |\ \ \ \ \ \ | |||||
| * | | | | | | | | Fixed so that parts of a URL query can be modified w/o affecting the rest of ↵ | Egil Moeller | 2010-04-17 | 5 | -11/+37 |
| | |_|/ / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | the query | ||||
| * | | | | | | | Git the urlIndexer to nearly work (the links for tags / queries are all wrong) | Egil Moeller | 2010-04-14 | 5 | -25/+220 |
| | | | | | | | | |||||
| * | | | | | | | Bugfix for inheritance and override | Egil Moeller | 2010-04-14 | 1 | -1/+2 |
| | | | | | | | | |||||
| * | | | | | | | Added inheritance between templates for different plugins | Egil Moeller | 2010-04-13 | 1 | -5/+15 |
| | | | | | | | | |||||
| * | | | | | | | Moved some more stuff to the model | Egil Moeller | 2010-04-12 | 2 | -19/+25 |
| | | | | | | | | |||||
| * | | | | | | | Moved some more stuff to the model | Egil Moeller | 2010-04-12 | 2 | -18/+30 |
| | | | | | | | | |||||
| * | | | | | | | Separated the twitterStyleTags model stuff out in a separate file | Egil Moeller | 2010-04-12 | 3 | -170/+193 |
| |/ / / / / / | |||||
| * | | | | | | Merge branch 'master' of git://github.com/redhog/pad | Peter Martischka | 2010-04-11 | 13 | -279/+254 |
| |\ \ \ \ \ \ | |||||
| | * | | | | | | Removed some slow debug printing | Egil Moeller | 2010-04-11 | 2 | -4/+4 |
| | | | | | | | | |||||
| | * | | | | | | Added an URL indexer, it currently only greps out URLs from pads and stores ↵ | Egil Moeller | 2010-04-11 | 2 | -0/+71 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | them in a separate, searchable table, but it doesn't actually provide a way to use this info. | ||||
| | * | | | | | | CSS bugfix | Egil Moeller | 2010-04-11 | 1 | -1/+1 |
| | | | | | | | | |||||
| | * | | | | | | Made twitterStyleTags use page.ejs | Egil Moeller | 2010-04-11 | 2 | -120/+73 |
| | | | | | | | | |||||
| | * | | | | | | Made the plugin manager use page.ejs | Egil Moeller | 2010-04-10 | 2 | -118/+52 |
| | | | | | | | | |||||
| | * | | | | | | Generalized the page.ejs a bit more so that it can be used by all pages for real | Egil Moeller | 2010-04-10 | 5 | -38/+55 |
| | | | | | | | | |||||
| * | | | | | | | Fixed a a serious Security Bug, HTML injection! | Peter Martischka | 2010-04-11 | 1 | -1/+1 |
| | | | | | | | | |||||
| * | | | | | | | Fixed a little design bug of the save button | Peter Martischka | 2010-04-10 | 1 | -2/+2 |
| | | | | | | | | |||||
| * | | | | | | | Merge branch 'master' of http://github.com/redhog/pad | Peter Martischka | 2010-04-10 | 41 | -594/+735 |
| |\| | | | | | | |||||
| | * | | | | | | Oups, wrong path used before | Egil Moeller | 2010-04-10 | 35 | -2/+2 |
| | | | | | | | | |||||
| | * | | | | | | Added theme support | Egil Moeller | 2010-04-10 | 36 | -2/+7 |
| | | | | | | | |