Canh Ngo pushed to branch feature/CMS-9884 at cms-community / hippo-cms
Commits: 74d0c3c5 by Ard Schrijvers at 2016-04-18T10:54:09+02:00 CMS-10008 Make AbstractFieldPlugin.onAddRenderService() non-final Given that 1) the instance variable 'mode' is a protected member (and not private) 2) onBeforeRender() is not final it does not make much sense that onAddRenderService() is final. - - - - - c147b6f2 by Unico Hommes at 2016-04-18T14:56:18+02:00 CMS-10054 prevent name clash with other workflow-translations.json file in workflow module - - - - - 09176fb6 by Jasper Floor at 2016-04-19T11:31:52+02:00 CMS-10040 return extension based media type for application/zip detected files (to correct type for open document format and other zip derived file types) and unit tests for same - - - - - 022cb62e by Jasper Floor at 2016-04-21T09:19:38+02:00 CMS-10040 fix unit test - - - - - 1d50d5ec by Saimir Muco at 2016-04-21T11:16:13+02:00 CMS-10040 organize imports - - - - - e8b6ffe6 by Jasper Floor at 2016-04-21T15:27:56+02:00 CMS-10040 Merge remote-tracking branch 'remotes/origin/HEAD' into bugfix/CMS-10040 - - - - - fe0222d9 by Oscar Scholten at 2016-04-22T17:16:47+02:00 CMS-10066: Updating page title to 11 - - - - - b7212704 by Tobias Jeger at 2016-04-26T13:13:51+02:00 CMS-10040 Merge bugfix into master - - - - - 6bd94213 by Woonsan Ko at 2016-04-26T13:31:03-04:00 CMS-10079: adding more diagnostics logging in EditorPlugin with document path and type info attributes - - - - - 3baa3b7e by Woonsan Ko at 2016-04-26T14:35:04-04:00 CMS-10078: adding unitThresholdTimeMillisec option to filter out subtasks in diagnostics report - - - - - cd590c69 by Woonsan Ko at 2016-04-26T19:39:36-04:00 CMS-10079: adding current viewing or editing document path and type info in HDC logging - - - - - f9454172 by Arent-Jan Banck at 2016-04-28T11:57:41+02:00 CMS-10040 Add license header - - - - - bdb9ee78 by Oscar Scholten at 2016-04-28T12:39:25+02:00 CMS-10066: Updating page title to 11 - - - - - bdd8a8f2 by Unico Hommes at 2016-04-28T14:29:25+02:00 CMS-10081 - default locales only includes english - get included cms locales configuration from global settings - - - - - 89165923 by Ate Douma at 2016-04-28T14:52:41+02:00 CMS-10082: Remove translations resource bundles which are now managed within hippo-cms-translations project - - - - - 912c02ff by Arthur Bogaart at 2016-04-29T11:12:18+02:00 CMS-10071 Expose cookie methods to subclasses of LoginPanel - - - - - 3227fc1d by Ate Douma at 2016-05-02T11:26:09+02:00 CMS-10082: restore not-yet-scanned translation resource bundles until CMS-10085 is fixed - also cleanup a few more no longer used properties files - - - - - de37ccee by Ate Douma at 2016-05-02T15:15:23+02:00 CMS-10082: Remove translations resource bundles which are now managed within hippo-cms-translations project - - - - - b0a362b4 by Unico Hommes at 2016-05-03T10:38:03+02:00 CMS-10081 reload global cms settings configuration - - - - - 50473a2e by Arthur Bogaart at 2016-05-03T13:16:13+02:00 CMS-10070 Add DateTimePrinter utility and unit test - - - - - 43973b3e by Arthur Bogaart at 2016-05-03T13:17:52+02:00 CMS-10070 Expose TimeZone from UserSession Simpler code and easier mock in unt test - - - - - 6877911c by Arthur Bogaart at 2016-05-03T13:19:50+02:00 CMS-10070 Use new DateTimePrinter to format date output - - - - - 426250f5 by Arthur Bogaart at 2016-05-03T13:21:58+02:00 CMS-10070 Fix styling on schedule (de)publication dialog and doc-info dialog The 'reset' button looks very weird in the date-picker dialog. Removed the breaking style and fixed font-size/position. Also fixed the sizing of the doc-info dialog. - - - - - 6f7783ef by Arthur Bogaart at 2016-05-03T13:22:40+02:00 CMS-10070 Code format - - - - - 77671fe5 by Mathijs den Burger at 2016-05-09T10:53:33+02:00 CMS-10070 fallback to default time zone if needed - - - - - 8da771a1 by Mathijs den Burger at 2016-05-09T10:56:43+02:00 CMS-10070 translate " (DST)" suffix - - - - - d5387b91 by Mathijs den Burger at 2016-05-09T10:57:23+02:00 CMS-10070 Reintegrate 'bugfix/CMS-10070' - - - - - bb8c2b11 by Mathijs den Burger at 2016-05-09T14:14:05+02:00 CMS-10070 fix unit test Use the ClassResourceModel constructor with a style to avoid that the test fails on a non-existing Wicket session. Extend PluginTest to ensure that an Application is available (needed by the ClassResourceModel). - - - - - e8ac8cd5 by Mathijs den Burger at 2016-05-09T14:15:13+02:00 CMS-10070 Reintegrate 'bugfix/CMS-10070' - - - - - c1ea4d63 by Mathijs den Burger at 2016-05-10T09:50:42+02:00 CMS-10070 make DateTimeLabel serializable Otherwise Wicket cannot serialize the session, which causes huge stack traces in development mode. - - - - - bf334469 by Mathijs den Burger at 2016-05-10T09:54:20+02:00 CMS-10096 don't overwrite passed event listeners in constructor - - - - - e35b151d by Mathijs den Burger at 2016-05-10T12:45:06+02:00 CMS-10070 move non-English translations to l10n module - - - - - 77d0486b by Arthur Bogaart at 2016-05-10T12:59:18+02:00 CMS-10096 Reintegrate bugfix/CMS-10096 - - - - - 292be2f2 by Marijan Milicevic at 2016-05-10T16:47:56+02:00 CMS-10080 Revision Comparision View show doc link field changed incorrectly (cherry picked from commit 84e50c607aa0e7250d0a9cab1ac1f274d6acddd0) - - - - - 7e7f005e by Arthur Bogaart at 2016-05-10T17:17:00+02:00 CMS-10099 Add <wicket:child/> to CaptchaForm Add a <wicket:child/> element so subclasses of the CaptchaForm can extend the HTML instead of having to fork. The extension point is inserted *before* the captcha field so that when the Captcha is shown (after a couple of failed login attempts), it does not break the form layout. - - - - - 3dd116b6 by Arthur Bogaart at 2016-05-12T17:07:26+02:00 CMS-10070 Use English translations in tests - - - - - e17f166e by Unico Hommes at 2016-05-18T12:44:58+02:00 CMS-10039 parse delta with namespace aware xml parser - - - - - 2fbff944 by Arent-Jan Banck at 2016-05-19T16:43:18+02:00 CMS-16 Bump html diff to latest tagged version, 1.01.04 - - - - - 0904fd9d by Ard Schrijvers at 2016-05-23T17:04:13+02:00 CMS-10101 improve logging of CsrfPreventionRequestCycleListener In case the request host does not match the origin host, we now log more debug info - - - - - e543da10 by Ard Schrijvers at 2016-05-24T09:43:08+02:00 CMS-10101 more explicit logging in case the scheme does not match Typically this is caused because of running behind a proxy that delegates a https request to http. - - - - - 07c97e23 by Ard Schrijvers at 2016-05-25T13:29:38+02:00 CMS-10078 Merge master changes in feature/CMS-10078 - - - - - eabf21b0 by Ard Schrijvers at 2016-05-25T15:07:47+02:00 CMS-10079 Merge master changes in feature/CMS-10079 - - - - - f145c160 by Ard Schrijvers at 2016-05-25T15:08:51+02:00 CMS-10079 Reintegrate feature/CMS-10079 - - - - - 609337b3 by Canh Ngo at 2016-05-27T11:32:37+02:00 CMS-9884:Update changes from master - - - - - 100 changed files: - − api/src/main/java/org/hippoecm/addon/workflow/AbstractWorkflowDialog_de.properties - − api/src/main/java/org/hippoecm/addon/workflow/AbstractWorkflowDialog_fr.properties - − api/src/main/java/org/hippoecm/addon/workflow/AbstractWorkflowDialog_nl.properties - − api/src/main/java/org/hippoecm/addon/workflow/CompatibilityWorkflowPlugin$WorkflowAction$DestinationDialog_de.properties - − api/src/main/java/org/hippoecm/addon/workflow/CompatibilityWorkflowPlugin$WorkflowAction$DestinationDialog_fr.properties - − api/src/main/java/org/hippoecm/addon/workflow/CompatibilityWorkflowPlugin$WorkflowAction$DestinationDialog_nl.properties - − api/src/main/java/org/hippoecm/addon/workflow/CompatibilityWorkflowPlugin$WorkflowAction$TextDialog_de.properties - − api/src/main/java/org/hippoecm/addon/workflow/CompatibilityWorkflowPlugin$WorkflowAction$TextDialog_fr.properties - − api/src/main/java/org/hippoecm/addon/workflow/CompatibilityWorkflowPlugin$WorkflowAction$TextDialog_nl.properties - − api/src/main/java/org/hippoecm/addon/workflow/DestinationDialog_de.properties - − api/src/main/java/org/hippoecm/addon/workflow/DestinationDialog_fr.properties - − api/src/main/java/org/hippoecm/addon/workflow/DestinationDialog_nl.properties - − api/src/main/java/org/hippoecm/addon/workflow/FutureDateValidator_de.properties - − api/src/main/java/org/hippoecm/addon/workflow/FutureDateValidator_fr.properties - − api/src/main/java/org/hippoecm/addon/workflow/FutureDateValidator_nl.properties - − api/src/main/java/org/hippoecm/addon/workflow/TextDialog_de.properties - − api/src/main/java/org/hippoecm/addon/workflow/TextDialog_fr.properties - − api/src/main/java/org/hippoecm/addon/workflow/TextDialog_nl.properties - − api/src/main/java/org/hippoecm/frontend/dialog/AbstractDialog_de.properties - − api/src/main/java/org/hippoecm/frontend/dialog/AbstractDialog_fr.properties - − api/src/main/java/org/hippoecm/frontend/dialog/AbstractDialog_nl.properties - − api/src/main/java/org/hippoecm/frontend/dialog/ExceptionDialog_de.properties - − api/src/main/java/org/hippoecm/frontend/dialog/ExceptionDialog_fr.properties - − api/src/main/java/org/hippoecm/frontend/dialog/ExceptionDialog_nl.properties - api/src/main/java/org/hippoecm/frontend/editor/compare/NodeComparer.java - api/src/main/java/org/hippoecm/frontend/editor/workflow/dialog/DocumentMetadataDialog.java - − api/src/main/java/org/hippoecm/frontend/editor/workflow/dialog/DocumentMetadataDialog_nl.properties - − api/src/main/java/org/hippoecm/frontend/editor/workflow/dialog/ReferringDocumentsView_de.properties - − api/src/main/java/org/hippoecm/frontend/editor/workflow/dialog/ReferringDocumentsView_fr.properties - − api/src/main/java/org/hippoecm/frontend/editor/workflow/dialog/ReferringDocumentsView_nl.properties - − api/src/main/java/org/hippoecm/frontend/editor/workflow/dialog/SelectableDocumentsView_de.properties - − api/src/main/java/org/hippoecm/frontend/editor/workflow/dialog/SelectableDocumentsView_fr.properties - − api/src/main/java/org/hippoecm/frontend/editor/workflow/dialog/SelectableDocumentsView_nl.properties - − api/src/main/java/org/hippoecm/frontend/editor/workflow/dialog/WhereUsedDialog_de.properties - − api/src/main/java/org/hippoecm/frontend/editor/workflow/dialog/WhereUsedDialog_fr.properties - − api/src/main/java/org/hippoecm/frontend/editor/workflow/dialog/WhereUsedDialog_nl.properties - api/src/main/java/org/hippoecm/frontend/extjs/IFramePanel.js - − api/src/main/java/org/hippoecm/frontend/perspectives/common/ErrorMessagePanel_de.properties - − api/src/main/java/org/hippoecm/frontend/perspectives/common/ErrorMessagePanel_fr.properties - − api/src/main/java/org/hippoecm/frontend/perspectives/common/ErrorMessagePanel_nl.properties - − api/src/main/java/org/hippoecm/frontend/plugins/jquery/upload/multiple/FileUploadBar_de.properties - − api/src/main/java/org/hippoecm/frontend/plugins/jquery/upload/multiple/FileUploadBar_fr.properties - − api/src/main/java/org/hippoecm/frontend/plugins/jquery/upload/multiple/FileUploadBar_nl.properties - − api/src/main/java/org/hippoecm/frontend/plugins/jquery/upload/multiple/GalleryFileUploadBehavior_de.properties - − api/src/main/java/org/hippoecm/frontend/plugins/jquery/upload/multiple/GalleryFileUploadBehavior_fr.properties - − api/src/main/java/org/hippoecm/frontend/plugins/jquery/upload/multiple/GalleryFileUploadBehavior_nl.properties - − api/src/main/java/org/hippoecm/frontend/plugins/jquery/upload/multiple/JQueryFileUploadDialog_de.properties - − api/src/main/java/org/hippoecm/frontend/plugins/jquery/upload/multiple/JQueryFileUploadDialog_fr.properties - − api/src/main/java/org/hippoecm/frontend/plugins/jquery/upload/multiple/JQueryFileUploadDialog_nl.properties - − api/src/main/java/org/hippoecm/frontend/plugins/jquery/upload/single/SingleFileUploadBar_de.properties - − api/src/main/java/org/hippoecm/frontend/plugins/jquery/upload/single/SingleFileUploadBar_fr.properties - − api/src/main/java/org/hippoecm/frontend/plugins/jquery/upload/single/SingleFileUploadBar_nl.properties - − api/src/main/java/org/hippoecm/frontend/plugins/standards/browse/BreadcrumbPlugin_de.properties - − api/src/main/java/org/hippoecm/frontend/plugins/standards/browse/BreadcrumbPlugin_fr.properties - − api/src/main/java/org/hippoecm/frontend/plugins/standards/browse/BreadcrumbPlugin_nl.properties - + api/src/main/java/org/hippoecm/frontend/plugins/standards/datetime/DateTimeLabel.java - + api/src/main/java/org/hippoecm/frontend/plugins/standards/datetime/DateTimePrinter.java - − api/src/main/java/org/hippoecm/frontend/plugins/standards/list/ExpandCollapseListingPlugin_de.properties - − api/src/main/java/org/hippoecm/frontend/plugins/standards/list/ExpandCollapseListingPlugin_fr.properties - − api/src/main/java/org/hippoecm/frontend/plugins/standards/list/ExpandCollapseListingPlugin_nl.properties - − api/src/main/java/org/hippoecm/frontend/plugins/standards/list/datatable/ListDataTable_de.properties - − api/src/main/java/org/hippoecm/frontend/plugins/standards/list/datatable/ListDataTable_fr.properties - − api/src/main/java/org/hippoecm/frontend/plugins/standards/list/datatable/ListDataTable_nl.properties - − api/src/main/java/org/hippoecm/frontend/plugins/standards/perspective/Perspective_de.properties - − api/src/main/java/org/hippoecm/frontend/plugins/standards/perspective/Perspective_fr.properties - − api/src/main/java/org/hippoecm/frontend/plugins/standards/perspective/Perspective_nl.properties - − api/src/main/java/org/hippoecm/frontend/plugins/standards/sort/NodeSortPanel_de.properties - − api/src/main/java/org/hippoecm/frontend/plugins/standards/sort/NodeSortPanel_fr.properties - − api/src/main/java/org/hippoecm/frontend/plugins/standards/sort/NodeSortPanel_nl.properties - − api/src/main/java/org/hippoecm/frontend/plugins/standards/tabs/ModifiedDocumentsView_de.properties - − api/src/main/java/org/hippoecm/frontend/plugins/standards/tabs/ModifiedDocumentsView_fr.properties - − api/src/main/java/org/hippoecm/frontend/plugins/standards/tabs/ModifiedDocumentsView_nl.properties - − api/src/main/java/org/hippoecm/frontend/plugins/standards/tabs/TabsContainerService_de.properties - − api/src/main/java/org/hippoecm/frontend/plugins/standards/tabs/TabsContainerService_fr.properties - − api/src/main/java/org/hippoecm/frontend/plugins/standards/tabs/TabsContainerService_nl.properties - − api/src/main/java/org/hippoecm/frontend/plugins/standards/tabs/TabsPlugin$CloseAllDialog_de.properties - − api/src/main/java/org/hippoecm/frontend/plugins/standards/tabs/TabsPlugin$CloseAllDialog_fr.properties - − api/src/main/java/org/hippoecm/frontend/plugins/standards/tabs/TabsPlugin$CloseAllDialog_nl.properties - − api/src/main/java/org/hippoecm/frontend/plugins/standards/tabs/TabsPlugin$OnCloseDialog_de.properties - − api/src/main/java/org/hippoecm/frontend/plugins/standards/tabs/TabsPlugin$OnCloseDialog_fr.properties - − api/src/main/java/org/hippoecm/frontend/plugins/standards/tabs/TabsPlugin$OnCloseDialog_nl.properties - api/src/main/java/org/hippoecm/frontend/plugins/yui/datetime/YuiDateTimeField.java - − api/src/main/java/org/hippoecm/frontend/plugins/yui/datetime/YuiDateTimeField_de.properties - − api/src/main/java/org/hippoecm/frontend/plugins/yui/datetime/YuiDateTimeField_fr.properties - − api/src/main/java/org/hippoecm/frontend/plugins/yui/datetime/YuiDateTimeField_nl.properties - api/src/main/java/org/hippoecm/frontend/plugins/yui/upload/MagicMimeTypeFileItem.java - − api/src/main/java/org/hippoecm/frontend/plugins/yui/upload/MultiFileUploadDialog_de.properties - − api/src/main/java/org/hippoecm/frontend/plugins/yui/upload/MultiFileUploadDialog_fr.properties - − api/src/main/java/org/hippoecm/frontend/plugins/yui/upload/MultiFileUploadDialog_nl.properties - − api/src/main/java/org/hippoecm/frontend/plugins/yui/upload/ajax/AjaxMultiFileUploadComponent_de.properties - − api/src/main/java/org/hippoecm/frontend/plugins/yui/upload/ajax/AjaxMultiFileUploadComponent_fr.properties - − api/src/main/java/org/hippoecm/frontend/plugins/yui/upload/ajax/AjaxMultiFileUploadComponent_nl.properties - − api/src/main/java/org/hippoecm/frontend/plugins/yui/upload/multifile/MultiFileUploadComponent_de.properties - − api/src/main/java/org/hippoecm/frontend/plugins/yui/upload/multifile/MultiFileUploadComponent_fr.properties - − api/src/main/java/org/hippoecm/frontend/plugins/yui/upload/multifile/MultiFileUploadComponent_nl.properties - − api/src/main/java/org/hippoecm/frontend/plugins/yui/upload/validation/DefaultUploadValidationService_de.properties - − api/src/main/java/org/hippoecm/frontend/plugins/yui/upload/validation/DefaultUploadValidationService_fr.properties - − api/src/main/java/org/hippoecm/frontend/plugins/yui/upload/validation/DefaultUploadValidationService_nl.properties - − api/src/main/java/org/hippoecm/frontend/plugins/yui/upload/validation/ImageUploadValidationService_de.properties - − api/src/main/java/org/hippoecm/frontend/plugins/yui/upload/validation/ImageUploadValidationService_fr.properties The diff was not included because it is too large. View it on GitLab: https://code.onehippo.org/cms-community/hippo-cms/compare/b4a1c2cdd93f7685059dcdc4cc5f32057f577562...609337b30fe5325e3c8e35f167b08e21fb2d4723
_______________________________________________ Hippocms-svn mailing list Hippocms-svn@lists.onehippo.org https://lists.onehippo.org/mailman/listinfo/hippocms-svn
