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 /trunk/etherpad/src/static/img/pad | |
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 'trunk/etherpad/src/static/img/pad')
53 files changed, 0 insertions, 0 deletions
diff --git a/trunk/etherpad/src/static/img/pad/animated-orb-orange-12.gif b/trunk/etherpad/src/static/img/pad/animated-orb-orange-12.gif Binary files differdeleted file mode 100644 index 9db02c6..0000000 --- a/trunk/etherpad/src/static/img/pad/animated-orb-orange-12.gif +++ /dev/null diff --git a/trunk/etherpad/src/static/img/pad/backgrad.png b/trunk/etherpad/src/static/img/pad/backgrad.png Binary files differdeleted file mode 100644 index d85f73c..0000000 --- a/trunk/etherpad/src/static/img/pad/backgrad.png +++ /dev/null diff --git a/trunk/etherpad/src/static/img/pad/backshadow/backshadow-940-20-eee-20.gif b/trunk/etherpad/src/static/img/pad/backshadow/backshadow-940-20-eee-20.gif Binary files differdeleted file mode 100644 index bc3088b..0000000 --- a/trunk/etherpad/src/static/img/pad/backshadow/backshadow-940-20-eee-20.gif +++ /dev/null diff --git a/trunk/etherpad/src/static/img/pad/backshadow/backshadow-940-20-fff-20.gif b/trunk/etherpad/src/static/img/pad/backshadow/backshadow-940-20-fff-20.gif Binary files differdeleted file mode 100644 index 8a87283..0000000 --- a/trunk/etherpad/src/static/img/pad/backshadow/backshadow-940-20-fff-20.gif +++ /dev/null diff --git a/trunk/etherpad/src/static/img/pad/backshadow/backshadow-940-20-fff-40.gif b/trunk/etherpad/src/static/img/pad/backshadow/backshadow-940-20-fff-40.gif Binary files differdeleted file mode 100644 index 695ecbe..0000000 --- a/trunk/etherpad/src/static/img/pad/backshadow/backshadow-940-20-fff-40.gif +++ /dev/null diff --git a/trunk/etherpad/src/static/img/pad/backshadow/backshadow-940-20-fff-60.gif b/trunk/etherpad/src/static/img/pad/backshadow/backshadow-940-20-fff-60.gif Binary files differdeleted file mode 100644 index 0005405..0000000 --- a/trunk/etherpad/src/static/img/pad/backshadow/backshadow-940-20-fff-60.gif +++ /dev/null diff --git a/trunk/etherpad/src/static/img/pad/backshadow/botshadow-940-20-eee-20.gif b/trunk/etherpad/src/static/img/pad/backshadow/botshadow-940-20-eee-20.gif Binary files differdeleted file mode 100644 index 92fb5dc..0000000 --- a/trunk/etherpad/src/static/img/pad/backshadow/botshadow-940-20-eee-20.gif +++ /dev/null diff --git a/trunk/etherpad/src/static/img/pad/etherpad-logo-small-grad.gif b/trunk/etherpad/src/static/img/pad/etherpad-logo-small-grad.gif Binary files differdeleted file mode 100644 index a65aa15..0000000 --- a/trunk/etherpad/src/static/img/pad/etherpad-logo-small-grad.gif +++ /dev/null diff --git a/trunk/etherpad/src/static/img/pad/etherpad-logo-small.gif b/trunk/etherpad/src/static/img/pad/etherpad-logo-small.gif Binary files differdeleted file mode 100644 index 6669f39..0000000 --- a/trunk/etherpad/src/static/img/pad/etherpad-logo-small.gif +++ /dev/null diff --git a/trunk/etherpad/src/static/img/pad/etherpad-logo-small2.gif b/trunk/etherpad/src/static/img/pad/etherpad-logo-small2.gif Binary files differdeleted file mode 100644 index 6e33392..0000000 --- a/trunk/etherpad/src/static/img/pad/etherpad-logo-small2.gif +++ /dev/null diff --git a/trunk/etherpad/src/static/img/pad/expandy-arrow-down.gif b/trunk/etherpad/src/static/img/pad/expandy-arrow-down.gif Binary files differdeleted file mode 100644 index 4b67c17..0000000 --- a/trunk/etherpad/src/static/img/pad/expandy-arrow-down.gif +++ /dev/null diff --git a/trunk/etherpad/src/static/img/pad/expandy-arrow-right.gif b/trunk/etherpad/src/static/img/pad/expandy-arrow-right.gif Binary files differdeleted file mode 100644 index 61303e6..0000000 --- a/trunk/etherpad/src/static/img/pad/expandy-arrow-right.gif +++ /dev/null diff --git a/trunk/etherpad/src/static/img/pad/expandy-arrow6-down-active.gif b/trunk/etherpad/src/static/img/pad/expandy-arrow6-down-active.gif Binary files differdeleted file mode 100644 index 5f530b7..0000000 --- a/trunk/etherpad/src/static/img/pad/expandy-arrow6-down-active.gif +++ /dev/null diff --git a/trunk/etherpad/src/static/img/pad/expandy-arrow6-down.gif b/trunk/etherpad/src/static/img/pad/expandy-arrow6-down.gif Binary files differdeleted file mode 100644 index 42fa9af..0000000 --- a/trunk/etherpad/src/static/img/pad/expandy-arrow6-down.gif +++ /dev/null diff --git a/trunk/etherpad/src/static/img/pad/expandy-arrow6-right-active.gif b/trunk/etherpad/src/static/img/pad/expandy-arrow6-right-active.gif Binary files differdeleted file mode 100644 index 4496fad..0000000 --- a/trunk/etherpad/src/static/img/pad/expandy-arrow6-right-active.gif +++ /dev/null diff --git a/trunk/etherpad/src/static/img/pad/expandy-arrow6-right.gif b/trunk/etherpad/src/static/img/pad/expandy-arrow6-right.gif Binary files differdeleted file mode 100644 index 9a8274c..0000000 --- a/trunk/etherpad/src/static/img/pad/expandy-arrow6-right.gif +++ /dev/null diff --git a/trunk/etherpad/src/static/img/pad/header-revgrad.gif b/trunk/etherpad/src/static/img/pad/header-revgrad.gif Binary files differdeleted file mode 100644 index e803e2a..0000000 --- a/trunk/etherpad/src/static/img/pad/header-revgrad.gif +++ /dev/null diff --git a/trunk/etherpad/src/static/img/pad/newpad.gif b/trunk/etherpad/src/static/img/pad/newpad.gif Binary files differdeleted file mode 100644 index c631cc4..0000000 --- a/trunk/etherpad/src/static/img/pad/newpad.gif +++ /dev/null diff --git a/trunk/etherpad/src/static/img/pad/orb-greenred-12.gif b/trunk/etherpad/src/static/img/pad/orb-greenred-12.gif Binary files differdeleted file mode 100644 index d722168..0000000 --- a/trunk/etherpad/src/static/img/pad/orb-greenred-12.gif +++ /dev/null diff --git a/trunk/etherpad/src/static/img/pad/padbg1.jpg b/trunk/etherpad/src/static/img/pad/padbg1.jpg Binary files differdeleted file mode 100644 index 8e640fd..0000000 --- a/trunk/etherpad/src/static/img/pad/padbg1.jpg +++ /dev/null diff --git a/trunk/etherpad/src/static/img/pad/padbg2.jpg b/trunk/etherpad/src/static/img/pad/padbg2.jpg Binary files differdeleted file mode 100644 index 1248bc0..0000000 --- a/trunk/etherpad/src/static/img/pad/padbg2.jpg +++ /dev/null diff --git a/trunk/etherpad/src/static/img/pad/padbg3.jpg b/trunk/etherpad/src/static/img/pad/padbg3.jpg Binary files differdeleted file mode 100644 index 99bba32..0000000 --- a/trunk/etherpad/src/static/img/pad/padbg3.jpg +++ /dev/null diff --git a/trunk/etherpad/src/static/img/pad/padbg4.jpg b/trunk/etherpad/src/static/img/pad/padbg4.jpg Binary files differdeleted file mode 100644 index 2497360..0000000 --- a/trunk/etherpad/src/static/img/pad/padbg4.jpg +++ /dev/null diff --git a/trunk/etherpad/src/static/img/pad/padbg5.jpg b/trunk/etherpad/src/static/img/pad/padbg5.jpg Binary files differdeleted file mode 100644 index bc3953c..0000000 --- a/trunk/etherpad/src/static/img/pad/padbg5.jpg +++ /dev/null diff --git a/trunk/etherpad/src/static/img/pad/padhead1.jpg b/trunk/etherpad/src/static/img/pad/padhead1.jpg Binary files differdeleted file mode 100644 index e263cf4..0000000 --- a/trunk/etherpad/src/static/img/pad/padhead1.jpg +++ /dev/null diff --git a/trunk/etherpad/src/static/img/pad/padhead2.jpg b/trunk/etherpad/src/static/img/pad/padhead2.jpg Binary files differdeleted file mode 100644 index a2f247d..0000000 --- a/trunk/etherpad/src/static/img/pad/padhead2.jpg +++ /dev/null diff --git a/trunk/etherpad/src/static/img/pad/padhead3.jpg b/trunk/etherpad/src/static/img/pad/padhead3.jpg Binary files differdeleted file mode 100644 index 101432f..0000000 --- a/trunk/etherpad/src/static/img/pad/padhead3.jpg +++ /dev/null diff --git a/trunk/etherpad/src/static/img/pad/pencil-icon-small-blue.gif b/trunk/etherpad/src/static/img/pad/pencil-icon-small-blue.gif Binary files differdeleted file mode 100644 index f60b0f2..0000000 --- a/trunk/etherpad/src/static/img/pad/pencil-icon-small-blue.gif +++ /dev/null diff --git a/trunk/etherpad/src/static/img/pad/sidehead-grad.gif b/trunk/etherpad/src/static/img/pad/sidehead-grad.gif Binary files differdeleted file mode 100644 index 32bac92..0000000 --- a/trunk/etherpad/src/static/img/pad/sidehead-grad.gif +++ /dev/null diff --git a/trunk/etherpad/src/static/img/pad/timeslider/button_depressed.png b/trunk/etherpad/src/static/img/pad/timeslider/button_depressed.png Binary files differdeleted file mode 100644 index 1e96692..0000000 --- a/trunk/etherpad/src/static/img/pad/timeslider/button_depressed.png +++ /dev/null diff --git a/trunk/etherpad/src/static/img/pad/timeslider/button_undepressed.png b/trunk/etherpad/src/static/img/pad/timeslider/button_undepressed.png Binary files differdeleted file mode 100644 index cd2d7a8..0000000 --- a/trunk/etherpad/src/static/img/pad/timeslider/button_undepressed.png +++ /dev/null diff --git a/trunk/etherpad/src/static/img/pad/timeslider/crushed_button_depressed.png b/trunk/etherpad/src/static/img/pad/timeslider/crushed_button_depressed.png Binary files differdeleted file mode 100644 index d75dcce..0000000 --- a/trunk/etherpad/src/static/img/pad/timeslider/crushed_button_depressed.png +++ /dev/null diff --git a/trunk/etherpad/src/static/img/pad/timeslider/crushed_button_undepressed.png b/trunk/etherpad/src/static/img/pad/timeslider/crushed_button_undepressed.png Binary files differdeleted file mode 100644 index d86e3f3..0000000 --- a/trunk/etherpad/src/static/img/pad/timeslider/crushed_button_undepressed.png +++ /dev/null diff --git a/trunk/etherpad/src/static/img/pad/timeslider/crushed_current_location.png b/trunk/etherpad/src/static/img/pad/timeslider/crushed_current_location.png Binary files differdeleted file mode 100644 index 76e0835..0000000 --- a/trunk/etherpad/src/static/img/pad/timeslider/crushed_current_location.png +++ /dev/null diff --git a/trunk/etherpad/src/static/img/pad/timeslider/crushed_pause.png b/trunk/etherpad/src/static/img/pad/timeslider/crushed_pause.png Binary files differdeleted file mode 100644 index 437b384..0000000 --- a/trunk/etherpad/src/static/img/pad/timeslider/crushed_pause.png +++ /dev/null diff --git a/trunk/etherpad/src/static/img/pad/timeslider/crushed_play.png b/trunk/etherpad/src/static/img/pad/timeslider/crushed_play.png Binary files differdeleted file mode 100644 index c5b754b..0000000 --- a/trunk/etherpad/src/static/img/pad/timeslider/crushed_play.png +++ /dev/null diff --git a/trunk/etherpad/src/static/img/pad/timeslider/crushed_play_button.png b/trunk/etherpad/src/static/img/pad/timeslider/crushed_play_button.png Binary files differdeleted file mode 100644 index 3b112f6..0000000 --- a/trunk/etherpad/src/static/img/pad/timeslider/crushed_play_button.png +++ /dev/null diff --git a/trunk/etherpad/src/static/img/pad/timeslider/crushed_timeslider_mockup.png b/trunk/etherpad/src/static/img/pad/timeslider/crushed_timeslider_mockup.png Binary files differdeleted file mode 100644 index f4ccbf1..0000000 --- a/trunk/etherpad/src/static/img/pad/timeslider/crushed_timeslider_mockup.png +++ /dev/null diff --git a/trunk/etherpad/src/static/img/pad/timeslider/current_location.gif b/trunk/etherpad/src/static/img/pad/timeslider/current_location.gif Binary files differdeleted file mode 100644 index 5d5062f..0000000 --- a/trunk/etherpad/src/static/img/pad/timeslider/current_location.gif +++ /dev/null diff --git a/trunk/etherpad/src/static/img/pad/timeslider/current_location.png b/trunk/etherpad/src/static/img/pad/timeslider/current_location.png Binary files differdeleted file mode 100644 index ab02792..0000000 --- a/trunk/etherpad/src/static/img/pad/timeslider/current_location.png +++ /dev/null diff --git a/trunk/etherpad/src/static/img/pad/timeslider/pause.gif b/trunk/etherpad/src/static/img/pad/timeslider/pause.gif Binary files differdeleted file mode 100644 index 0fa105b..0000000 --- a/trunk/etherpad/src/static/img/pad/timeslider/pause.gif +++ /dev/null diff --git a/trunk/etherpad/src/static/img/pad/timeslider/pause.png b/trunk/etherpad/src/static/img/pad/timeslider/pause.png Binary files differdeleted file mode 100644 index 657782c..0000000 --- a/trunk/etherpad/src/static/img/pad/timeslider/pause.png +++ /dev/null diff --git a/trunk/etherpad/src/static/img/pad/timeslider/play.gif b/trunk/etherpad/src/static/img/pad/timeslider/play.gif Binary files differdeleted file mode 100644 index ae308c2..0000000 --- a/trunk/etherpad/src/static/img/pad/timeslider/play.gif +++ /dev/null diff --git a/trunk/etherpad/src/static/img/pad/timeslider/play.png b/trunk/etherpad/src/static/img/pad/timeslider/play.png Binary files differdeleted file mode 100644 index 19afe03..0000000 --- a/trunk/etherpad/src/static/img/pad/timeslider/play.png +++ /dev/null diff --git a/trunk/etherpad/src/static/img/pad/timeslider/play_button.png b/trunk/etherpad/src/static/img/pad/timeslider/play_button.png Binary files differdeleted file mode 100644 index bc1736d..0000000 --- a/trunk/etherpad/src/static/img/pad/timeslider/play_button.png +++ /dev/null diff --git a/trunk/etherpad/src/static/img/pad/timeslider/star.gif b/trunk/etherpad/src/static/img/pad/timeslider/star.gif Binary files differdeleted file mode 100644 index f6a2c70..0000000 --- a/trunk/etherpad/src/static/img/pad/timeslider/star.gif +++ /dev/null diff --git a/trunk/etherpad/src/static/img/pad/timeslider/star.png b/trunk/etherpad/src/static/img/pad/timeslider/star.png Binary files differdeleted file mode 100644 index e0c7099..0000000 --- a/trunk/etherpad/src/static/img/pad/timeslider/star.png +++ /dev/null diff --git a/trunk/etherpad/src/static/img/pad/timeslider/star_selected.png b/trunk/etherpad/src/static/img/pad/timeslider/star_selected.png Binary files differdeleted file mode 100644 index c336589..0000000 --- a/trunk/etherpad/src/static/img/pad/timeslider/star_selected.png +++ /dev/null diff --git a/trunk/etherpad/src/static/img/pad/timeslider/stepper_buttons.png b/trunk/etherpad/src/static/img/pad/timeslider/stepper_buttons.png Binary files differdeleted file mode 100644 index e011a45..0000000 --- a/trunk/etherpad/src/static/img/pad/timeslider/stepper_buttons.png +++ /dev/null diff --git a/trunk/etherpad/src/static/img/pad/timeslider/timeslider_background.png b/trunk/etherpad/src/static/img/pad/timeslider/timeslider_background.png Binary files differdeleted file mode 100644 index faa45c6..0000000 --- a/trunk/etherpad/src/static/img/pad/timeslider/timeslider_background.png +++ /dev/null diff --git a/trunk/etherpad/src/static/img/pad/timeslider/timeslider_left.png b/trunk/etherpad/src/static/img/pad/timeslider/timeslider_left.png Binary files differdeleted file mode 100644 index 594d86b..0000000 --- a/trunk/etherpad/src/static/img/pad/timeslider/timeslider_left.png +++ /dev/null diff --git a/trunk/etherpad/src/static/img/pad/timeslider/timeslider_mockup.png b/trunk/etherpad/src/static/img/pad/timeslider/timeslider_mockup.png Binary files differdeleted file mode 100644 index bc93914..0000000 --- a/trunk/etherpad/src/static/img/pad/timeslider/timeslider_mockup.png +++ /dev/null diff --git a/trunk/etherpad/src/static/img/pad/timeslider/timeslider_right.png b/trunk/etherpad/src/static/img/pad/timeslider/timeslider_right.png Binary files differdeleted file mode 100644 index 3bf10a2..0000000 --- a/trunk/etherpad/src/static/img/pad/timeslider/timeslider_right.png +++ /dev/null |