aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
...
| * Merge branch 'master' of git://github.com/Pita/padEgil Moeller2010-04-0719-61/+97
| |\
| * | Styling bugfixesEgil Moeller2010-04-062-2/+2
* | | Reduced the height of the docbar about 5pxPeter Martischka2010-04-089-18/+17
* | | Fixed some little design bugs of editbarPeter Martischka2010-04-072-33/+37
| |/ |/|
* | Fixed little design bug of the save buttonPeter Martischka2010-04-071-2/+1
* | Merge branch 'master' of git://github.com/redhog/padPeter Martischka2010-04-0715-86/+259
|\|
| * Better plugin descriptionsEgil Moeller2010-04-062-2/+2
| * More plugin manager stylingEgil Moeller2010-04-062-1/+27
| * Changed button-specific coloring to a classEgil Moeller2010-04-062-2/+2
| * Changed right hand rounded corner to silverEgil Moeller2010-04-061-1/+1
| * Styling for plugin managerEgil Moeller2010-04-062-10/+59
| * 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 param...Egil Moeller2010-04-051-3/+4
| * 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
| | * Changed the default setup to a production setup, use 'dev' as a parameter if ...Jeppe Toustrup2010-04-051-4/+3
| | * Made check to see if we are on Solaris, and if we are, then don't use '-u' on...Jeppe Toustrup2010-04-051-41/+43
| | * Make config parsing more robustChris Ball2010-04-054-4/+8
| | * 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
* | | Redesign of the editbarPeter Martischka2010-04-0719-61/+98
|/ /
* | 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