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 /etherpad/src/static/img/jun09 | |
parent | d7c5ad7d6263fd1baf9bfdbaa4c50b70ef2fbdb2 (diff) | |
parent | 70d1f9d6fcaefe611e778b8dbf3bafea8934aa08 (diff) | |
download | etherpad-d1fa08fdc9cb11dccee76d668ff85df30458c295.tar.gz etherpad-d1fa08fdc9cb11dccee76d668ff85df30458c295.tar.bz2 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 'etherpad/src/static/img/jun09')
50 files changed, 0 insertions, 0 deletions
diff --git a/etherpad/src/static/img/jun09/pad/backgrad.gif b/etherpad/src/static/img/jun09/pad/backgrad.gif Binary files differnew file mode 100644 index 0000000..8fee1a5 --- /dev/null +++ b/etherpad/src/static/img/jun09/pad/backgrad.gif diff --git a/etherpad/src/static/img/jun09/pad/colorpicker.gif b/etherpad/src/static/img/jun09/pad/colorpicker.gif Binary files differnew file mode 100644 index 0000000..effa3cc --- /dev/null +++ b/etherpad/src/static/img/jun09/pad/colorpicker.gif diff --git a/etherpad/src/static/img/jun09/pad/connectingbar.gif b/etherpad/src/static/img/jun09/pad/connectingbar.gif Binary files differnew file mode 100644 index 0000000..34f54e9 --- /dev/null +++ b/etherpad/src/static/img/jun09/pad/connectingbar.gif diff --git a/etherpad/src/static/img/jun09/pad/docpaneledge2.png b/etherpad/src/static/img/jun09/pad/docpaneledge2.png Binary files differnew file mode 100644 index 0000000..c119c74 --- /dev/null +++ b/etherpad/src/static/img/jun09/pad/docpaneledge2.png diff --git a/etherpad/src/static/img/jun09/pad/docpanelmiddle2.png b/etherpad/src/static/img/jun09/pad/docpanelmiddle2.png Binary files differnew file mode 100644 index 0000000..d251c23 --- /dev/null +++ b/etherpad/src/static/img/jun09/pad/docpanelmiddle2.png diff --git a/etherpad/src/static/img/jun09/pad/editbar_background.gif b/etherpad/src/static/img/jun09/pad/editbar_background.gif Binary files differnew file mode 100644 index 0000000..54ef6e4 --- /dev/null +++ b/etherpad/src/static/img/jun09/pad/editbar_background.gif diff --git a/etherpad/src/static/img/jun09/pad/editbar_background_left.gif b/etherpad/src/static/img/jun09/pad/editbar_background_left.gif Binary files differnew file mode 100644 index 0000000..fe8d06e --- /dev/null +++ b/etherpad/src/static/img/jun09/pad/editbar_background_left.gif diff --git a/etherpad/src/static/img/jun09/pad/editbar_background_right.gif b/etherpad/src/static/img/jun09/pad/editbar_background_right.gif Binary files differnew file mode 100644 index 0000000..55ab00a --- /dev/null +++ b/etherpad/src/static/img/jun09/pad/editbar_background_right.gif diff --git a/etherpad/src/static/img/jun09/pad/editbar_bold.gif b/etherpad/src/static/img/jun09/pad/editbar_bold.gif Binary files differnew file mode 100644 index 0000000..d22bcaf --- /dev/null +++ b/etherpad/src/static/img/jun09/pad/editbar_bold.gif diff --git a/etherpad/src/static/img/jun09/pad/editbar_clearauthorship.gif b/etherpad/src/static/img/jun09/pad/editbar_clearauthorship.gif Binary files differnew file mode 100644 index 0000000..2c6d109 --- /dev/null +++ b/etherpad/src/static/img/jun09/pad/editbar_clearauthorship.gif diff --git a/etherpad/src/static/img/jun09/pad/editbar_groupleft.gif b/etherpad/src/static/img/jun09/pad/editbar_groupleft.gif Binary files differnew file mode 100644 index 0000000..3e18749 --- /dev/null +++ b/etherpad/src/static/img/jun09/pad/editbar_groupleft.gif diff --git a/etherpad/src/static/img/jun09/pad/editbar_groupright.gif b/etherpad/src/static/img/jun09/pad/editbar_groupright.gif Binary files differnew file mode 100644 index 0000000..bf8b757 --- /dev/null +++ b/etherpad/src/static/img/jun09/pad/editbar_groupright.gif diff --git a/etherpad/src/static/img/jun09/pad/editbar_indent.gif b/etherpad/src/static/img/jun09/pad/editbar_indent.gif Binary files differnew file mode 100644 index 0000000..989523a --- /dev/null +++ b/etherpad/src/static/img/jun09/pad/editbar_indent.gif diff --git a/etherpad/src/static/img/jun09/pad/editbar_insertunorderedlist.gif b/etherpad/src/static/img/jun09/pad/editbar_insertunorderedlist.gif Binary files differnew file mode 100644 index 0000000..b032d59 --- /dev/null +++ b/etherpad/src/static/img/jun09/pad/editbar_insertunorderedlist.gif diff --git a/etherpad/src/static/img/jun09/pad/editbar_italic.gif b/etherpad/src/static/img/jun09/pad/editbar_italic.gif Binary files differnew file mode 100644 index 0000000..a017402 --- /dev/null +++ b/etherpad/src/static/img/jun09/pad/editbar_italic.gif diff --git a/etherpad/src/static/img/jun09/pad/editbar_outdent.gif b/etherpad/src/static/img/jun09/pad/editbar_outdent.gif Binary files differnew file mode 100644 index 0000000..4b9bf38 --- /dev/null +++ b/etherpad/src/static/img/jun09/pad/editbar_outdent.gif diff --git a/etherpad/src/static/img/jun09/pad/editbar_redo.gif b/etherpad/src/static/img/jun09/pad/editbar_redo.gif Binary files differnew file mode 100644 index 0000000..826a254 --- /dev/null +++ b/etherpad/src/static/img/jun09/pad/editbar_redo.gif diff --git a/etherpad/src/static/img/jun09/pad/editbar_save.gif b/etherpad/src/static/img/jun09/pad/editbar_save.gif Binary files differnew file mode 100644 index 0000000..2ccced6 --- /dev/null +++ b/etherpad/src/static/img/jun09/pad/editbar_save.gif diff --git a/etherpad/src/static/img/jun09/pad/editbar_strikethrough.gif b/etherpad/src/static/img/jun09/pad/editbar_strikethrough.gif Binary files differnew file mode 100644 index 0000000..92ffa23 --- /dev/null +++ b/etherpad/src/static/img/jun09/pad/editbar_strikethrough.gif diff --git a/etherpad/src/static/img/jun09/pad/editbar_underline.gif b/etherpad/src/static/img/jun09/pad/editbar_underline.gif Binary files differnew file mode 100644 index 0000000..ec3cc4e --- /dev/null +++ b/etherpad/src/static/img/jun09/pad/editbar_underline.gif diff --git a/etherpad/src/static/img/jun09/pad/editbar_undo.gif b/etherpad/src/static/img/jun09/pad/editbar_undo.gif Binary files differnew file mode 100644 index 0000000..78ae0be --- /dev/null +++ b/etherpad/src/static/img/jun09/pad/editbar_undo.gif diff --git a/etherpad/src/static/img/jun09/pad/editbarback.gif b/etherpad/src/static/img/jun09/pad/editbarback.gif Binary files differnew file mode 100644 index 0000000..ab51802 --- /dev/null +++ b/etherpad/src/static/img/jun09/pad/editbarback.gif diff --git a/etherpad/src/static/img/jun09/pad/feedbackbox2.gif b/etherpad/src/static/img/jun09/pad/feedbackbox2.gif Binary files differnew file mode 100644 index 0000000..f1b8f5b --- /dev/null +++ b/etherpad/src/static/img/jun09/pad/feedbackbox2.gif diff --git a/etherpad/src/static/img/jun09/pad/fileicons.gif b/etherpad/src/static/img/jun09/pad/fileicons.gif Binary files differnew file mode 100644 index 0000000..26f6388 --- /dev/null +++ b/etherpad/src/static/img/jun09/pad/fileicons.gif diff --git a/etherpad/src/static/img/jun09/pad/hdraggie.gif b/etherpad/src/static/img/jun09/pad/hdraggie.gif Binary files differnew file mode 100644 index 0000000..0a6fe3e --- /dev/null +++ b/etherpad/src/static/img/jun09/pad/hdraggie.gif diff --git a/etherpad/src/static/img/jun09/pad/icon_import_export.gif b/etherpad/src/static/img/jun09/pad/icon_import_export.gif Binary files differnew file mode 100644 index 0000000..1b77245 --- /dev/null +++ b/etherpad/src/static/img/jun09/pad/icon_import_export.gif diff --git a/etherpad/src/static/img/jun09/pad/icon_pad_options.gif b/etherpad/src/static/img/jun09/pad/icon_pad_options.gif Binary files differnew file mode 100644 index 0000000..68c79a7 --- /dev/null +++ b/etherpad/src/static/img/jun09/pad/icon_pad_options.gif diff --git a/etherpad/src/static/img/jun09/pad/icon_saved_revisions.gif b/etherpad/src/static/img/jun09/pad/icon_saved_revisions.gif Binary files differnew file mode 100644 index 0000000..8040145 --- /dev/null +++ b/etherpad/src/static/img/jun09/pad/icon_saved_revisions.gif diff --git a/etherpad/src/static/img/jun09/pad/icon_security.gif b/etherpad/src/static/img/jun09/pad/icon_security.gif Binary files differnew file mode 100644 index 0000000..9131fc3 --- /dev/null +++ b/etherpad/src/static/img/jun09/pad/icon_security.gif diff --git a/etherpad/src/static/img/jun09/pad/icon_time_slider.gif b/etherpad/src/static/img/jun09/pad/icon_time_slider.gif Binary files differnew file mode 100644 index 0000000..5e4b4ab --- /dev/null +++ b/etherpad/src/static/img/jun09/pad/icon_time_slider.gif diff --git a/etherpad/src/static/img/jun09/pad/inviteshare.gif b/etherpad/src/static/img/jun09/pad/inviteshare.gif Binary files differnew file mode 100644 index 0000000..55345e5 --- /dev/null +++ b/etherpad/src/static/img/jun09/pad/inviteshare.gif diff --git a/etherpad/src/static/img/jun09/pad/inviteshare2.gif b/etherpad/src/static/img/jun09/pad/inviteshare2.gif Binary files differnew file mode 100644 index 0000000..98d4c85 --- /dev/null +++ b/etherpad/src/static/img/jun09/pad/inviteshare2.gif diff --git a/etherpad/src/static/img/jun09/pad/layoutbuttons.gif b/etherpad/src/static/img/jun09/pad/layoutbuttons.gif Binary files differnew file mode 100644 index 0000000..ea43432 --- /dev/null +++ b/etherpad/src/static/img/jun09/pad/layoutbuttons.gif diff --git a/etherpad/src/static/img/jun09/pad/ok_or_cancel.gif b/etherpad/src/static/img/jun09/pad/ok_or_cancel.gif Binary files differnew file mode 100644 index 0000000..76ba692 --- /dev/null +++ b/etherpad/src/static/img/jun09/pad/ok_or_cancel.gif diff --git a/etherpad/src/static/img/jun09/pad/overlay2.png b/etherpad/src/static/img/jun09/pad/overlay2.png Binary files differnew file mode 100644 index 0000000..c3d3f1c --- /dev/null +++ b/etherpad/src/static/img/jun09/pad/overlay2.png diff --git a/etherpad/src/static/img/jun09/pad/padtop5.gif b/etherpad/src/static/img/jun09/pad/padtop5.gif Binary files differnew file mode 100644 index 0000000..e6e071d --- /dev/null +++ b/etherpad/src/static/img/jun09/pad/padtop5.gif diff --git a/etherpad/src/static/img/jun09/pad/padtop5.png b/etherpad/src/static/img/jun09/pad/padtop5.png Binary files differnew file mode 100644 index 0000000..22a0db7 --- /dev/null +++ b/etherpad/src/static/img/jun09/pad/padtop5.png diff --git a/etherpad/src/static/img/jun09/pad/padtop5.xcf b/etherpad/src/static/img/jun09/pad/padtop5.xcf Binary files differnew file mode 100644 index 0000000..c0bf7e4 --- /dev/null +++ b/etherpad/src/static/img/jun09/pad/padtop5.xcf diff --git a/etherpad/src/static/img/jun09/pad/padtopback2.gif b/etherpad/src/static/img/jun09/pad/padtopback2.gif Binary files differnew file mode 100644 index 0000000..db46567 --- /dev/null +++ b/etherpad/src/static/img/jun09/pad/padtopback2.gif diff --git a/etherpad/src/static/img/jun09/pad/public.gif b/etherpad/src/static/img/jun09/pad/public.gif Binary files differnew file mode 100644 index 0000000..ac3093b --- /dev/null +++ b/etherpad/src/static/img/jun09/pad/public.gif diff --git a/etherpad/src/static/img/jun09/pad/roundcorner_left.gif b/etherpad/src/static/img/jun09/pad/roundcorner_left.gif Binary files differnew file mode 100644 index 0000000..000de75 --- /dev/null +++ b/etherpad/src/static/img/jun09/pad/roundcorner_left.gif diff --git a/etherpad/src/static/img/jun09/pad/roundcorner_right.gif b/etherpad/src/static/img/jun09/pad/roundcorner_right.gif Binary files differnew file mode 100644 index 0000000..97acfbf --- /dev/null +++ b/etherpad/src/static/img/jun09/pad/roundcorner_right.gif diff --git a/etherpad/src/static/img/jun09/pad/roundcorner_right_orange.gif b/etherpad/src/static/img/jun09/pad/roundcorner_right_orange.gif Binary files differnew file mode 100644 index 0000000..717e3fc --- /dev/null +++ b/etherpad/src/static/img/jun09/pad/roundcorner_right_orange.gif diff --git a/etherpad/src/static/img/jun09/pad/savedrevarrows.gif b/etherpad/src/static/img/jun09/pad/savedrevarrows.gif Binary files differnew file mode 100644 index 0000000..2aa2e41 --- /dev/null +++ b/etherpad/src/static/img/jun09/pad/savedrevarrows.gif diff --git a/etherpad/src/static/img/jun09/pad/savedrevsgfx2.gif b/etherpad/src/static/img/jun09/pad/savedrevsgfx2.gif Binary files differnew file mode 100644 index 0000000..45c3459 --- /dev/null +++ b/etherpad/src/static/img/jun09/pad/savedrevsgfx2.gif diff --git a/etherpad/src/static/img/jun09/pad/sharebox4.gif b/etherpad/src/static/img/jun09/pad/sharebox4.gif Binary files differnew file mode 100644 index 0000000..eccaa7e --- /dev/null +++ b/etherpad/src/static/img/jun09/pad/sharebox4.gif diff --git a/etherpad/src/static/img/jun09/pad/sharedistri.gif b/etherpad/src/static/img/jun09/pad/sharedistri.gif Binary files differnew file mode 100644 index 0000000..8eb5891 --- /dev/null +++ b/etherpad/src/static/img/jun09/pad/sharedistri.gif diff --git a/etherpad/src/static/img/jun09/pad/syncdone.gif b/etherpad/src/static/img/jun09/pad/syncdone.gif Binary files differnew file mode 100644 index 0000000..e4d971b --- /dev/null +++ b/etherpad/src/static/img/jun09/pad/syncdone.gif diff --git a/etherpad/src/static/img/jun09/pad/syncing.gif b/etherpad/src/static/img/jun09/pad/syncing.gif Binary files differnew file mode 100644 index 0000000..bbc731f --- /dev/null +++ b/etherpad/src/static/img/jun09/pad/syncing.gif diff --git a/etherpad/src/static/img/jun09/pad/viewbargfx.gif b/etherpad/src/static/img/jun09/pad/viewbargfx.gif Binary files differnew file mode 100644 index 0000000..396483a --- /dev/null +++ b/etherpad/src/static/img/jun09/pad/viewbargfx.gif |