aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* removed old filesAlexander Sulfrian2010-06-088-1594/+0
|
* fix startpageAlexander Sulfrian2010-06-081-2/+2
|
* ported changes from old versionAlexander Sulfrian2010-06-0817-535/+31
|
* Merge remote branch 'upstream/master'Alexander Sulfrian2010-06-081228-34143/+21668
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: etherpad/src/etherpad/control/pro/admin/pro_admin_control.js etherpad/src/etherpad/control/pro/pro_main_control.js etherpad/src/etherpad/control/pro_help_control.js etherpad/src/etherpad/globals.js etherpad/src/etherpad/legacy_urls.js etherpad/src/etherpad/pne/pne_utils.js etherpad/src/etherpad/pro/pro_utils.js etherpad/src/main.js etherpad/src/plugins/fileUpload/templates/fileUpload.ejs etherpad/src/plugins/testplugin/templates/page.ejs etherpad/src/static/css/pad2_ejs.css etherpad/src/static/css/pro-help.css etherpad/src/static/img/jun09/pad/protop.gif etherpad/src/static/js/store.js etherpad/src/themes/default/templates/framed/framedheader-pro.ejs etherpad/src/themes/default/templates/main/home.ejs etherpad/src/themes/default/templates/pro-help/main.ejs etherpad/src/themes/default/templates/pro-help/pro-help-template.ejs infrastructure/com.etherpad/licensing.scala trunk/etherpad/src/etherpad/collab/ace/contentcollector.js trunk/etherpad/src/etherpad/collab/ace/linestylefilter.js trunk/etherpad/src/static/css/home-opensource.css trunk/etherpad/src/static/js/ace.js trunk/etherpad/src/static/js/linestylefilter_client.js trunk/etherpad/src/templates/email/eepnet_license_info.ejs trunk/etherpad/src/templates/pad/pad_body2.ejs trunk/etherpad/src/templates/pad/pad_content.ejs trunk/etherpad/src/templates/pad/padfull_body.ejs trunk/etherpad/src/templates/pro/admin/pne-license-manager.ejs
| * 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
| | | | | | | | | | | | | | | | | | | | | | | | | | The lintian does not correctly detect the magic shell script that is a scala program in the same time. As a result, lintian will mark this script as invalid because sh -n reports a parse error. However, this is not a real parse error, because the script contains unconditional "exit" before the "error". The template contains default field for default password which should be translated. The field contains notes to translators as a comment but lintian would want to have an extra comment inside the string to translate. The note as a comment should be enough, make lintian silent about this.
| * Improved packaging buildingMikko Rantalainen2010-05-063-89/+61
| | | | | | | | | | | | | | | | Fixed debian/control and debian/rules to generate architecture independent binary packages as Etherpad does not include machine code (as opposed to virtual machine byte code). Changed the debian source format to "3.0 (native)".
| * Allow localization of packagingMikko Rantalainen2010-05-064-6/+150
| | | | | | | | | | The debian/templates should always allow localization. A nice software for creating a new localization is "virtaal".
| * Added #DEBHELPER# marker to scriptsMikko Rantalainen2010-05-064-0/+11
| | | | | | | | This marker is required by dh_* scripts used in debian/rules.
| * 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
| | |\ \ \ \ \ \
generated by cgit v1.2.3 (git 2.25.1) at 2024-12-26 03:19:55 +0000