You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@isis.apache.org by jo...@apache.org on 2020/06/18 10:35:44 UTC
[isis] 03/03: Merge branch 'master' of
https://github.com/apache/isis
This is an automated email from the ASF dual-hosted git repository.
joergrade pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/isis.git
commit 5b7d978dcd4abbc8351476ca6100b8f56e894775
Merge: dc4bc56 4a6615d
Author: Jörg Rade <jo...@kuehne-nagel.com>
AuthorDate: Thu Jun 18 12:34:54 2020 +0200
Merge branch 'master' of https://github.com/apache/isis
.gitignore | 11 -
.idea/jarRepositories.xml | 76 +-
.idea/misc.xml | 9 +
.idea/modules.xml | 8 -
.idea/vcs.xml | 2 +
antora/README.adoc | 4 -
.../components/docs/modules/ROOT/pages/about.adoc | 2 +-
.../modules/ROOT/pages/landing-page/libraries.adoc | 10 +-
.../ROOT/partials/module-nav/libraries.adoc | 2 +-
antora/pom.xml | 35 -
antora/supplemental-ui/index.html | 4 +-
examples/demo/domain/pom.xml | 2 +-
.../demoapp/dom/_infra/AsciiDocReaderService.java | 73 +
.../demoapp/dom/_infra/HasAsciiDocDescription.java | 4 +
.../HasAsciiDocDescription_description.java} | 39 +-
.../dom/_infra/HasAsciiDocDescription_sources.java | 51 +
.../_infra}/LibraryPreloadingService.java | 2 +-
.../dom/_infra/MarkupVariableResolverService.java | 43 +
.../dom/homepage/DemoHomePage-description.adoc | 31 +
.../demoapp/dom/homepage/DemoHomePage-welcome.adoc | 30 +
.../java/demoapp/dom/homepage/DemoHomePage.adoc | 17 -
.../java/demoapp/dom/homepage/DemoHomePage.java | 37 +-
.../demoapp/dom/homepage/DemoHomePage.layout.xml | 18 +-
.../StatefulViewModelUsingJaxb-description.adoc | 38 +
.../StatefulViewModelUsingJaxb.java} | 45 +-
.../StatefulViewModelUsingJaxb.layout.xml} | 21 +-
.../ViewModels.java} | 54 +-
.../main/java/demoapp/utils/ThereCanBeOnlyOne.java | 4 +-
.../main/java/demoapp/webapp/DemoAppManifest.java | 5 +-
.../main/java/demoapp/webapp/menubars.layout.xml | 17 +-
.../demo/domain/src/main/resources/application.yml | 4 +-
examples/demo/pom.xml | 2 +-
examples/demo/vaadin/.gitignore | 12 +
examples/demo/vaadin/pom.xml | 2 +-
examples/demo/wicket/e2e-notes.adoc | 47 +
examples/demo/wicket/pom.xml | 2 +-
.../e2e/cypress-scaffolding/fixtures/example.json | 5 +
.../integration/examples/actions.spec.js | 299 ++++
.../integration/examples/aliasing.spec.js | 40 +
.../integration/examples/assertions.spec.js | 177 +++
.../integration/examples/connectors.spec.js | 97 ++
.../integration/examples/cookies.spec.js | 77 +
.../integration/examples/cypress_api.spec.js | 219 +++
.../integration/examples/files.spec.js | 115 ++
.../integration/examples/local_storage.spec.js | 52 +
.../integration/examples/location.spec.js | 32 +
.../integration/examples/misc.spec.js | 104 ++
.../integration/examples/navigation.spec.js | 56 +
.../integration/examples/network_requests.spec.js | 201 +++
.../integration/examples/querying.spec.js | 114 ++
.../examples/spies_stubs_clocks.spec.js | 205 +++
.../integration/examples/traversal.spec.js | 121 ++
.../integration/examples/utilities.spec.js | 136 ++
.../integration/examples/viewport.spec.js | 59 +
.../integration/examples/waiting.spec.js | 33 +
.../integration/examples/window.spec.js | 22 +
.../integration/typescript/basic.ts | 10 +
examples/demo/wicket/src/test/e2e/cypress.json | 3 +
.../src/test/e2e/cypress/integration/login.ts | 16 +
.../wicket/src/test/e2e/cypress/plugins/index.js | 21 +
.../src/test/e2e/cypress/support/commands.js | 25 +
.../wicket/src/test/e2e/cypress/support/index.js | 22 +
.../demo/wicket/src/test/e2e/package-lock.json | 1527 ++++++++++++++++++++
examples/demo/wicket/src/test/e2e/package.json | 21 +
examples/demo/wicket/src/test/e2e/tsconfig.json | 69 +
incubator/viewers/vaadin/.gitignore | 12 +
.../IsisIntegrationTestAbstractWithFixtures.java | 15 +
.../actionmenu/serviceactions/CssMenuItem.java | 2 +-
68 files changed, 4430 insertions(+), 240 deletions(-)