|
View Changeset
/
hippo
Jump to revision:
Author:
mdenburger
Date:
Thu Jan 29 08:41:31 2015 UTC
(7 years, 6 months ago)
Log Message:
CMS7-8371: merge changes from archetypes trunk, including the rename of web resources to web files
Changed paths
Path
Details
hippo-demos/restyling/trunk/README.txt
modified
,
text changed
hippo-demos/restyling/trunk/bootstrap/configuration/src/main/resources/hippoecm-extension.xml
modified
,
text changed
hippo-demos/restyling/trunk/bootstrap/configuration/src/main/resources/hst/configurations/demo/templates.xml
modified
,
text changed
hippo-demos/restyling/trunk/bootstrap/configuration/src/main/resources/hst/configurations.xml
modified
,
text changed
hippo-demos/restyling/trunk/bootstrap/configuration/src/main/resources/hst/hosts.xml
modified
,
text changed
hippo-demos/restyling/trunk/bootstrap/configuration/src/main/resources/security/webfiles.xml
added
hippo-demos/restyling/trunk/bootstrap/configuration/src/main/resources/security/webresources.xml
deleted
hippo-demos/restyling/trunk/bootstrap/pom.xml
modified
,
text changed
hippo-demos/restyling/trunk/bootstrap/webfiles/
added
hippo-demos/restyling/trunk/bootstrap/webfiles/pom.xml
added
hippo-demos/restyling/trunk/bootstrap/webfiles/src/
added
hippo-demos/restyling/trunk/bootstrap/webfiles/src/main/
added
hippo-demos/restyling/trunk/bootstrap/webfiles/src/main/resources/
added
hippo-demos/restyling/trunk/bootstrap/webfiles/src/main/resources/hippoecm-extension.xml
added
hippo-demos/restyling/trunk/bootstrap/webfiles/src/main/resources/site/
added
hippo-demos/restyling/trunk/bootstrap/webfiles/src/main/resources/site/css/
added
hippo-demos/restyling/trunk/bootstrap/webfiles/src/main/resources/site/css/style.css
added
hippo-demos/restyling/trunk/bootstrap/webfiles/src/main/resources/site/ftl/
added
hippo-demos/restyling/trunk/bootstrap/webfiles/src/main/resources/site/ftl/base/
added
hippo-demos/restyling/trunk/bootstrap/webfiles/src/main/resources/site/ftl/base/main/
added
hippo-demos/restyling/trunk/bootstrap/webfiles/src/main/resources/site/ftl/base/main/list/
added
hippo-demos/restyling/trunk/bootstrap/webfiles/src/main/resources/site/ftl/base/main/list/list-title-date-image.ftl
added
hippo-demos/restyling/trunk/bootstrap/webfiles/src/main/resources/site/ftl/base/main/list/list-title-date.ftl
added
hippo-demos/restyling/trunk/bootstrap/webfiles/src/main/resources/site/ftl/base/main/list/list-title.ftl
added
hippo-demos/restyling/trunk/bootstrap/webfiles/src/main/resources/site/ftl/base/main/list.ftl
added
hippo-demos/restyling/trunk/bootstrap/webfiles/src/main/resources/site/ftl/base/main/list.properties
added
hippo-demos/restyling/trunk/bootstrap/webfiles/src/main/resources/site/ftl/base/main/list_nl.properties
added
hippo-demos/restyling/trunk/bootstrap/webfiles/src/main/resources/site/ftl/htmlTags.ftl
added
hippo-demos/restyling/trunk/bootstrap/webfiles/src/main/resources/site/ftl/layout/
added
hippo-demos/restyling/trunk/bootstrap/webfiles/src/main/resources/site/ftl/layout/webpage.ftl
added
hippo-demos/restyling/trunk/bootstrap/webfiles/src/main/resources/site/images/
added
hippo-demos/restyling/trunk/bootstrap/webfiles/src/main/resources/site/images/glyphicons-halflings-white.png
added
hippo-demos/restyling/trunk/bootstrap/webfiles/src/main/resources/site/images/glyphicons-halflings.png
added
hippo-demos/restyling/trunk/bootstrap/webresources/
deleted
hippo-demos/restyling/trunk/cms/pom.xml
modified
,
text changed
hippo-demos/restyling/trunk/cms/src/main/webapp/WEB-INF/web.xml
modified
,
text changed
hippo-demos/restyling/trunk/conf/catalina-logging.properties
added
hippo-demos/restyling/trunk/conf/log4j-dev.xml
modified
,
text changed
hippo-demos/restyling/trunk/pom.xml
modified
,
text changed
hippo-demos/restyling/trunk/site/pom.xml
modified
,
text changed
hippo-demos/restyling/trunk/site/src/main/webapp/WEB-INF/jsp/base/main/list.jsp
deleted
hippo-demos/restyling/trunk/site/src/main/webapp/WEB-INF/jsp/layout/
deleted
hippo-demos/restyling/trunk/site/src/main/webapp/WEB-INF/jsp/subsite/layout/webpage.jsp
modified
,
text changed
hippo-demos/restyling/trunk/site/src/main/webapp/WEB-INF/web.xml
modified
,
text changed