{"push_id":640511317,"size":59,"distinct_size":59,"ref":"refs/heads/feature/form-validation-expression","head":"b6010c412c6f1b62d860273ebaa641234bc499ae","before":"0cc7c1b8575d338307a72bd4d099d18e2b869b61","commits":[{"sha":"a29711dba742537b6cadb6ec6cb1e2648a17046d","author":{"email":"093ab2c4ff232f79dd9c4452cbd028ec4b4b0b60@umcg.nl","name":"Fleur Kelpin"},"message":"Merge branch 'r1.5.0' into merge-r1.5.0\n\nConflicts:\n\tmolgenis-core-ui/pom.xml\n\tmolgenis-core-ui/src/main/resources/js/molgenis-form-edit.js\n\tmolgenis-data-import/src/main/java/org/molgenis/data/importer/ImportWriter.java\n\tmolgenis-data-import/src/main/java/org/molgenis/data/importer/ImporterConfiguration.java\n\tmolgenis-data-mapper/src/main/resources/js/single-mapping-project.js\n\tmolgenis-data-migrate/src/test/java/org/molgenis/data/version/MetaDataVersionServiceTest.java\n\tmolgenis-data-semanticsearch/src/main/java/org/molgenis/data/semantic/SemanticSearchConfig.java\n\tmolgenis-data-semanticsearch/src/main/java/org/molgenis/data/semanticsearch/service/impl/UntypedTagService.java\n\tmolgenis-model-registry/src/main/java/org/molgenis/standardsregistry/StandardsRegistryController.java\n\tmolgenis-ontology/src/main/java/org/molgenis/ontology/importer/repository/OntologyRepository.java\n\tmolgenis-ontology/src/main/java/org/molgenis/ontology/importer/repository/OntologyRepositoryCollection.java\n\tmolgenis-ontology/src/main/java/org/molgenis/ontology/importer/repository/OntologyTermDynamicAnnotationRepository.java\n\tmolgenis-ontology/src/main/java/org/molgenis/ontology/importer/repository/OntologyTermNodePathRepository.java\n\tmolgenis-ontology/src/main/java/org/molgenis/ontology/importer/repository/OntologyTermRepository.java\n\tmolgenis-ontology/src/main/java/org/molgenis/ontology/importer/repository/OntologyTermSynonymRepository.java\n\tmolgenis-ontology/src/main/java/org/molgenis/ontology/matching/MatchInputTermBatchService.java\n\tmolgenis-ontology/src/test/java/org/molgenis/ontology/importer/repository/OntologyRepositoryTest.java\n\tmolgenis-ontology/src/test/java/org/molgenis/ontology/importer/repository/OntologyTermDynamicAnnotationRepositoryTest.java\n\tmolgenis-ontology/src/test/java/org/molgenis/ontology/importer/repository/OntologyTermNodePathRepositoryTest.java\n\tmolgenis-ontology/src/test/java/org/molgenis/ontology/importer/repository/OntologyTermRepositoryTest.java\n\tmolgenis-ontology/src/test/java/org/molgenis/ontology/importer/repository/OntologyTermSysnonymRepositoryTest.java","distinct":true,"url":"https://api.github.com/repos/erwinwinder/molgenis/commits/a29711dba742537b6cadb6ec6cb1e2648a17046d"},{"sha":"731ffddb9ebe38653b5953a7b9570d1c02fb2f24","author":{"email":"093ab2c4ff232f79dd9c4452cbd028ec4b4b0b60@umcg.nl","name":"Fleur Kelpin"},"message":"Fix merge errors:\n- Two SemanticSearchConfigs\n- References to concrete UntypedTagService class","distinct":true,"url":"https://api.github.com/repos/erwinwinder/molgenis/commits/731ffddb9ebe38653b5953a7b9570d1c02fb2f24"},{"sha":"791f86a9fbbc2d7dd380d872359e04592b05f101","author":{"email":"093ab2c4ff232f79dd9c4452cbd028ec4b4b0b60@umcg.nl","name":"Fleur Kelpin"},"message":"Merge branch 'master' of https://github.com/molgenis/molgenis into merge-r1.5.0\n\nConflicts:\n\tmolgenis-app/src/main/java/org/molgenis/app/WebAppConfig.java\n\tmolgenis-data-migrate/src/main/java/org/molgenis/data/version/MolgenisVersionService.java\n\tmolgenis-data-migrate/src/main/java/org/molgenis/data/version/v1_5/Step1UpgradeMetaData.java\n\tmolgenis-data/src/main/java/org/molgenis/data/DataConverter.java","distinct":true,"url":"https://api.github.com/repos/erwinwinder/molgenis/commits/791f86a9fbbc2d7dd380d872359e04592b05f101"},{"sha":"0fc1ceae0f944311f5ef62d4961180592624ac46","author":{"email":"70150a06e350d530d80fc056e78076d2e854151c@gmail.com","name":"bartcharbon"},"message":"Merge pull request #2808 from fdlk/merge-r1.5.0\n\nMerge branch 'r1.5.0' bugfixes into molgenis master","distinct":true,"url":"https://api.github.com/repos/erwinwinder/molgenis/commits/0fc1ceae0f944311f5ef62d4961180592624ac46"},{"sha":"e959934194d91ea3daf7e9cb00c585ddb0090430","author":{"email":"093ab2c4ff232f79dd9c4452cbd028ec4b4b0b60@umcg.nl","name":"Fleur Kelpin"},"message":"Make sure R Script type gets added to the database before the Ontology script.","distinct":true,"url":"https://api.github.com/repos/erwinwinder/molgenis/commits/e959934194d91ea3daf7e9cb00c585ddb0090430"},{"sha":"7b55190f25d580ee3ab323d09abf0aeb5aade436","author":{"email":"30c8a49295ccdc35f133b3451603009f13977e5f@gmail.com","name":"jjettenn"},"message":"Merge pull request #2852 from fdlk/master\n\nMake sure R Script type gets added to the database before the Ontology s...","distinct":true,"url":"https://api.github.com/repos/erwinwinder/molgenis/commits/7b55190f25d580ee3ab323d09abf0aeb5aade436"},{"sha":"a0f53c6e3751cd6e7f38f3d8968acc7ab24a3a03","author":{"email":"093ab2c4ff232f79dd9c4452cbd028ec4b4b0b60@umcg.nl","name":"Fleur Kelpin"},"message":"Document the reason for the autowired RScriptRegistrator","distinct":true,"url":"https://api.github.com/repos/erwinwinder/molgenis/commits/a0f53c6e3751cd6e7f38f3d8968acc7ab24a3a03"},{"sha":"09c389ed665dcf2c84e9ebf62dd52211f46d27be","author":{"email":"30c8a49295ccdc35f133b3451603009f13977e5f@gmail.com","name":"jjettenn"},"message":"Merge pull request #2853 from fdlk/master\n\nDocument the reason for the autowired RScriptRegistrator","distinct":true,"url":"https://api.github.com/repos/erwinwinder/molgenis/commits/09c389ed665dcf2c84e9ebf62dd52211f46d27be"},{"sha":"824cd244960a6ac9d7b242dea182d1cbb2713932","author":{"email":"093ab2c4ff232f79dd9c4452cbd028ec4b4b0b60@umcg.nl","name":"Fleur Kelpin"},"message":"Specify encoding of molgenis-script-evaluator.js","distinct":true,"url":"https://api.github.com/repos/erwinwinder/molgenis/commits/824cd244960a6ac9d7b242dea182d1cbb2713932"},{"sha":"6f13ed6e4d6ad27cc72b0d9507e3f68974c251ba","author":{"email":"093ab2c4ff232f79dd9c4452cbd028ec4b4b0b60@umcg.nl","name":"Fleur Kelpin"},"message":"Merge remote-tracking branch 'blessed/r1.5.0' into merge-r1.5.0\n\nConflicts:\n\tmolgenis-annotators/pom.xml\n\tmolgenis-app/pom.xml\n\tmolgenis-app/src/main/java/org/molgenis/app/WebAppConfig.java\n\tmolgenis-app/src/test/resources/emx_all_datatypes.xlsx\n\tmolgenis-app/src/test/resources/emx_all_datatypes_metadata_only.xlsx\n\tmolgenis-catalogue/pom.xml\n\tmolgenis-charts/pom.xml\n\tmolgenis-core-ui/pom.xml\n\tmolgenis-core-ui/src/main/resources/js/molgenis-form-edit.js\n\tmolgenis-core-ui/src/main/resources/js/molgenis.js\n\tmolgenis-core/pom.xml\n\tmolgenis-das/pom.xml\n\tmolgenis-data-annotators/pom.xml\n\tmolgenis-data-csv/pom.xml\n\tmolgenis-data-elasticsearch/pom.xml\n\tmolgenis-data-examples/pom.xml\n\tmolgenis-data-excel/pom.xml\n\tmolgenis-data-googlespreadsheet/pom.xml\n\tmolgenis-data-import/pom.xml\n\tmolgenis-data-import/src/main/java/org/molgenis/data/importer/ImportWriter.java\n\tmolgenis-data-import/src/main/java/org/molgenis/data/importer/ImporterConfiguration.java\n\tmolgenis-data-import/src/main/resources/templates/ImportResultsWizardPage.ftl\n\tmolgenis-data-jpa/pom.xml\n\tmolgenis-data-mapper/pom.xml\n\tmolgenis-data-mapper/src/main/resources/js/single-mapping-project.js\n\tmolgenis-data-merge/pom.xml\n\tmolgenis-data-migrate/pom.xml\n\tmolgenis-data-migrate/src/test/java/org/molgenis/data/version/MetaDataVersionServiceTest.java\n\tmolgenis-data-mysql/pom.xml\n\tmolgenis-data-rest-client/pom.xml\n\tmolgenis-data-rest/pom.xml\n\tmolgenis-data-rest/src/main/java/org/molgenis/data/rest/RestController.java\n\tmolgenis-data-semanticsearch/pom.xml\n\tmolgenis-data-semanticsearch/src/main/java/org/molgenis/data/semantic/SemanticSearchConfig.java\n\tmolgenis-data-semanticsearch/src/main/java/org/molgenis/data/semanticsearch/service/impl/UntypedTagService.java\n\tmolgenis-data-system/pom.xml\n\tmolgenis-data-vcf/pom.xml\n\tmolgenis-data/pom.xml\n\tmolgenis-data/src/main/java/org/molgenis/data/DataConverter.java\n\tmolgenis-dataexplorer/pom.xml\n\tmolgenis-disease-matcher/pom.xml\n\tmolgenis-js/pom.xml\n\tmolgenis-model-registry/pom.xml\n\tmolgenis-model-registry/src/main/java/org/molgenis/standardsregistry/StandardsRegistryController.java\n\tmolgenis-ontology-core/pom.xml\n\tmolgenis-ontology/pom.xml\n\tmolgenis-ontology/src/main/java/org/molgenis/ontology/matching/MatchInputTermBatchService.java\n\tmolgenis-ontology/src/main/java/org/molgenis/ontology/repository/OntologyRepositoryCollection.java\n\tmolgenis-ontology/src/test/java/org/molgenis/ontology/repository/OntologyRepositoryCollectionTest.java\n\tmolgenis-pathways/pom.xml\n\tmolgenis-python/pom.xml\n\tmolgenis-r/pom.xml\n\tmolgenis-scripts/pom.xml\n\tmolgenis-security-core/pom.xml\n\tmolgenis-security/pom.xml\n\tpom.xml","distinct":true,"url":"https://api.github.com/repos/erwinwinder/molgenis/commits/6f13ed6e4d6ad27cc72b0d9507e3f68974c251ba"},{"sha":"aed8fcfa110f4306df064d4c593d73580d532fe1","author":{"email":"093ab2c4ff232f79dd9c4452cbd028ec4b4b0b60@umcg.nl","name":"Fleur Kelpin"},"message":"organize import","distinct":true,"url":"https://api.github.com/repos/erwinwinder/molgenis/commits/aed8fcfa110f4306df064d4c593d73580d532fe1"},{"sha":"07ea8cad1f51e72adb9dda41b19ad5553c48e434","author":{"email":"093ab2c4ff232f79dd9c4452cbd028ec4b4b0b60@umcg.nl","name":"Fleur Kelpin"},"message":"Remove second MolgenisOntologyRepositoryCollection.","distinct":true,"url":"https://api.github.com/repos/erwinwinder/molgenis/commits/07ea8cad1f51e72adb9dda41b19ad5553c48e434"},{"sha":"72f4ef702e0000684a5b1bc47d5c148353c05d8f","author":{"email":"093ab2c4ff232f79dd9c4452cbd028ec4b4b0b60@umcg.nl","name":"Fleur Kelpin"},"message":"proper imports","distinct":true,"url":"https://api.github.com/repos/erwinwinder/molgenis/commits/72f4ef702e0000684a5b1bc47d5c148353c05d8f"},{"sha":"3df7b726c43289f4092d80731279c1b9980de02e","author":{"email":"093ab2c4ff232f79dd9c4452cbd028ec4b4b0b60@umcg.nl","name":"Fleur Kelpin"},"message":"Merge with r1.5.0","distinct":true,"url":"https://api.github.com/repos/erwinwinder/molgenis/commits/3df7b726c43289f4092d80731279c1b9980de02e"},{"sha":"387bddc4270dfbb39087335d4cab025195b4bf82","author":{"email":"093ab2c4ff232f79dd9c4452cbd028ec4b4b0b60@umcg.nl","name":"Fleur Kelpin"},"message":"Merge branch 'master' of https://github.com/molgenis/molgenis into merge-r1.5.0","distinct":true,"url":"https://api.github.com/repos/erwinwinder/molgenis/commits/387bddc4270dfbb39087335d4cab025195b4bf82"},{"sha":"787996e8693dccbe7b073c3a2e0bd73d1a10464e","author":{"email":"093ab2c4ff232f79dd9c4452cbd028ec4b4b0b60@umcg.nl","name":"Fleur Kelpin"},"message":"Return null if attribute not found.","distinct":true,"url":"https://api.github.com/repos/erwinwinder/molgenis/commits/787996e8693dccbe7b073c3a2e0bd73d1a10464e"},{"sha":"1c847ca766091ce60c8db5e1fafc0ec316d1f262","author":{"email":"093ab2c4ff232f79dd9c4452cbd028ec4b4b0b60@umcg.nl","name":"Fleur Kelpin"},"message":"Return null if attribute not found.","distinct":true,"url":"https://api.github.com/repos/erwinwinder/molgenis/commits/1c847ca766091ce60c8db5e1fafc0ec316d1f262"},{"sha":"4a65ce89265010d403a54d3821f66d304b67ac9e","author":{"email":"02dd73beabd0b3e379cfe029e10f7402f0c380e9@gmail.com","name":"Mark-de-Haan"},"message":"Fix '>' appearing when switching between plugins","distinct":true,"url":"https://api.github.com/repos/erwinwinder/molgenis/commits/4a65ce89265010d403a54d3821f66d304b67ac9e"},{"sha":"e5bd148cbbf416cf1e75eb55bd01f6cd5c75c3db","author":{"email":"02dd73beabd0b3e379cfe029e10f7402f0c380e9@gmail.com","name":"Mark-de-Haan"},"message":"Fix '>' appearing when switching between plugins","distinct":true,"url":"https://api.github.com/repos/erwinwinder/molgenis/commits/e5bd148cbbf416cf1e75eb55bd01f6cd5c75c3db"},{"sha":"e3da80d075d70a4b54acec30228de2845ab0e05f","author":{"email":"02dd73beabd0b3e379cfe029e10f7402f0c380e9@gmail.com","name":"Mark-de-Haan"},"message":"fix conflict","distinct":true,"url":"https://api.github.com/repos/erwinwinder/molgenis/commits/e3da80d075d70a4b54acec30228de2845ab0e05f"}]}