aboutsummaryrefslogtreecommitdiffstats
path: root/infrastructure (follow)
Commit message (Collapse)AuthorAgeFilesLines
* Merge commit 'cd2bbd0e602244403ca379f9f4d9d15bbde545a7'Michael Prasuhn2010-04-161-1/+1
|\
| * Replacing 'etherpad.com' with 'main site' in some code commentsSimon Bohlin2010-04-151-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 ↵Egil Moeller2010-04-091-5/+11
| | | | | | | | store/restore template-generated content.
* | Add another REMOVED_COS_OF_COSJeff Mitchell2010-04-081-0/+1
| |
* | Add needed jars which someone removed and needed code to actually make ↵Jeff Mitchell2010-04-086-6/+104
|/ | | | import/export work. Have tested it and it works well. Note that if you don't have a soffice server running, it just doesn't do anything, so this is safe to have active.
* Add REMOVED_COS_OF_COS markers so those that want to enable support provided ↵Jeff Mitchell2010-04-072-1/+8
| | | | by cos.jar can easily find what to uncomment.
* 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' ↵Jeppe Toustrup2010-04-051-41/+43
| | | | | | | | | | | | on the cp command. Also, convertion of spaces to tabs.
| * Make config parsing more robustChris Ball2010-04-051-1/+1
| | | | | | | | | | Previously, config booleans like etherpad.isProduction accepted only "true", and not "true " or " true" or "True" or "TRUE". Fix that.
* | 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
| | | | | | 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-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 ↵Egil Moeller2010-03-251-0/+2
| | | | directories, as git removes empty directories :(
* 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 ↵Elliot Kroo2010-03-11450-0/+177521
git way :)