This is an automated email from the ASF dual-hosted git repository.

mraible pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/roller.git

commit 7ee0a0807339f6374d6e389222ce1626c36a172a
Merge: fd0db4733 0b72f920d
Author: Matt Raible <[email protected]>
AuthorDate: Sun Nov 15 09:16:07 2026 -0700

    Merge pull request #266 from mraible/replace-unlicensed-assets
    
    Replace icons, fonts and scripts that can't ship in the 7.0 source release

 CHANGES.md                                         |  18 +
 .../business/plugins/entry/SmileysPlugin.java      | 190 +++---
 .../business/plugins/entry/smileys.properties      |  83 +--
 .../main/webapp/WEB-INF/jsps/admin/UserEdit.jsp    |   6 +-
 .../main/webapp/WEB-INF/jsps/editor/EntryEdit.jsp  |   2 +-
 .../main/webapp/WEB-INF/jsps/editor/Templates.jsp  |   4 +-
 app/src/main/webapp/WEB-INF/tags/help.tag          |   3 +-
 app/src/main/webapp/WEB-INF/velocity/weblog.vm     |   4 +-
 app/src/main/webapp/images/add.png                 | Bin 847 -> 0 bytes
 app/src/main/webapp/images/atombadge.jpeg          | Bin 758 -> 0 bytes
 app/src/main/webapp/images/calendar.png            | Bin 775 -> 0 bytes
 app/src/main/webapp/images/cog.png                 | Bin 874 -> 0 bytes
 app/src/main/webapp/images/comment.png             | Bin 532 -> 0 bytes
 app/src/main/webapp/images/control_play.png        | Bin 710 -> 0 bytes
 app/src/main/webapp/images/delete.png              | Bin 846 -> 0 bytes
 app/src/main/webapp/images/editor/bgcol.gif        | Bin 897 -> 0 bytes
 app/src/main/webapp/images/editor/bold.gif         | Bin 869 -> 0 bytes
 app/src/main/webapp/images/editor/bullist.gif      | Bin 869 -> 0 bytes
 app/src/main/webapp/images/editor/center.gif       | Bin 860 -> 0 bytes
 app/src/main/webapp/images/editor/forecol.gif      | Bin 895 -> 0 bytes
 app/src/main/webapp/images/editor/image.gif        | Bin 938 -> 0 bytes
 app/src/main/webapp/images/editor/italic.gif       | Bin 863 -> 0 bytes
 app/src/main/webapp/images/editor/justify.gif      | Bin 860 -> 0 bytes
 app/src/main/webapp/images/editor/left.gif         | Bin 860 -> 0 bytes
 app/src/main/webapp/images/editor/link.gif         | Bin 952 -> 0 bytes
 app/src/main/webapp/images/editor/mode.gif         | Bin 920 -> 0 bytes
 app/src/main/webapp/images/editor/ordlist.gif      | Bin 873 -> 0 bytes
 app/src/main/webapp/images/editor/right.gif        | Bin 860 -> 0 bytes
 app/src/main/webapp/images/editor/rule.gif         | Bin 846 -> 0 bytes
 app/src/main/webapp/images/editor/underline.gif    | Bin 875 -> 0 bytes
 app/src/main/webapp/images/email_edit.png          | Bin 877 -> 0 bytes
 app/src/main/webapp/images/feed-icon-12x12.gif     | Bin 560 -> 0 bytes
 app/src/main/webapp/images/folder.png              | Bin 642 -> 0 bytes
 app/src/main/webapp/images/folder_add.png          | Bin 766 -> 0 bytes
 app/src/main/webapp/images/help.png                | Bin 900 -> 0 bytes
 app/src/main/webapp/images/image.png               | Bin 599 -> 0 bytes
 app/src/main/webapp/images/image_add.png           | Bin 653 -> 0 bytes
 app/src/main/webapp/images/launch-link.png         | Bin 20533 -> 0 bytes
 app/src/main/webapp/images/link.png                | Bin 574 -> 0 bytes
 app/src/main/webapp/images/link_add.png            | Bin 705 -> 0 bytes
 app/src/main/webapp/images/lock.png                | Bin 881 -> 0 bytes
 app/src/main/webapp/images/openid-logo-small.gif   | Bin 237 -> 0 bytes
 app/src/main/webapp/images/opml.png                | Bin 611 -> 0 bytes
 app/src/main/webapp/images/page.png                | Bin 816 -> 0 bytes
 app/src/main/webapp/images/page_edit.png           | Bin 984 -> 0 bytes
 app/src/main/webapp/images/page_white.png          | Bin 501 -> 0 bytes
 app/src/main/webapp/images/page_white_add.png      | Bin 641 -> 0 bytes
 app/src/main/webapp/images/page_white_delete.png   | Bin 649 -> 0 bytes
 app/src/main/webapp/images/page_white_edit.png     | Bin 728 -> 0 bytes
 app/src/main/webapp/images/page_white_gear.png     | Bin 732 -> 0 bytes
 app/src/main/webapp/images/permalink.gif           | Bin 63 -> 0 bytes
 app/src/main/webapp/images/rssbadge.gif            | Bin 429 -> 0 bytes
 app/src/main/webapp/images/smileys/15.gif          | Bin 239 -> 0 bytes
 app/src/main/webapp/images/smileys/19.gif          | Bin 190 -> 0 bytes
 app/src/main/webapp/images/smileys/20.gif          | Bin 251 -> 0 bytes
 app/src/main/webapp/images/smileys/28.gif          | Bin 196 -> 0 bytes
 app/src/main/webapp/images/smileys/angelic.gif     | Bin 283 -> 0 bytes
 app/src/main/webapp/images/smileys/angry.gif       | Bin 257 -> 0 bytes
 app/src/main/webapp/images/smileys/blush.gif       | Bin 190 -> 0 bytes
 app/src/main/webapp/images/smileys/bored.gif       | Bin 190 -> 0 bytes
 app/src/main/webapp/images/smileys/bucktooth.gif   | Bin 265 -> 0 bytes
 app/src/main/webapp/images/smileys/clown.gif       | Bin 205 -> 0 bytes
 app/src/main/webapp/images/smileys/confused.gif    | Bin 277 -> 0 bytes
 app/src/main/webapp/images/smileys/cry.gif         | Bin 243 -> 0 bytes
 app/src/main/webapp/images/smileys/depressed.gif   | Bin 180 -> 0 bytes
 app/src/main/webapp/images/smileys/devil.gif       | Bin 208 -> 0 bytes
 app/src/main/webapp/images/smileys/doh.gif         | Bin 269 -> 0 bytes
 app/src/main/webapp/images/smileys/drool.gif       | Bin 276 -> 0 bytes
 app/src/main/webapp/images/smileys/drunk.gif       | Bin 155 -> 0 bytes
 app/src/main/webapp/images/smileys/grin.gif        | Bin 275 -> 0 bytes
 app/src/main/webapp/images/smileys/hand.gif        | Bin 275 -> 0 bytes
 app/src/main/webapp/images/smileys/kiss.gif        | Bin 259 -> 0 bytes
 app/src/main/webapp/images/smileys/laugh.gif       | Bin 268 -> 0 bytes
 app/src/main/webapp/images/smileys/love.gif        | Bin 263 -> 0 bytes
 app/src/main/webapp/images/smileys/rolleyes.gif    | Bin 187 -> 0 bytes
 app/src/main/webapp/images/smileys/sad.gif         | Bin 185 -> 0 bytes
 app/src/main/webapp/images/smileys/shush.gif       | Bin 200 -> 0 bytes
 app/src/main/webapp/images/smileys/sick.gif        | Bin 155 -> 0 bytes
 app/src/main/webapp/images/smileys/silly.gif       | Bin 279 -> 0 bytes
 app/src/main/webapp/images/smileys/sleep.gif       | Bin 272 -> 0 bytes
 app/src/main/webapp/images/smileys/smile.gif       | Bin 188 -> 0 bytes
 app/src/main/webapp/images/smileys/smirk.gif       | Bin 264 -> 0 bytes
 app/src/main/webapp/images/smileys/smug.gif        | Bin 177 -> 0 bytes
 app/src/main/webapp/images/smileys/sunglasses.gif  | Bin 190 -> 0 bytes
 app/src/main/webapp/images/smileys/surprised.gif   | Bin 263 -> 0 bytes
 app/src/main/webapp/images/smileys/thinker.gif     | Bin 210 -> 0 bytes
 app/src/main/webapp/images/smileys/tongue.gif      | Bin 272 -> 0 bytes
 app/src/main/webapp/images/smileys/whisper.gif     | Bin 213 -> 0 bytes
 app/src/main/webapp/images/smileys/wink.gif        | Bin 186 -> 0 bytes
 app/src/main/webapp/images/smrssbadge.gif          | Bin 849 -> 0 bytes
 app/src/main/webapp/images/table_edit.png          | Bin 842 -> 0 bytes
 app/src/main/webapp/images/table_error.png         | Bin 805 -> 0 bytes
 app/src/main/webapp/images/table_gear.png          | Bin 805 -> 0 bytes
 app/src/main/webapp/images/table_multiple.png      | Bin 696 -> 0 bytes
 app/src/main/webapp/images/user.png                | Bin 862 -> 0 bytes
 app/src/main/webapp/images/world_go.png            | Bin 1124 -> 0 bytes
 app/src/main/webapp/images/zoom.png                | Bin 788 -> 0 bytes
 app/src/main/webapp/roller-ui/images/layout.png    | Bin 480 -> 0 bytes
 .../main/webapp/roller-ui/images/logo-shadow.png   | Bin 468 -> 0 bytes
 .../webapp/roller-ui/images/transparent-logo.png   | Bin 2467 -> 0 bytes
 .../main/webapp/roller-ui/theme/blue/colors.css    | 180 ------
 .../webapp/roller-ui/theme/blue/menutab-sel.png    | Bin 2922 -> 0 bytes
 .../webapp/roller-ui/theme/blue/menutab-unsel.png  | Bin 4311 -> 0 bytes
 .../webapp/roller-ui/theme/blue/two-banner.png     | Bin 888 -> 0 bytes
 .../webapp/roller-ui/theme/blue/two-smallbadge.png | Bin 215 -> 0 bytes
 .../webapp/roller-ui/theme/blue/two-togglegrey.png | Bin 278 -> 0 bytes
 app/src/main/webapp/roller-ui/theme/sun/colors.css | 206 -------
 .../webapp/roller-ui/theme/sun/menutab-sel.gif     | Bin 2082 -> 0 bytes
 .../webapp/roller-ui/theme/sun/menutab-unsel.gif   | Bin 3967 -> 0 bytes
 .../main/webapp/roller-ui/theme/sun/two-banner.gif | Bin 1460 -> 0 bytes
 .../roller-ui/theme/sun/two-sidebarfade-search.gif | Bin 663 -> 0 bytes
 .../webapp/roller-ui/theme/sun/two-sidebarfade.gif | Bin 1181 -> 0 bytes
 .../webapp/roller-ui/theme/sun/two-togglegrey.gif  | Bin 339 -> 0 bytes
 app/src/main/webapp/roller-ui/theme/tan/colors.css | 200 ------
 .../main/webapp/roller-ui/theme/tan/two-banner.gif | Bin 1512 -> 0 bytes
 .../webapp/roller-ui/theme/tan/two-bigbadge.gif    | Bin 2025 -> 0 bytes
 .../webapp/roller-ui/theme/tan/two-sidebarfade.gif | Bin 1011 -> 0 bytes
 .../webapp/roller-ui/theme/tan/two-togglegrey.gif  | Bin 352 -> 0 bytes
 app/src/main/webapp/theme/scripts/searchhi.js      |  86 ---
 app/src/main/webapp/themes/base.css                | 684 ++++++++++-----------
 app/src/main/webapp/themes/basic/basic-custom.css  |   3 +-
 .../webapp/themes/basicmobile/basic-custom.css     |   3 +-
 app/src/main/webapp/themes/fauxcoly/entry.vm       |  12 +-
 .../main/webapp/themes/fauxcoly/icons/comment.gif  | Bin 257 -> 0 bytes
 .../webapp/themes/fauxcoly/icons/delicious.gif     | Bin 109 -> 0 bytes
 .../main/webapp/themes/fauxcoly/icons/digman.gif   | Bin 245 -> 0 bytes
 .../webapp/themes/fauxcoly/icons/facebook-logo.png | Bin 235 -> 0 bytes
 .../themes/fauxcoly/icons/feed-icon-14x14.png      | Bin 689 -> 0 bytes
 .../themes/fauxcoly/icons/feed-icon-28x28.png      | Bin 1737 -> 0 bytes
 .../webapp/themes/fauxcoly/icons/flickr-icon.png   | Bin 209 -> 0 bytes
 .../webapp/themes/fauxcoly/icons/icon_clock.gif    | Bin 207 -> 0 bytes
 .../webapp/themes/fauxcoly/icons/linkedin-logo.jpg | Bin 411 -> 0 bytes
 .../webapp/themes/fauxcoly/icons/page_white.png    | Bin 501 -> 0 bytes
 .../themes/fauxcoly/icons/page_white_acrobat.png   | Bin 707 -> 0 bytes
 .../themes/fauxcoly/icons/slashdot-13x13.png       | Bin 190 -> 0 bytes
 .../main/webapp/themes/fauxcoly/icons/tag_blue.png | Bin 769 -> 0 bytes
 .../themes/fauxcoly/icons/technorati-16x15.png     | Bin 616 -> 0 bytes
 .../webapp/themes/fauxcoly/icons/twitter-icon.png  | Bin 533 -> 0 bytes
 .../webapp/themes/fauxcoly/js/search-highlight.js  | 118 ++++
 app/src/main/webapp/themes/fauxcoly/search.vm      |  18 +-
 app/src/main/webapp/themes/fauxcoly/searchhi.js    | 112 ----
 app/src/main/webapp/themes/fauxcoly/style_css.vm   |  10 +-
 app/src/main/webapp/themes/fauxcoly/theme.xml      |  30 +-
 app/src/main/webapp/themes/fauxcoly/weblog.vm      |   2 +-
 app/src/main/webapp/themes/frontpage/weblog.vm     |   2 +-
 .../webapp/themes/gaurav/css/font-awesome.min.css  | 403 ------------
 app/src/main/webapp/themes/gaurav/css/style.css    |  15 +-
 app/src/main/webapp/themes/gaurav/day.vm           |   4 +-
 app/src/main/webapp/themes/gaurav/entry.vm         |  12 +-
 .../main/webapp/themes/gaurav/font/FontAwesome.otf | Bin 61896 -> 0 bytes
 .../themes/gaurav/font/fontawesome-webfont.eot     | Bin 37405 -> 0 bytes
 .../themes/gaurav/font/fontawesome-webfont.svg     | 399 ------------
 .../themes/gaurav/font/fontawesome-webfont.ttf     | Bin 79076 -> 0 bytes
 .../themes/gaurav/font/fontawesome-webfont.woff    | Bin 43572 -> 0 bytes
 .../main/webapp/themes/gaurav/icons/comment.gif    | Bin 257 -> 0 bytes
 .../main/webapp/themes/gaurav/icons/delicious.gif  | Bin 109 -> 0 bytes
 app/src/main/webapp/themes/gaurav/icons/digman.gif | Bin 245 -> 0 bytes
 .../webapp/themes/gaurav/icons/facebook-logo.png   | Bin 235 -> 0 bytes
 .../webapp/themes/gaurav/icons/feed-icon-14x14.png | Bin 689 -> 0 bytes
 .../webapp/themes/gaurav/icons/feed-icon-28x28.png | Bin 1737 -> 0 bytes
 .../webapp/themes/gaurav/icons/flickr-icon.png     | Bin 209 -> 0 bytes
 .../main/webapp/themes/gaurav/icons/icon_clock.gif | Bin 207 -> 0 bytes
 .../webapp/themes/gaurav/icons/linkedin-logo.jpg   | Bin 411 -> 0 bytes
 .../main/webapp/themes/gaurav/icons/page_white.png | Bin 501 -> 0 bytes
 .../themes/gaurav/icons/page_white_acrobat.png     | Bin 707 -> 0 bytes
 .../webapp/themes/gaurav/icons/slashdot-13x13.png  | Bin 190 -> 0 bytes
 .../main/webapp/themes/gaurav/icons/tag_blue.png   | Bin 769 -> 0 bytes
 .../themes/gaurav/icons/technorati-16x15.png       | Bin 616 -> 0 bytes
 .../webapp/themes/gaurav/icons/twitter-icon.png    | Bin 533 -> 0 bytes
 .../webapp/themes/gaurav/js/search-highlight.js    | 118 ++++
 app/src/main/webapp/themes/gaurav/js/searchhi.js   | 112 ----
 app/src/main/webapp/themes/gaurav/search.vm        |  18 +-
 app/src/main/webapp/themes/gaurav/std_head.vm      |   1 -
 app/src/main/webapp/themes/gaurav/std_header.vm    |   4 +-
 app/src/main/webapp/themes/gaurav/theme.xml        |  24 +-
 app/src/main/webapp/themes/gaurav/weblog.vm        |   2 +-
 .../business/plugins/entry/SmileysPluginTest.java  |  58 ++
 .../weblogger/ui/ThemeAssetReferencesTest.java     | 165 +++++
 178 files changed, 988 insertions(+), 2323 deletions(-)


Reply via email to