aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Updated SUPERDOMAINS to use /etc/etherpad.localdev-default.propertiesEgil Moeller2010-04-055-11/+13
|
* Revert "Changed the default setup to a production setup, use 'dev' as a ↵Egil Moeller2010-04-051-3/+4
| | | | | | | | parameter if you want a development setup." This stuff seems broken. Fix and recommit another time? This reverts commit 13bf676f0ce8201de185c83fedda0a16564eb53e.
* Plugin-support for docbar menuEgil Moeller2010-04-051-12/+18
|
* Merge branch 'master' of git://github.com/cjb/padEgil Moeller2010-04-056-52/+141
|\
| * Revamped the environment variable testing section, which now asks for values ↵Jeppe Toustrup2010-04-051-38/+73
| | | | | | | | of variables not entered, and tries to guess paths to 'java' and 'scala' binaries.
| * Changed the default setup to a production setup, use 'dev' as a parameter if ↵Jeppe Toustrup2010-04-051-4/+3
| | | | | | | | you want a development setup.
| * Made check to see if we are on Solaris, and if we are, then don't use '-u' ↵Jeppe Toustrup2010-04-051-41/+43
| | | | | | | | | | | | on the cp command. Also, convertion of spaces to tabs.
| * Make config parsing more robustChris Ball2010-04-054-4/+8
| | | | | | | | | | Previously, config booleans like etherpad.isProduction accepted only "true", and not "true " or " true" or "True" or "TRUE". Fix that.
| * Attempt to check for Sun javac, and warn the user if we don't find it.Chris Ball2010-04-051-0/+16
| |
| * Add depschecking; check environment variables are pointing at existing filesChris Ball2010-04-051-0/+26
| |
| * Silence `which growlnotify` outputChris Ball2010-04-051-1/+1
| |
| * If fastjar 0.97/0.98 is installed, use jar instead.Chris Ball2010-04-051-2/+9
| | | | | | | | | | Otherwise the build will crash, due to: http://lists.gnu.org/archive/html/fastjar-dev/2009-12/msg00000.html
* | Merge branch 'master' of git://github.com/Pita/padEgil Moeller2010-04-052-35/+13
|\ \
| * | Little fix of topbar layout, using nowrap insted of tablesPeter Martischka2010-04-052-35/+13
| | |
* | | Merge branch 'master' of git://github.com/Pita/padEgil Moeller2010-04-05306-2407/+101
|\| |
| * | added some picturesPeter Martischka2010-04-059-0/+0
| | |
| * | Redesign of the topbar + deleted unused css & imagesPeter Martischka2010-04-05297-2407/+101
| | |
* | | Bugfixed faststatic to handle plugins properlyEgil Moeller2010-04-051-1/+25
| | |
* | | Fixed some styling bugs in the plugin managerEgil Moeller2010-04-051-26/+34
| | |
* | | Updated the plugin manager to use the admin auth systemEgil Moeller2010-04-052-5/+14
| | |
* | | Merge branch 'master' of git://github.com/Pita/padEgil Moeller2010-04-0476-2531/+1050
|\| |
| * | Merge branch 'master' of git://github.com/redhog/padPeter Martischka2010-04-042-15/+18
| |\ \
| * \ \ Merge branch 'master' of git://github.com/penSecIT/padPeter Martischka2010-04-0422-0/+1005
| |\ \ \
| | * | | Additional information about priviliged portspenSec.IT UG (haftungsbeschränkt)2010-04-041-1/+6
| | | | |
| | * | | Removed unused codepenSec.IT UG (haftungsbeschränkt)2010-04-041-137/+0
| | | | |
| | * | | Complete translation to english languagepenSec.IT UG (haftungsbeschränkt)2010-04-044-42/+44
| | | | |
| | * | | Relicensed under The Apache License, Version 2.0penSec.IT UG (haftungsbeschränkt)2010-04-047-129/+70
| | | | |
| | * | | apt BuildsystempenSec.IT UG (haftungsbeschränkt)2010-04-0422-0/+1194
| | | |/ | | |/|
| * | | Merge branch 'master' of git://github.com/redhog/padPeter Martischka2010-04-0412-0/+249
| |\ \ \
| * | | | Removed some unused templatesPeter Martischka2010-04-0445-2513/+0
| | | | |
| * | | | Opportunity to enable/disable the Pro Feature with a config flagPeter Martischka2010-04-049-18/+45
| | | | |
* | | | | Oups, variable mismatch bugfixEgil Moeller2010-04-041-3/+4
| |_|_|/ |/| | |
* | | | Bugfix to handlePath hooks, and to the array concatenation in callHookEgil Moeller2010-04-042-15/+18
| |/ / |/| |
* | | Oups, forgot some new dependencies for handling mime/multipartEgil Moeller2010-04-046-0/+0
| | |
* | | Added a fileUpload pluginEgil Moeller2010-04-046-0/+249
|/ /
* | Commented the tagBrowser a bit moreEgil Moeller2010-04-031-4/+18
| |
* | Bugfix for .gitignore for log filesEgil Moeller2010-04-031-0/+1
|/
* Revert "Fixed .txt file import - NOT open office import, just basic text import"Egil Moeller2010-04-011-3/+3
| | | | | | Reverting as this patch breaks the build - dependency on unfree libraries from O'Reilly that aren't available. This reverts commit e24352483b7efc151e6b5995bddac3c89d04a6cc.
* Merge branch 'john'Egil Moeller2010-03-314-4/+78
|\
| * Revert "Change Pro Account login to HTTP instead of HTTPS"Egil Moeller2010-03-311-1/+1
| | | | | | | | | | | | This should ideally be done from teh config-file. Anyway, the pro-pad system needs a greater review / cleanup. This reverts commit bb52de2259c58d36265c8af63c5c141e07ed466a.
| * Revert "Added Hello World"Egil Moeller2010-03-311-1/+0
| | | | | | | | This reverts commit caee6179a9a40564a406bf3fa6e4b15eeab1c926.
| * Fixed .txt file import - NOT open office import, just basic text importroot2010-03-271-3/+3
| |
| * Change Pro Account login to HTTP instead of HTTPSroot2010-03-271-1/+1
| |
| * Removed need for Licenseroot2010-03-271-1/+1
| |
| * Fixed bug on export of java-scriptroot2010-03-261-0/+72
| |
| * Added script to check java-version and availabilityroot2010-03-261-0/+2
| |
| * Added Hello Worldroot2010-03-251-0/+1
| |
* | add 32 user color support on padsPeter Martischka2010-03-304-13/+70
| |
* | Removed some debug-printingEgil Moeller2010-03-301-2/+0
| |
* | Bugfix for plugin managerEgil Moeller2010-03-302-6/+4
| |