diff options
| author | Alexander Sulfrian <alexander@sulfrian.net> | 2010-06-08 09:01:43 +0200 |
|---|---|---|
| committer | Alexander Sulfrian <alexander@sulfrian.net> | 2010-06-08 09:01:43 +0200 |
| commit | d1fa08fdc9cb11dccee76d668ff85df30458c295 (patch) | |
| tree | 1d19df6405103577d872902486792e8c23bce711 /infrastructure/lib | |
| parent | d7c5ad7d6263fd1baf9bfdbaa4c50b70ef2fbdb2 (diff) | |
| parent | 70d1f9d6fcaefe611e778b8dbf3bafea8934aa08 (diff) | |
| download | etherpad-d1fa08fdc9cb11dccee76d668ff85df30458c295.tar.gz etherpad-d1fa08fdc9cb11dccee76d668ff85df30458c295.tar.xz etherpad-d1fa08fdc9cb11dccee76d668ff85df30458c295.zip | |
Merge remote branch 'upstream/master'
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
Diffstat (limited to '')
| -rw-r--r-- | infrastructure/lib/activation.jar (renamed from trunk/infrastructure/lib/activation.jar) | bin | 56290 -> 56290 bytes | |||
| -rw-r--r-- | infrastructure/lib/c3p0-0.9.1.2.jar (renamed from trunk/infrastructure/lib/c3p0-0.9.1.2.jar) | bin | 610790 -> 610790 bytes | |||
| -rw-r--r-- | infrastructure/lib/commons-fileupload-1.2.1-javadoc.jar | bin | 0 -> 275779 bytes | |||
| -rw-r--r-- | infrastructure/lib/commons-fileupload-1.2.1-sources.jar | bin | 0 -> 73721 bytes | |||
| -rw-r--r-- | infrastructure/lib/commons-fileupload-1.2.1.jar | bin | 0 -> 57779 bytes | |||
| -rw-r--r-- | infrastructure/lib/commons-io-1.4-javadoc.jar | bin | 0 -> 499643 bytes | |||
| -rw-r--r-- | infrastructure/lib/commons-io-1.4-sources.jar | bin | 0 -> 163177 bytes | |||
| -rw-r--r-- | infrastructure/lib/commons-io-1.4.jar | bin | 0 -> 109043 bytes | |||
| -rw-r--r-- | infrastructure/lib/commons-lang-2.4.jar (renamed from trunk/infrastructure/lib/commons-lang-2.4.jar) | bin | 261809 -> 261809 bytes | |||
| -rw-r--r-- | infrastructure/lib/derby-10.5.1.1.jar (renamed from trunk/infrastructure/lib/derby-10.5.1.1.jar) | bin | 2513361 -> 2513361 bytes | |||
| -rw-r--r-- | infrastructure/lib/derbytools.jar (renamed from trunk/infrastructure/lib/derbytools.jar) | bin | 155796 -> 155796 bytes | |||
| -rw-r--r-- | infrastructure/lib/dnsjava-2.0.6.jar (renamed from trunk/infrastructure/lib/dnsjava-2.0.6.jar) | bin | 268823 -> 268823 bytes | |||
| -rw-r--r-- | infrastructure/lib/java_uno-3.2.0.jar | bin | 0 -> 4205 bytes | |||
| -rw-r--r-- | infrastructure/lib/jetty-6.1.20.jar (renamed from trunk/infrastructure/lib/jetty-6.1.20.jar) | bin | 533605 -> 533605 bytes | |||
| -rw-r--r-- | infrastructure/lib/jetty-sslengine-6.1.20.jar (renamed from trunk/infrastructure/lib/jetty-sslengine-6.1.20.jar) | bin | 18285 -> 18285 bytes | |||
| -rw-r--r-- | infrastructure/lib/jetty-util-6.1.20.jar (renamed from trunk/infrastructure/lib/jetty-util-6.1.20.jar) | bin | 176016 -> 176016 bytes | |||
| -rw-r--r-- | infrastructure/lib/json.jar (renamed from trunk/infrastructure/lib/json.jar) | bin | 42335 -> 42335 bytes | |||
| -rw-r--r-- | infrastructure/lib/juh-3.2.0.jar | bin | 0 -> 55517 bytes | |||
| -rw-r--r-- | infrastructure/lib/jurt-3.2.0.jar | bin | 0 -> 108138 bytes | |||
| -rw-r--r-- | infrastructure/lib/mail.jar (renamed from trunk/infrastructure/lib/mail.jar) | bin | 356519 -> 356519 bytes | |||
| -rw-r--r-- | infrastructure/lib/manifest (renamed from trunk/infrastructure/lib/manifest) | 0 | ||||
| -rw-r--r-- | infrastructure/lib/rhino-js-1.7r1.jar (renamed from trunk/infrastructure/lib/rhino-js-1.7r1.jar) | bin | 769000 -> 769000 bytes | |||
| -rw-r--r-- | infrastructure/lib/ridl-3.2.0.jar | bin | 0 -> 256497 bytes | |||
| -rw-r--r-- | infrastructure/lib/sanselan-0.94aj.jar (renamed from trunk/infrastructure/lib/sanselan-0.94aj.jar) | bin | 390426 -> 390426 bytes | |||
| -rw-r--r-- | infrastructure/lib/servlet-api-2.5-20081211.jar (renamed from trunk/infrastructure/lib/servlet-api-2.5-20081211.jar) | bin | 134190 -> 134190 bytes | |||
| -rw-r--r-- | infrastructure/lib/tagsoup-1.2.jar (renamed from trunk/infrastructure/lib/tagsoup-1.2.jar) | bin | 90023 -> 90023 bytes | |||
| -rw-r--r-- | infrastructure/lib/unoil-3.2.0.jar | bin | 0 -> 1415707 bytes | |||
| -rw-r--r-- | infrastructure/lib/yuicompressor-2.4-appjet.jar (renamed from trunk/infrastructure/lib/yuicompressor-2.4-appjet.jar) | bin | 574932 -> 574932 bytes |
28 files changed, 0 insertions, 0 deletions
diff --git a/trunk/infrastructure/lib/activation.jar b/infrastructure/lib/activation.jar Binary files differindex 29a59a9..29a59a9 100644 --- a/trunk/infrastructure/lib/activation.jar +++ b/infrastructure/lib/activation.jar diff --git a/trunk/infrastructure/lib/c3p0-0.9.1.2.jar b/infrastructure/lib/c3p0-0.9.1.2.jar Binary files differindex 0f42d60..0f42d60 100644 --- a/trunk/infrastructure/lib/c3p0-0.9.1.2.jar +++ b/infrastructure/lib/c3p0-0.9.1.2.jar diff --git a/infrastructure/lib/commons-fileupload-1.2.1-javadoc.jar b/infrastructure/lib/commons-fileupload-1.2.1-javadoc.jar Binary files differnew file mode 100644 index 0000000..86a56ac --- /dev/null +++ b/infrastructure/lib/commons-fileupload-1.2.1-javadoc.jar diff --git a/infrastructure/lib/commons-fileupload-1.2.1-sources.jar b/infrastructure/lib/commons-fileupload-1.2.1-sources.jar Binary files differnew file mode 100644 index 0000000..8141625 --- /dev/null +++ b/infrastructure/lib/commons-fileupload-1.2.1-sources.jar diff --git a/infrastructure/lib/commons-fileupload-1.2.1.jar b/infrastructure/lib/commons-fileupload-1.2.1.jar Binary files differnew file mode 100644 index 0000000..aa209b3 --- /dev/null +++ b/infrastructure/lib/commons-fileupload-1.2.1.jar diff --git a/infrastructure/lib/commons-io-1.4-javadoc.jar b/infrastructure/lib/commons-io-1.4-javadoc.jar Binary files differnew file mode 100644 index 0000000..95731a7 --- /dev/null +++ b/infrastructure/lib/commons-io-1.4-javadoc.jar diff --git a/infrastructure/lib/commons-io-1.4-sources.jar b/infrastructure/lib/commons-io-1.4-sources.jar Binary files differnew file mode 100644 index 0000000..299708f --- /dev/null +++ b/infrastructure/lib/commons-io-1.4-sources.jar diff --git a/infrastructure/lib/commons-io-1.4.jar b/infrastructure/lib/commons-io-1.4.jar Binary files differnew file mode 100644 index 0000000..133dc6c --- /dev/null +++ b/infrastructure/lib/commons-io-1.4.jar diff --git a/trunk/infrastructure/lib/commons-lang-2.4.jar b/infrastructure/lib/commons-lang-2.4.jar Binary files differindex 532939e..532939e 100644 --- a/trunk/infrastructure/lib/commons-lang-2.4.jar +++ b/infrastructure/lib/commons-lang-2.4.jar diff --git a/trunk/infrastructure/lib/derby-10.5.1.1.jar b/infrastructure/lib/derby-10.5.1.1.jar Binary files differindex 2820dbd..2820dbd 100644 --- a/trunk/infrastructure/lib/derby-10.5.1.1.jar +++ b/infrastructure/lib/derby-10.5.1.1.jar diff --git a/trunk/infrastructure/lib/derbytools.jar b/infrastructure/lib/derbytools.jar Binary files differindex 4aa76e1..4aa76e1 100644 --- a/trunk/infrastructure/lib/derbytools.jar +++ b/infrastructure/lib/derbytools.jar diff --git a/trunk/infrastructure/lib/dnsjava-2.0.6.jar b/infrastructure/lib/dnsjava-2.0.6.jar Binary files differindex e41f9b0..e41f9b0 100644 --- a/trunk/infrastructure/lib/dnsjava-2.0.6.jar +++ b/infrastructure/lib/dnsjava-2.0.6.jar diff --git a/infrastructure/lib/java_uno-3.2.0.jar b/infrastructure/lib/java_uno-3.2.0.jar Binary files differnew file mode 100644 index 0000000..1f23dd0 --- /dev/null +++ b/infrastructure/lib/java_uno-3.2.0.jar diff --git a/trunk/infrastructure/lib/jetty-6.1.20.jar b/infrastructure/lib/jetty-6.1.20.jar Binary files differindex 8f45db9..8f45db9 100644 --- a/trunk/infrastructure/lib/jetty-6.1.20.jar +++ b/infrastructure/lib/jetty-6.1.20.jar diff --git a/trunk/infrastructure/lib/jetty-sslengine-6.1.20.jar b/infrastructure/lib/jetty-sslengine-6.1.20.jar Binary files differindex 6f7d232..6f7d232 100644 --- a/trunk/infrastructure/lib/jetty-sslengine-6.1.20.jar +++ b/infrastructure/lib/jetty-sslengine-6.1.20.jar diff --git a/trunk/infrastructure/lib/jetty-util-6.1.20.jar b/infrastructure/lib/jetty-util-6.1.20.jar Binary files differindex 96c0979..96c0979 100644 --- a/trunk/infrastructure/lib/jetty-util-6.1.20.jar +++ b/infrastructure/lib/jetty-util-6.1.20.jar diff --git a/trunk/infrastructure/lib/json.jar b/infrastructure/lib/json.jar Binary files differindex 5ab955c..5ab955c 100644 --- a/trunk/infrastructure/lib/json.jar +++ b/infrastructure/lib/json.jar diff --git a/infrastructure/lib/juh-3.2.0.jar b/infrastructure/lib/juh-3.2.0.jar Binary files differnew file mode 100644 index 0000000..5345fe2 --- /dev/null +++ b/infrastructure/lib/juh-3.2.0.jar diff --git a/infrastructure/lib/jurt-3.2.0.jar b/infrastructure/lib/jurt-3.2.0.jar Binary files differnew file mode 100644 index 0000000..50f2346 --- /dev/null +++ b/infrastructure/lib/jurt-3.2.0.jar diff --git a/trunk/infrastructure/lib/mail.jar b/infrastructure/lib/mail.jar Binary files differindex e6f7083..e6f7083 100644 --- a/trunk/infrastructure/lib/mail.jar +++ b/infrastructure/lib/mail.jar diff --git a/trunk/infrastructure/lib/manifest b/infrastructure/lib/manifest index b91a5a7..b91a5a7 100644 --- a/trunk/infrastructure/lib/manifest +++ b/infrastructure/lib/manifest diff --git a/trunk/infrastructure/lib/rhino-js-1.7r1.jar b/infrastructure/lib/rhino-js-1.7r1.jar Binary files differindex 79f8529..79f8529 100644 --- a/trunk/infrastructure/lib/rhino-js-1.7r1.jar +++ b/infrastructure/lib/rhino-js-1.7r1.jar diff --git a/infrastructure/lib/ridl-3.2.0.jar b/infrastructure/lib/ridl-3.2.0.jar Binary files differnew file mode 100644 index 0000000..de46acb --- /dev/null +++ b/infrastructure/lib/ridl-3.2.0.jar diff --git a/trunk/infrastructure/lib/sanselan-0.94aj.jar b/infrastructure/lib/sanselan-0.94aj.jar Binary files differindex 0fd8c96..0fd8c96 100644 --- a/trunk/infrastructure/lib/sanselan-0.94aj.jar +++ b/infrastructure/lib/sanselan-0.94aj.jar diff --git a/trunk/infrastructure/lib/servlet-api-2.5-20081211.jar b/infrastructure/lib/servlet-api-2.5-20081211.jar Binary files differindex f1bfa12..f1bfa12 100644 --- a/trunk/infrastructure/lib/servlet-api-2.5-20081211.jar +++ b/infrastructure/lib/servlet-api-2.5-20081211.jar diff --git a/trunk/infrastructure/lib/tagsoup-1.2.jar b/infrastructure/lib/tagsoup-1.2.jar Binary files differindex af27803..af27803 100644 --- a/trunk/infrastructure/lib/tagsoup-1.2.jar +++ b/infrastructure/lib/tagsoup-1.2.jar diff --git a/infrastructure/lib/unoil-3.2.0.jar b/infrastructure/lib/unoil-3.2.0.jar Binary files differnew file mode 100644 index 0000000..b1e77aa --- /dev/null +++ b/infrastructure/lib/unoil-3.2.0.jar diff --git a/trunk/infrastructure/lib/yuicompressor-2.4-appjet.jar b/infrastructure/lib/yuicompressor-2.4-appjet.jar Binary files differindex b5bdfc1..b5bdfc1 100644 --- a/trunk/infrastructure/lib/yuicompressor-2.4-appjet.jar +++ b/infrastructure/lib/yuicompressor-2.4-appjet.jar |