aboutsummaryrefslogtreecommitdiffstats
path: root/infrastructure (follow)
Commit message (Expand)AuthorAgeFilesLines
* Merge remote branch 'upstream/master'Alexander Sulfrian2010-06-08457-0/+172967
|\
| * Remove obsolete filesMikko Rantalainen2010-05-064-4884/+0
| * Change executable bit of two files to much the intent of the files.Mikko Rantalainen2010-05-061-0/+0
| * Make scala library JAR location configurableMikko Rantalainen2010-05-061-2/+2
| * Fixed debian installation scriptsMikko Rantalainen2010-05-061-2/+2
| * Bugfix regession from IFRAME+IE bugs. Closes GH-70Simon B @piratpartiet2010-04-222-2/+16
| * Merge commit 'mainline/master'Simon B @piratpartiet2010-04-211-5/+11
| |\
| | * Merge commit 'cd2bbd0e602244403ca379f9f4d9d15bbde545a7'Michael Prasuhn2010-04-161-1/+1
| | |\
| | * \ Merge branch 'master' of http://github.com/redhog/padPeter Martischka2010-04-101-5/+11
| | |\ \
| | | * | Adde support for <%: %> and ejs_data in ejs-files, allowing templates to stor...Egil Moeller2010-04-091-5/+11
| * | | | Fix IE lacking Array#map. Closes #70Simon B @piratpartiet2010-04-211-0/+11
| * | | | Fix IFRAME bug. Closes #70Simon B @piratpartiet2010-04-213-3/+4
| | |_|/ | |/| |
| * | | Replacing 'etherpad.com' with 'main site' in some code commentsSimon Bohlin2010-04-151-1/+1
| |/ /
| * | Add another REMOVED_COS_OF_COSJeff Mitchell2010-04-081-0/+1
| * | Add needed jars which someone removed and needed code to actually make import...Jeff Mitchell2010-04-086-6/+104
| |/
| * Add REMOVED_COS_OF_COS markers so those that want to enable support provided ...Jeff Mitchell2010-04-072-1/+8
| * Add useHttpsUrls and hidePorts config optionsJeff Mitchell2010-04-071-0/+5
| * Merge branch 'master' of git://github.com/cjb/padEgil Moeller2010-04-052-42/+44
| |\
| | * 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-051-1/+1
| * | Bugfixed faststatic to handle plugins properlyEgil Moeller2010-04-051-1/+25
| * | Oups, forgot some new dependencies for handling mime/multipartEgil Moeller2010-04-046-0/+0
| |/
| * Revert "Fixed .txt file import - NOT open office import, just basic text import"Egil Moeller2010-04-011-3/+3
| * Merge branch 'john'Egil Moeller2010-03-311-3/+3
| |\
| | * Fixed .txt file import - NOT open office import, just basic text importroot2010-03-271-3/+3
| * | Bugfix for the ace callHook supportEgil Moeller2010-03-272-2/+2
| * | Added the aceInitInnerdocbodyHead hookEgil Moeller2010-03-271-0/+8
| |/
| * Added aceCreateDomline hook plus some code cleanup in the aceEgil Moeller2010-03-252-10/+22
| * Generalized linestylefilter.getURLFilter to a linestylefilter.getRegexpFilterEgil Moeller2010-03-251-42/+47
| * Bugfix for infrastructure/ace/bin/make to handle non-existent target director...Egil Moeller2010-03-251-0/+2
| * Added support for plugins in the ACE linefilterEgil Moeller2010-03-252-11/+28
| * Bugfix for ACE compilerEgil Moeller2010-03-221-4/+4
| * Merge branch 'master' into plugin-frameworkEgil Moeller2010-03-222-3/+52
| * reorganizing the first level of folders (trunk/branch folders are not the git...Elliot Kroo2010-03-11450-0/+177521
* reverted folder structure change for better mergeing with upstreamAlexander Sulfrian2010-06-08449-177498/+0
* added lineheight to headlines, to have some spaces aroundAlexander Sulfrian2010-02-161-0/+1
* rebranded for pad.spline.inf.fu-berlin.deAlexander Sulfrian2010-02-161-1/+1
* beautified codeAlexander Sulfrian2010-02-161-5/+24
* display h1,h2,h3,h4,h5,h6 as inlineAlexander Sulfrian2010-02-161-2/+6
* remove other headline properties on setting (no sense in setting two headline...Alexander Sulfrian2010-02-051-0/+7
* fixed linenumber height if first line in source has a marginAlexander Sulfrian2010-02-051-0/+5
* added header buttons and used backend functionalityAlexander Sulfrian2010-02-053-2/+29
* try to implement headlinesAlexander Sulfrian2010-02-053-2/+7
* removed obsolete svn folder from hg treealexanders@b2ef00c0-3703-41da-baef-cfe82387ac0c2010-02-03449-0/+177430