Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Updated SUPERDOMAINS to use /etc/etherpad.localdev-default.properties | Egil Moeller | 2010-04-05 | 5 | -11/+13 |
| | |||||
* | Revert "Changed the default setup to a production setup, use 'dev' as a ↵ | Egil Moeller | 2010-04-05 | 1 | -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 menu | Egil Moeller | 2010-04-05 | 1 | -12/+18 |
| | |||||
* | Merge branch 'master' of git://github.com/cjb/pad | Egil Moeller | 2010-04-05 | 6 | -52/+141 |
|\ | |||||
| * | Revamped the environment variable testing section, which now asks for values ↵ | Jeppe Toustrup | 2010-04-05 | 1 | -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 Toustrup | 2010-04-05 | 1 | -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 Toustrup | 2010-04-05 | 1 | -41/+43 |
| | | | | | | | | | | | | on the cp command. Also, convertion of spaces to tabs. | ||||
| * | Make config parsing more robust | Chris Ball | 2010-04-05 | 4 | -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 Ball | 2010-04-05 | 1 | -0/+16 |
| | | |||||
| * | Add depschecking; check environment variables are pointing at existing files | Chris Ball | 2010-04-05 | 1 | -0/+26 |
| | | |||||
| * | Silence `which growlnotify` output | Chris Ball | 2010-04-05 | 1 | -1/+1 |
| | | |||||
| * | If fastjar 0.97/0.98 is installed, use jar instead. | Chris Ball | 2010-04-05 | 1 | -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/pad | Egil Moeller | 2010-04-05 | 2 | -35/+13 |
|\ \ | |||||
| * | | Little fix of topbar layout, using nowrap insted of tables | Peter Martischka | 2010-04-05 | 2 | -35/+13 |
| | | | |||||
* | | | Merge branch 'master' of git://github.com/Pita/pad | Egil Moeller | 2010-04-05 | 306 | -2407/+101 |
|\| | | |||||
| * | | added some pictures | Peter Martischka | 2010-04-05 | 9 | -0/+0 |
| | | | |||||
| * | | Redesign of the topbar + deleted unused css & images | Peter Martischka | 2010-04-05 | 297 | -2407/+101 |
| | | | |||||
* | | | Bugfixed faststatic to handle plugins properly | Egil Moeller | 2010-04-05 | 1 | -1/+25 |
| | | | |||||
* | | | Fixed some styling bugs in the plugin manager | Egil Moeller | 2010-04-05 | 1 | -26/+34 |
| | | | |||||
* | | | Updated the plugin manager to use the admin auth system | Egil Moeller | 2010-04-05 | 2 | -5/+14 |
| | | | |||||
* | | | Merge branch 'master' of git://github.com/Pita/pad | Egil Moeller | 2010-04-04 | 76 | -2531/+1050 |
|\| | | |||||
| * | | Merge branch 'master' of git://github.com/redhog/pad | Peter Martischka | 2010-04-04 | 2 | -15/+18 |
| |\ \ | |||||
| * \ \ | Merge branch 'master' of git://github.com/penSecIT/pad | Peter Martischka | 2010-04-04 | 22 | -0/+1005 |
| |\ \ \ | |||||
| | * | | | Additional information about priviliged ports | penSec.IT UG (haftungsbeschränkt) | 2010-04-04 | 1 | -1/+6 |
| | | | | | |||||
| | * | | | Removed unused code | penSec.IT UG (haftungsbeschränkt) | 2010-04-04 | 1 | -137/+0 |
| | | | | | |||||
| | * | | | Complete translation to english language | penSec.IT UG (haftungsbeschränkt) | 2010-04-04 | 4 | -42/+44 |
| | | | | | |||||
| | * | | | Relicensed under The Apache License, Version 2.0 | penSec.IT UG (haftungsbeschränkt) | 2010-04-04 | 7 | -129/+70 |
| | | | | | |||||
| | * | | | apt Buildsystem | penSec.IT UG (haftungsbeschränkt) | 2010-04-04 | 22 | -0/+1194 |
| | | |/ | | |/| | |||||
| * | | | Merge branch 'master' of git://github.com/redhog/pad | Peter Martischka | 2010-04-04 | 12 | -0/+249 |
| |\ \ \ | |||||
| * | | | | Removed some unused templates | Peter Martischka | 2010-04-04 | 45 | -2513/+0 |
| | | | | | |||||
| * | | | | Opportunity to enable/disable the Pro Feature with a config flag | Peter Martischka | 2010-04-04 | 9 | -18/+45 |
| | | | | | |||||
* | | | | | Oups, variable mismatch bugfix | Egil Moeller | 2010-04-04 | 1 | -3/+4 |
| |_|_|/ |/| | | | |||||
* | | | | Bugfix to handlePath hooks, and to the array concatenation in callHook | Egil Moeller | 2010-04-04 | 2 | -15/+18 |
| |/ / |/| | | |||||
* | | | Oups, forgot some new dependencies for handling mime/multipart | Egil Moeller | 2010-04-04 | 6 | -0/+0 |
| | | | |||||
* | | | Added a fileUpload plugin | Egil Moeller | 2010-04-04 | 6 | -0/+249 |
|/ / | |||||
* | | Commented the tagBrowser a bit more | Egil Moeller | 2010-04-03 | 1 | -4/+18 |
| | | |||||
* | | Bugfix for .gitignore for log files | Egil Moeller | 2010-04-03 | 1 | -0/+1 |
|/ | |||||
* | Revert "Fixed .txt file import - NOT open office import, just basic text import" | Egil Moeller | 2010-04-01 | 1 | -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 Moeller | 2010-03-31 | 4 | -4/+78 |
|\ | |||||
| * | Revert "Change Pro Account login to HTTP instead of HTTPS" | Egil Moeller | 2010-03-31 | 1 | -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 Moeller | 2010-03-31 | 1 | -1/+0 |
| | | | | | | | | This reverts commit caee6179a9a40564a406bf3fa6e4b15eeab1c926. | ||||
| * | Fixed .txt file import - NOT open office import, just basic text import | root | 2010-03-27 | 1 | -3/+3 |
| | | |||||
| * | Change Pro Account login to HTTP instead of HTTPS | root | 2010-03-27 | 1 | -1/+1 |
| | | |||||
| * | Removed need for License | root | 2010-03-27 | 1 | -1/+1 |
| | | |||||
| * | Fixed bug on export of java-script | root | 2010-03-26 | 1 | -0/+72 |
| | | |||||
| * | Added script to check java-version and availability | root | 2010-03-26 | 1 | -0/+2 |
| | | |||||
| * | Added Hello World | root | 2010-03-25 | 1 | -0/+1 |
| | | |||||
* | | add 32 user color support on pads | Peter Martischka | 2010-03-30 | 4 | -13/+70 |
| | | |||||
* | | Removed some debug-printing | Egil Moeller | 2010-03-30 | 1 | -2/+0 |
| | | |||||
* | | Bugfix for plugin manager | Egil Moeller | 2010-03-30 | 2 | -6/+4 |
| | |