aboutsummaryrefslogtreecommitdiffstats
path: root/infrastructure (follow)
Commit message (Collapse)AuthorAgeFilesLines
* Merge remote branch 'upstream/master'Alexander Sulfrian2010-06-08457-0/+172967
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: etherpad/src/etherpad/control/pro/admin/pro_admin_control.js etherpad/src/etherpad/control/pro/pro_main_control.js etherpad/src/etherpad/control/pro_help_control.js etherpad/src/etherpad/globals.js etherpad/src/etherpad/legacy_urls.js etherpad/src/etherpad/pne/pne_utils.js etherpad/src/etherpad/pro/pro_utils.js etherpad/src/main.js etherpad/src/plugins/fileUpload/templates/fileUpload.ejs etherpad/src/plugins/testplugin/templates/page.ejs etherpad/src/static/css/pad2_ejs.css etherpad/src/static/css/pro-help.css etherpad/src/static/img/jun09/pad/protop.gif etherpad/src/static/js/store.js etherpad/src/themes/default/templates/framed/framedheader-pro.ejs etherpad/src/themes/default/templates/main/home.ejs etherpad/src/themes/default/templates/pro-help/main.ejs etherpad/src/themes/default/templates/pro-help/pro-help-template.ejs infrastructure/com.etherpad/licensing.scala trunk/etherpad/src/etherpad/collab/ace/contentcollector.js trunk/etherpad/src/etherpad/collab/ace/linestylefilter.js trunk/etherpad/src/static/css/home-opensource.css trunk/etherpad/src/static/js/ace.js trunk/etherpad/src/static/js/linestylefilter_client.js trunk/etherpad/src/templates/email/eepnet_license_info.ejs trunk/etherpad/src/templates/pad/pad_body2.ejs trunk/etherpad/src/templates/pad/pad_content.ejs trunk/etherpad/src/templates/pad/padfull_body.ejs trunk/etherpad/src/templates/pro/admin/pne-license-manager.ejs
| * Remove obsolete filesMikko Rantalainen2010-05-064-4884/+0
| | | | | | | | These files were probably included by mistake.
| * Change executable bit of two files to much the intent of the files.Mikko Rantalainen2010-05-061-0/+0
| | | | | | | | Make lintian happier.
| * Make scala library JAR location configurableMikko Rantalainen2010-05-061-2/+2
| | | | | | | | | | scala-library.jar may be in $SCALA_HOME/lib or in $SCALA_HOME. Make it possible to point directly to scala-library.jar anywhere.
| * Fixed debian installation scriptsMikko Rantalainen2010-05-061-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Directory /usr/share/etherpad/etherpad/data was not created which caused install process to stop with error message: Adding system-user for etherpad chown: cannot access `/usr/share/etherpad/etherpad/data': No such file or directory dpkg: error processing etherpad (--install): subprocess installed post-installation script returned error exit status 1 Processing triggers for ureadahead ... Errors were encountered while processing: etherpad Fixed location of scala-library.jar in Ubuntu. This may need changes in the future to help building the JAR on both Debian based systems and other systems. Added scala-library to Build-Depends in addition to scala dependency.
| * 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 ↵Egil Moeller2010-04-091-5/+11
| | | | | | | | | | | | | | | | | | | | store/restore template-generated content.
| * | | | 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 ↵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 :)
* 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 ↵Alexander Sulfrian2010-02-051-0/+7
| | | | headlines at one region)
* 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
--HG-- extra : convert_revision : svn%3Ab2ef00c0-3703-41da-baef-cfe82387ac0c/trunk%408
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-21 21:26:01 +0000