branch master updated (cb98736 -> 4090724)
This is an automated email from the git hooks/post-receive script. New change to branch master in repository jaxx. See https://gitlab.nuiton.org/nuiton/jaxx.git from cb98736 [jgitflow-maven-plugin]merging 'release/2.31' into 'master' adds 21a8e8f [jgitflow-maven-plugin]updating poms for 2.32-SNAPSHOT development adds 4685743 [jgitflow-maven-plugin]updating develop poms to master versions to avoid merge conflicts adds 4d4bcea [jgitflow-maven-plugin]merging 'master' into 'develop' adds d25b43f [jgitflow-maven-plugin]Updating develop poms back to pre merge state adds df45d8e Introduce a new module jaxx-widget-about + make possible to add as many as wanted tags from resources (Fixes #4024) adds c8953de Remove unused code adds e14d98a Readd missing i18n adds 0d08206 Introduce a AboutPanelBuilder (See #4024) adds 0b552ae Rename AboutPanel → AboutUI (See #4024) adds 4efddf4 Mise en place de AboutUI dans la démo (See #4024) adds 2528866 Stay on java 6 level adds 3a6675c Optimize dependencies adds 0083b87 Fix release build adds 71915d5 Update libraries (Fixes #4026) adds 3c4549a Update to nuitonpom 10.4 (Fixes #4031) adds bf99562 [jgitflow-maven-plugin]updating poms for 2.32 branch with snapshot versions adds 7b22406 [jgitflow-maven-plugin]updating poms for branch'release/2.32' with non-snapshot versions adds 4090724 [jgitflow-maven-plugin]merging 'release/2.32' into 'master' No new revisions were added by this update. Summary of changes: jaxx-application-api/pom.xml | 2 +- jaxx-application-swing/pom.xml | 2 +- jaxx-compiler/pom.xml | 2 +- jaxx-config/pom.xml | 2 +- jaxx-demo/pom.xml | 72 ++++++- jaxx-demo/src/main/filters/jaxx-demo.properties | 6 +- jaxx-demo/src/main/java/jaxx/demo/DemoConfig.java | 8 - .../src/main/java/jaxx/demo/DemoUIHandler.java | 50 ++--- .../feature/nav/tree/NavDemoTreeCellRenderer.java | 8 +- .../main/java/jaxx/demo/tree/DemoCellRenderer.java | 8 +- .../main/resources/i18n/jaxx-demo_en_GB.properties | 2 +- .../main/resources/i18n/jaxx-demo_es_ES.properties | 2 +- .../main/resources/i18n/jaxx-demo_fr_FR.properties | 2 +- jaxx-maven-plugin/pom.xml | 2 +- jaxx-runtime/pom.xml | 2 +- jaxx-validator/pom.xml | 2 +- {jaxx-widgets => jaxx-widgets-about}/LICENSE.txt | 0 {jaxx-widgets => jaxx-widgets-about}/README.md | 0 {jaxx-widgets => jaxx-widgets-about}/changelog.txt | 0 .../pom.xml | 41 ++-- .../src/license/THIRD-PARTY.properties | 0 .../org/nuiton/jaxx/widgets/about/AboutUI.jaxx | 73 +++++++ .../nuiton/jaxx/widgets/about/AboutUIBuilder.java | 210 +++++++++++++++++++++ .../i18n/jaxx-widgets-about_en_GB.properties | 5 + .../i18n/jaxx-widgets-about_es_ES.properties | 5 + .../i18n/jaxx-widgets-about_fr_FR.properties | 5 + .../src/main/resources/icons/action-close.png | Bin 0 -> 518 bytes .../src/site/site.xml | 0 jaxx-widgets-common/pom.xml | 2 +- jaxx-widgets-datetime/pom.xml | 2 +- jaxx-widgets-extra/pom.xml | 2 +- jaxx-widgets-gis/pom.xml | 2 +- jaxx-widgets-number/pom.xml | 2 +- jaxx-widgets-select/pom.xml | 2 +- jaxx-widgets/pom.xml | 2 +- .../java/jaxx/runtime/swing/AboutPanelHandler.java | 2 + .../resources/i18n/jaxx-widgets_en_GB.properties | 39 ---- .../resources/i18n/jaxx-widgets_es_ES.properties | 39 ---- .../resources/i18n/jaxx-widgets_fr_FR.properties | 39 ---- pom.xml | 71 ++++++- 40 files changed, 502 insertions(+), 213 deletions(-) copy {jaxx-widgets => jaxx-widgets-about}/LICENSE.txt (100%) copy {jaxx-widgets => jaxx-widgets-about}/README.md (100%) copy {jaxx-widgets => jaxx-widgets-about}/changelog.txt (100%) copy {jaxx-widgets-number => jaxx-widgets-about}/pom.xml (82%) copy {jaxx-widgets => jaxx-widgets-about}/src/license/THIRD-PARTY.properties (100%) create mode 100644 jaxx-widgets-about/src/main/java/org/nuiton/jaxx/widgets/about/AboutUI.jaxx create mode 100644 jaxx-widgets-about/src/main/java/org/nuiton/jaxx/widgets/about/AboutUIBuilder.java create mode 100644 jaxx-widgets-about/src/main/resources/i18n/jaxx-widgets-about_en_GB.properties create mode 100644 jaxx-widgets-about/src/main/resources/i18n/jaxx-widgets-about_es_ES.properties create mode 100644 jaxx-widgets-about/src/main/resources/i18n/jaxx-widgets-about_fr_FR.properties create mode 100644 jaxx-widgets-about/src/main/resources/icons/action-close.png copy {jaxx-widgets => jaxx-widgets-about}/src/site/site.xml (100%) -- To stop receiving notification emails like this one, please contact nuiton.org SCM administrator <admin+scm@nuiton.org>.
participants (1)
-
nuiton.org scm