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 365d85085 Merge pull request #341 from apache/scoped-media-file-lookup
add 41b48d86d Remove the overlay mode flag and the external media include
page
new cf67ddb8a Merge pull request #342 from
apache/remove-unused-media-overlay-code
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:
.../weblogger/ui/struts2/editor/MediaFileAdd.java | 6 +-
.../weblogger/ui/struts2/editor/MediaFileBase.java | 492 ++++++++++-----------
app/src/main/resources/struts.xml | 9 -
.../jsps/editor/MediaFileAddExternalInclude.jsp | 63 ---
app/src/main/webapp/WEB-INF/tiles.xml | 5 -
.../util/StrutsParameterAnnotationTest.java | 4 +-
6 files changed, 244 insertions(+), 335 deletions(-)
delete mode 100644
app/src/main/webapp/WEB-INF/jsps/editor/MediaFileAddExternalInclude.jsp