This is an automated email from the ASF dual-hosted git repository.
mraible pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/roller.git
from e1639347e Merge pull request #281 from mraible/smiley-emoji
add d013a0a5a Serve theme data when a theme's preview image is missing
new d32c27c07 Merge pull request #279 from mraible/theme-preview-image-npe
The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
CHANGES.md | 3 +
.../ui/struts2/ajax/ThemeDataServlet.java | 18 +++-
.../main/webapp/WEB-INF/jsps/core/CreateWeblog.jsp | 6 +-
.../main/webapp/WEB-INF/jsps/editor/ThemeEdit.jsp | 6 +-
.../ui/struts2/ajax/ThemeDataServletTest.java | 107 +++++++++++++++++++++
5 files changed, 134 insertions(+), 6 deletions(-)
create mode 100644
app/src/test/java/org/apache/roller/weblogger/ui/struts2/ajax/ThemeDataServletTest.java