|
View Changeset
/
hippo
Jump to revision:
Author:
mdenburger
Date:
Mon Jan 19 13:57:24 2015 UTC
(7 years, 6 months ago)
Log Message:
GOGREEN-1298: merge
r47769
through
r48244
from trunk
Changed paths
Path
Details
hippo-demos/hippo-go-green/branches/hippogogreen-restyling-3.10.xx/
modified
,
props changed
hippo-demos/hippo-go-green/branches/hippogogreen-restyling-3.10.xx/NOTICE
modified
,
text changed
hippo-demos/hippo-go-green/branches/hippogogreen-restyling-3.10.xx/cms/src/main/resources/org/hippoecm/frontend/plugins/login/RememberMeLoginPlugin.properties
modified
,
text changed
hippo-demos/hippo-go-green/branches/hippogogreen-restyling-3.10.xx/content/src/main/resources/hippo-namespaces/hippogogreen/simpledocument.xml
modified
,
text changed
hippo-demos/hippo-go-green/branches/hippogogreen-restyling-3.10.xx/content/src/main/resources/hippoecm-extension.xml
modified
,
text changed
hippo-demos/hippo-go-green/branches/hippogogreen-restyling-3.10.xx/content/src/main/resources/hst-hst/hst-configurations/hstdefault/sitemap/
(Copied from hippo-demos/hippo-go-green/trunk/content/src/main/resources/hst-hst/hst-configurations/hstdefault/sitemap, r48244)
added
hippo-demos/hippo-go-green/branches/hippogogreen-restyling-3.10.xx/integration-tests/src/test/java/org/onehippo/gogreen/About.java
modified
,
text changed
hippo-demos/hippo-go-green/branches/hippogogreen-restyling-3.10.xx/integration-tests/src/test/java/org/onehippo/gogreen/HomePage.java
modified
,
text changed
hippo-demos/hippo-go-green/branches/hippogogreen-restyling-3.10.xx/integration-tests/src/test/java/org/onehippo/gogreen/Jobspage.java
modified
,
text changed
hippo-demos/hippo-go-green/branches/hippogogreen-restyling-3.10.xx/integration-tests/src/test/java/org/onehippo/gogreen/Newspage.java
modified
,
text changed
hippo-demos/hippo-go-green/branches/hippogogreen-restyling-3.10.xx/integration-tests/src/test/java/org/onehippo/gogreen/ProductsPage.java
modified
,
text changed
hippo-demos/hippo-go-green/branches/hippogogreen-restyling-3.10.xx/site/src/main/resources/messages.properties
modified
,
text changed
hippo-demos/hippo-go-green/branches/hippogogreen-restyling-3.10.xx/site/src/main/webapp/WEB-INF/hst-config.properties
modified
,
text changed
hippo-demos/hippo-go-green/branches/hippogogreen-restyling-3.10.xx/site/src/main/webapp/WEB-INF/jsp/service/faq-detail.jsp
modified
,
text changed