Bert Leunis pushed to branch bugfix/ESSENTIALS-979 at cms-community /
hippo-essentials
Commits:
4483e308 by Tobias Jeger at 2016-01-03T19:33:52+00:00
ESSENTIALS-821: copy for branch essentials-2.2.0-gallery-manager
- - - - -
90dcc496 by Tobias Jeger at 2016-01-03T20:10:28+00:00
ESSENTIALS-821: improve gallery manager UI.
- - - - -
ffc5f0a5 by Tobias Jeger at 2016-01-05T09:59:26+00:00
ESSENTIALS-821: process feedback.
- - - - -
a79d6224 by Tobias Jeger at 2016-01-05T10:59:47+00:00
ESSENTIALS-821: process more feedback.
- - - - -
03ce3cf8 by Arent-Jan Banck at 2016-01-26T13:29:08+00:00
CMS-9899: copy for branch hippo-essentials-2.2.x
- - - - -
db8555f0 by Arent-Jan Banck at 2016-01-26T17:35:12+00:00
CMS-9898: - Update dependencies for rc-1 tag
- - - - -
60cc269a by Arent-Jan Banck at 2016-01-26T17:36:30+00:00
CMS-9898: prepare release hippo-essentials-2.2.0-rc-1
- - - - -
874b5463 by Arent-Jan Banck at 2016-01-26T17:36:35+00:00
CMS-9898: rollback changes from release preparation of
hippo-essentials-2.2.0-rc-1
- - - - -
f1f4b829 by Arent-Jan Banck at 2016-01-26T17:38:45+00:00
CMS-9898: Rollback - Update dependencies for rc-1 tag
- - - - -
217a949e by Joeri de Gooijer at 2016-01-27T12:32:56+00:00
RD-3054: Fix license checks for front-end code
- - - - -
6de01e7b by Arent-Jan Banck at 2016-01-30T13:14:37+00:00
CMS-9907: Update project for release 10.2.0
- - - - -
e0e6c27d by Arent-Jan Banck at 2016-01-30T13:16:54+00:00
CMS-9907: prepare release hippo-essentials-2.2.0
- - - - -
02de21b5 by Arent-Jan Banck at 2016-01-30T13:17:04+00:00
CMS-9907: prepare for next development iteration
- - - - -
964a49c9 by Luís Pedro Lemos at 2016-02-12T16:57:38+01:00
ESSENTIALS-815: menu options improvement
- - - - -
be5a89c5 by Arent-Jan Banck at 2016-02-25T17:08:24+01:00
ESSENTIALS-604 Updating scm information
- - - - -
3edfb5f8 by Ard Schrijvers at 2016-03-16T13:20:06+01:00
ESSENTIALS-963 [Backport 2.1.2] add null checks to avoid NPE on missing images
(or link). HippoHtmlAdapter already got the null check
(cherry picked from commit 58009bd49db4698c43eda7e397d29e8066e98d65)
- - - - -
d90fa26d by Luís Pedro Lemos at 2016-03-22T18:07:35+01:00
ESSENTIALS-815: Removed changes on bootstrap css and added inline styling
- - - - -
bf4edd0a by Marijan Milicevic at 2016-04-12T12:42:13+02:00
ESSENTIALS-802 populateBeans returns only the first element
- loop: use while instead of if statement
- - - - -
689692e6 by Marijan Milicevic at 2016-05-13T10:41:47+02:00
ESSENTIALS-969 Beanwriter fails to add binding for a new Resource field to the
document type
- - - - -
1d63ea06 by Bert Leunis at 2016-05-13T11:40:34+02:00
ESSENTIALS-838 add missing woff2 file & instruction to install it in the
project
- - - - -
ba0a28c9 by Bert Leunis at 2016-05-13T12:07:45+02:00
ESSENTIALS-784 removed copyright header from Resource template file
- - - - -
4a60d1af by Marijan Milicevic at 2016-05-13T13:02:26+02:00
ESSENTIALS-965 No content assist for Essentials classes in web files templates
- add essentials dependency
- - - - -
f970efef by Marijan Milicevic at 2016-05-13T13:07:26+02:00
ESSENTIALS-965 No content assist for Essentials classes in web files templates
- add essentials dependency
- - - - -
c0ffb019 by Marijan Milicevic at 2016-05-13T13:43:05+02:00
ESSENTIALS-762 Document type prototype does not have a date property
- - - - -
9b126c3e by Marijan Milicevic at 2016-05-13T13:43:45+02:00
ESSENTIALS-762 Document type prototype does not have a date property
- - - - -
54d3a229 by Bert Leunis at 2016-05-13T14:27:08+02:00
ESSENTIALS-784 can now read selectedProjectPackage from project-settings.xml
file and use the value for new property placeholder {{projectPackage}}
- - - - -
079c9db9 by Bert Leunis at 2016-05-13T14:57:37+02:00
ESSENTIALS-705 configure hst:refId on root sitemap item
- - - - -
a7d442c2 by Bert Leunis at 2016-05-17T15:12:23+02:00
ESSENTIALS-762 also updated other document types
- - - - -
76249178 by Bert Leunis at 2016-05-17T16:45:49+02:00
ESSENTIALS-965 updated copyright year
- - - - -
c634caa7 by Saimir Muco at 2016-05-18T12:12:07+02:00
ESSENTIALS-705 in the readme, change the scm urls from svn to git
- - - - -
c802754d by Marijan Milicevic at 2016-05-25T09:24:27+02:00
ESSENTIALS-971 Add possibility to read more than one local plugin descriptors
for the dashboard
- plugin descriptor reader now also looks for
"project_plugin_descriptor.json" file (should be on the classpath)
and adds those entries to the plugin items
- - - - -
41f3f760 by Tobias Jeger at 2016-05-25T09:57:23+02:00
ESSENTIALS-965 Cosmetic change
- - - - -
2c998838 by Tobias Jeger at 2016-05-25T09:58:16+02:00
ESSENTIALS-965 Reintegrate bugfix/ESSENTIALS-965
- - - - -
e71c887a by Michiel Eggermont at 2016-06-06T12:00:02+02:00
Reintegrate bugfix/ESSENTIALS-784
- - - - -
810df3d5 by Michiel Eggermont at 2016-06-06T14:40:02+02:00
ESSENTIALS-784 Exclude file from license check
- - - - -
7716cd14 by Tobias Jeger at 2016-06-10T08:44:41+02:00
ESSENTIALS-821 Merge master into feature branch
# Conflicts:
# components/cms/pom.xml
# components/hst/pom.xml
# components/pom.xml
# dashboard-dependencies/pom.xml
# dashboard/pom.xml
# plugin-sdk/api/pom.xml
# plugin-sdk/implementation/pom.xml
# plugin-sdk/pom.xml
# plugins/banner-and-carousel/pom.xml
# plugins/bean-writer/pom.xml
# plugins/blog/pom.xml
# plugins/content-blocks/pom.xml
# plugins/document-wizard/pom.xml
# plugins/events/pom.xml
# plugins/faq/pom.xml
# plugins/gallery-manager/pom.xml
# plugins/google-maps/pom.xml
# plugins/image-component/pom.xml
# plugins/list/pom.xml
# plugins/menu/pom.xml
# plugins/news/pom.xml
# plugins/poll/pom.xml
# plugins/pom.xml
# plugins/related-documents/pom.xml
# plugins/rest-services/pom.xml
# plugins/robots/pom.xml
# plugins/search/pom.xml
# plugins/selection/pom.xml
# plugins/seo/pom.xml
# plugins/simple-content/pom.xml
# plugins/sitemap/pom.xml
# plugins/skeleton-package/pom.xml
# plugins/tagging/pom.xml
# plugins/taxonomy/pom.xml
# plugins/video/pom.xml
# pom.xml
- - - - -
7b6d5993 by Bert Leunis at 2016-06-10T10:19:36+02:00
ESSENTIALS-821 textual changes
- - - - -
5b84b272 by Tobias Jeger at 2016-06-10T10:23:56+02:00
ESSENTIALS-821 Fix issue with non-scrolling Library
- - - - -
3bee1374 by Bert Leunis at 2016-06-10T10:52:03+02:00
ESSENTIALS-821 two more tooltips
- - - - -
69e34201 by Tobias Jeger at 2016-06-10T11:01:02+02:00
ESSENTIALS-821 Remove styling improvement for better consistency
- - - - -
e95ac827 by Bert Leunis at 2016-06-10T13:02:06+02:00
ESSENTIALS-821 avoid confusion between IS definitions and instances
- - - - -
fc49adcf by Bert Leunis at 2016-06-10T13:58:53+02:00
ESSENTIALS-821 Reintegrate feature/gallery-manager
- - - - -
65440f1e by Ate Douma at 2016-06-13T15:00:22+02:00
ESSENTIALS-604: add license header
- - - - -
5b59ac5d by Arent-Jan Banck at 2016-06-15T16:30:39+02:00
ESSENTIALS-986 prepare for next development iteration
- - - - -
6844f2f5 by Tobias Jeger at 2016-06-22T10:16:14+02:00
ESSENTIALS-767 Rename getter method, remove duplicate line of test code
- - - - -
558cbbee by Tobias Jeger at 2016-06-22T10:17:50+02:00
ESSENTIALS-767 Merge changes into master
- - - - -
0494619a by Tobias Jeger at 2016-06-22T13:12:11+02:00
ESSENTIALS-969 Merge changes into master
- - - - -
26c2da88 by Tobias Jeger at 2016-06-22T13:55:16+02:00
ESSENTIALS-705 Fix instruction on how to build the archetype project
- - - - -
e372d855 by Tobias Jeger at 2016-06-22T13:57:10+02:00
ESSENTIALS-705 Merge changes into master
- - - - -
ed9b3a88 by Michiel Eggermont at 2016-06-22T14:37:26+02:00
ESSENTIALS-991 Update LICENSE file
Cherry picked from bf085a3
Delete from LICENSE
- angular-tablesort.js
The angular-tablesort.js library is a transitive dependency of hippo-theme.
However, in the dashboard.war binary the the tablesort library is not present.
Therefore ther reference to the tablesort library should not be present.
Add to LICENSE
- bootstrap.min.js
- prettify.js
- jquery-1.8.0.min.js
- jquery.ba-bbq.min.js
- backbone-min.js
- handlebars-1.0.0.js
- jquery.wiggle.min.js
- underscore-min.js
- highlight.7.3.pack.js
because they are packaged in the war.
- - - - -
9b028368 by Tobias Jeger at 2016-06-22T16:40:51+02:00
ESSENTIALS-762 Add eventsdocument enddate property to prototype
- - - - -
2baf711c by Tobias Jeger at 2016-06-22T16:46:57+02:00
ESSENTIALS-762 Merge changes into master
- - - - -
3c7199f5 by Tobias Jeger at 2016-06-22T17:16:20+02:00
ESSENTIALS-815 Fully reverting changes to bootstrap.css
- - - - -
ce983607 by Tobias Jeger at 2016-06-22T17:16:58+02:00
ESSENTIALS-815 Merge changes into master
- - - - -
547aaa3e by Oscar Scholten at 2016-06-24T10:38:26+02:00
ESSENTIALS-604 fix parent version
- - - - -
33a9a6ba by Tobias Jeger at 2016-06-27T14:43:02+02:00
ESSENTIALS-838 Merge branch 'master' into bugfix/ESSENTIALS-838
- - - - -
1eb250f5 by Tobias Jeger at 2016-06-27T17:10:38+02:00
ESSENTIALS-993 Update menu plugin render templates to position edit menu button
correctly
- - - - -
4763b01c by Tobias Jeger at 2016-06-28T16:22:13+02:00
ESSENTIALS-993 Remove unused class
- - - - -
2f2bbe65 by Joeri de Gooijer at 2016-07-01T13:32:54+02:00
ESSENTIALS-997 switch from bower to npm for dependency management
- - - - -
a5b69541 by Canh Ngo at 2016-07-01T14:44:27+02:00
ESSENTIALS-997 rework after review
- Removed bower configuration related
- Updated license header date
- Updated README: required NodeJS from be 5.x.x
- - - - -
755b07ba by Joeri de Gooijer at 2016-07-04T16:43:37+02:00
ESSENTIALS-997 Reintegrate 'bugfix/ESSENTIALS-997'
- - - - -
f5ed5442 by Oscar Scholten at 2016-07-05T12:31:40+02:00
ESSENTIALS-994 explicitly process repository resource bundles as UTF8
- - - - -
306931c8 by Oscar Scholten at 2016-07-05T12:31:40+02:00
ESSENTIALS-994 replacing string parameters with constants
- - - - -
82efb281 by Oscar Scholten at 2016-07-05T12:31:40+02:00
ESSENTIALS-994 fix commons-io encoding issues
- bumping commons-io to 2.5
- fixing all deprecation warnings
- this fixes the issue of copying the template for the homepage
- - - - -
2b645a99 by Ate Douma at 2016-07-05T12:32:18+02:00
Merge branch 'bugfix/ESSENTIALS-994'
- - - - -
ab9a67e4 by Bert Leunis at 2016-07-18T16:06:25+02:00
ESSENTIALS-1004 add labels for all containers
- - - - -
61c529bd by Bert Leunis at 2016-07-18T16:19:07+02:00
ESSENTIALS-1004 Set Essentials-1004 development version
- - - - -
99f452bc by Oscar Scholten at 2016-07-21T10:16:48+02:00
ESSENTIALS-604 fixing typo
- - - - -
2068951c by Canh Ngo at 2016-07-21T12:35:44+02:00
ESSENTIALS-1003 Fixed menu templates to position editbutton correctly
- - - - -
9466d63f by Joeri de Gooijer at 2016-07-21T14:43:58+02:00
ESSENTIALS-1001 add license summary
- - - - -
91ad62a2 by Joeri de Gooijer at 2016-07-21T14:43:58+02:00
ESSENTIALS-1001 Reintegrate branch 'feature/ESSENTIALS-1001'
- - - - -
84df5521 by Joeri de Gooijer at 2016-07-21T14:52:53+02:00
ESSENTIALS-1010 point to registry
- - - - -
ff451f0d by Joeri de Gooijer at 2016-07-22T13:34:47+02:00
ESSENTIALS-1003 Reintegrate branch 'bugfix/ESSENTIALS-1003'
- - - - -
78522d8b by Bert Leunis at 2016-07-25T10:21:28+02:00
ESSENTIALS-1011 Set feature development version
- - - - -
26c7ebdc by Bert Leunis at 2016-07-25T10:22:14+02:00
ESSENTIALS-1011 new images; new styling; default banner now with description
- - - - -
06fa83c3 by Oscar Scholten at 2016-07-25T10:24:28+02:00
ESSENTIALS-999 moving components/hst to hippo-plugins project
- - - - -
6326ba8c by Oscar Scholten at 2016-07-26T14:22:32+02:00
ESSENTIALS-999 updating the dependency after code was moved to hippo-plugins
project
- - - - -
061f89bf by Oscar Scholten at 2016-07-29T15:42:38+02:00
ESSENTIALS-1011 reintegrate 'feature/ESSENTIALS-1011'
- - - - -
df6c80af by Oscar Scholten at 2016-08-01T15:30:52+02:00
ESSENTIALS-999 merge branch 'master' into feature/ESSENTIALS-999
- - - - -
b8a80300 by Oscar Scholten at 2016-08-01T15:35:52+02:00
ESSENTIALS-999 reintegrate 'feature/ESSENTIALS-999'
- - - - -
acd367bd by Oscar Scholten at 2016-08-03T16:54:35+02:00
ESSENTIALS-999 removing components/cms from this repository
- - - - -
b26670b2 by Oscar Scholten at 2016-08-03T16:55:22+02:00
ESSENTIALS-999 setting dependency name back to hippo-essentials-components
- - - - -
29f57c07 by Arthur Bogaart at 2016-08-11T14:59:42+02:00
ESSENTIALS-1016 Fix carousel initialisation in channel-manager
- Generate a unique ID for the carousel instead of using the hard-coded value
'myCarousel'
- Due to the nature of channel-manager rendering the ID should be unique per
request when viewed in the channel-manager
- Initialize the carousel directly when the component is re-drawn
using AJAX in the channel-manager
- - - - -
9b5d4b73 by Mathijs den Burger at 2016-08-12T10:47:27+02:00
ESSENTIALS-604 Remove .gitattributes
- - - - -
6221a881 by Mathijs den Burger at 2016-08-12T10:54:50+02:00
ESSENTIALS-604 Simplify .gitignore
Patterns that don't start with a slash are applied at every level,
so use those to create common exclusions.
- - - - -
9aaf9e9d by Arthur Bogaart at 2016-08-12T13:26:51+02:00
ESSENTIALS-1017 Initialize Google Maps with a unique id
- Use the new componentId to correctly initialize one or more
google maps on a page
- Put script elements at the end of the body so they won't block
rendering
- Pass callback function to Google Maps API to initialize maps
- Minimize global scope pollution for essentials-google-maps.js
file
- Fix redraw handler when Channel Manager updates a container
- - - - -
e569db08 by Arthur Bogaart at 2016-08-12T13:35:18+02:00
ESSENTIALS-1016 Use new componentId param
- Scope CSS style with componentID
- - - - -
eaf062ce by Arthur Bogaart at 2016-08-12T13:39:40+02:00
ESSENTIALS-1016 Use new componentId param in JSP
- - - - -
93502748 by Arthur Bogaart at 2016-08-12T13:48:30+02:00
ESSENTIALS-1017 Indent with four spaces
- - - - -
e41622ba by Arthur Bogaart at 2016-08-12T13:49:25+02:00
ESSENTIALS-1017 Indent with four spaces
- - - - -
6e3b48d3 by Arthur Bogaart at 2016-08-12T13:57:05+02:00
ESSENTIALS-1017 Align googlemaps JSP with Freemarker template
- - - - -
f4e8dea6 by Tobias Jeger at 2016-08-12T14:56:03+02:00
ESSENTIALS-1016 Reintegrate 'bugfix/ESSENTIALS-1016' into master
- - - - -
5287dc7a by Arthur Bogaart at 2016-08-15T13:33:49+02:00
ESSENTIALS-1017 Move code into HippoEssentials namespace
- Expose an object named HippoEssentials to the global
namespace that wraps all other hippo-essentials related javascript
code (currently only the GoogleMaps scripts).
- - - - -
f8fc45a1 by Tobias Jeger at 2016-08-15T14:36:58+02:00
ESSENTIALS-1017 Reintegrate 'bugfix/ESSENTIALS-1017' into master
- - - - -
3daefc6f by Ate Douma at 2016-08-17T10:19:02+02:00
ESSENTIALS-989: correct a few Swagger UI (docs/rest-api/**) based/related
licenses.
(cherry picked from commit 0ab16f27a72378b40c530b963604141b21e05c7a)
- - - - -
8c100362 by Tobias Jeger at 2016-08-17T16:08:52+02:00
ESSENTIALS-1022 Remove redundant template code
- - - - -
06abed33 by Joeri van Ruth at 2016-08-18T11:07:06+02:00
ESSENTIALS-1004 Reintegrate 'feature/ESSENTIALS-1004' into master
- - - - -
5e494b92 by Bert Leunis at 2016-08-18T13:29:48+02:00
ESSENTIALS-1004 text improvements in the labels
- - - - -
b8193f4a by Canh Ngo at 2016-08-19T16:42:51+02:00
ESSENTIALS-1022 Reintegrated bugfix/ESSENTIALS-1022
- - - - -
2a77554d by Arent-Jan Banck at 2016-08-25T16:12:54+02:00
ESSENTIALS-1026 Use feedback provider in new Essentials Feedback project
- - - - -
3f874f07 by Joeri de Gooijer at 2016-09-08T11:27:24+02:00
ESSENTIALS-1030 Remove global dependency on grunt
- - - - -
3df60c19 by Bert Leunis at 2016-09-09T16:14:27+02:00
ESSENTIALS-1024 5 redundant occurrences removed
- - - - -
4c9f2514 by Joeri de Gooijer at 2016-09-12T16:21:09+02:00
ESSENTIALS-1030 update npm shrinkwrap, point urls to maven.onehippo.org
- - - - -
cae538b3 by Joeri de Gooijer at 2016-09-13T10:32:05+02:00
ESSENTIALS-1030 Clean up readme
- - - - -
ec625492 by Bert Leunis at 2016-09-13T12:03:58+02:00
Merge branch 'master' into bugfix/ESSENTIALS-979
- - - - -
13 changed files:
- − .gitattributes
- .gitignore
- README.md
- − components/cms/pom.xml
- −
components/cms/src/main/java/org/onehippo/cms7/essentials/components/cms/blog/BlogImporterConfiguration.java
- −
components/cms/src/main/java/org/onehippo/cms7/essentials/components/cms/blog/BlogImporterJob.java
- −
components/cms/src/main/java/org/onehippo/cms7/essentials/components/cms/blog/BlogUpdater.java
- −
components/cms/src/main/java/org/onehippo/cms7/essentials/components/cms/handlers/AuthorFieldHandler.java
- −
components/cms/src/main/java/org/onehippo/cms7/essentials/components/cms/handlers/HandlerUtils.java
- −
components/cms/src/main/java/org/onehippo/cms7/essentials/components/cms/handlers/WorkflowEventHandler.java
- −
components/cms/src/main/java/org/onehippo/cms7/essentials/components/cms/modules/BlogListenerModule.java
- − components/cms/src/main/resources/blog-importer-config.xml
- − components/cms/src/main/resources/event-bus-listener.xml
The diff was not included because it is too large.
View it on GitLab:
https://code.onehippo.org/cms-community/hippo-essentials/compare/b64d3079ff217443c66969e3b9090a7c78a2aca4...ec625492964f04f978fe6822b6e6f48cd65b60cd
_______________________________________________
Hippocms-svn mailing list
Hippocms-svn@lists.onehippo.org
https://lists.onehippo.org/mailman/listinfo/hippocms-svn
