Skip to content

Commit

Permalink
Merge pull request #11 from conterra/divers_sample_data
Browse files Browse the repository at this point in the history
Divers sample data
  • Loading branch information
sholtkamp authored Apr 17, 2024
2 parents 1bcb7c5 + 6a4f505 commit 56f01e5
Show file tree
Hide file tree
Showing 30 changed files with 316 additions and 655 deletions.
2 changes: 1 addition & 1 deletion gulpfile.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright (C) 2023 con terra GmbH (info@conterra.de)
* Copyright (C) 2024 con terra GmbH (info@conterra.de)
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
Expand Down
6 changes: 3 additions & 3 deletions pom.xml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
Copyright (C) 2023 con terra GmbH (info@conterra.de)
Copyright (C) 2024 con terra GmbH (info@conterra.de)
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
Expand Down Expand Up @@ -314,7 +314,7 @@
<properties>
<owner>con terra GmbH</owner>
<email>info@conterra.de</email>
<project.inceptionYear>2023</project.inceptionYear>
<project.inceptionYear>2024</project.inceptionYear>
</properties>
<includes>
<include>src/main/js/**/*.js</include>
Expand Down Expand Up @@ -501,7 +501,7 @@
required -->
<mapapps.useChunkedRequestEncoding>true</mapapps.useChunkedRequestEncoding>
<!-- enable this if "upload" profile should only deploy bundles -->
<skip.apps.upload>false</skip.apps.upload>
<skip.apps.upload>true</skip.apps.upload>
<!-- enable this if "upload" profile should pre-optimize apps -->
<triggerPreOptimization>false</triggerPreOptimization>
</properties>
Expand Down
2 changes: 1 addition & 1 deletion src/main/config/assembly.xml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<!--
Copyright (C) 2023 con terra GmbH (info@conterra.de)
Copyright (C) 2024 con terra GmbH (info@conterra.de)
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
Expand Down
2 changes: 1 addition & 1 deletion src/main/js/apps/sample/app.css
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/**
* Copyright (C) 2023 con terra GmbH (info@conterra.de)
* Copyright (C) 2024 con terra GmbH (info@conterra.de)
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
Expand Down
2 changes: 1 addition & 1 deletion src/main/js/apps/sample/app.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright (C) 2023 con terra GmbH (info@conterra.de)
* Copyright (C) 2024 con terra GmbH (info@conterra.de)
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
Expand Down
905 changes: 283 additions & 622 deletions src/main/js/apps/sample/app.json

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions src/main/js/apps/sample/nls/bundle.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright (C) 2023 con terra GmbH (info@conterra.de)
* Copyright (C) 2024 con terra GmbH (info@conterra.de)
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
Expand All @@ -15,7 +15,7 @@
*/
module.exports = {
root: {
apptitle: "Statistiken der Wahlkreise - 2017"
apptitle: "Statistiken der Wahlkreise - 2016"
},
"de": true
};
4 changes: 2 additions & 2 deletions src/main/js/apps/sample/nls/de/bundle.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright (C) 2023 con terra GmbH (info@conterra.de)
* Copyright (C) 2024 con terra GmbH (info@conterra.de)
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
Expand All @@ -14,5 +14,5 @@
* limitations under the License.
*/
module.exports = {
apptitle: "Statistiken der Wahlkreise - 2017"
apptitle: "Statistiken der Wahlkreise - 2016"
};
2 changes: 1 addition & 1 deletion src/main/js/bundles/dn_charting-c3/index.js

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion src/main/js/bundles/dn_charting-c3/styles/c3.min.css
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/**
* Copyright (C) 2023 con terra GmbH (info@conterra.de)
* Copyright (C) 2024 con terra GmbH (info@conterra.de)
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
Expand Down
2 changes: 1 addition & 1 deletion src/main/js/bundles/dn_charting/C3ChartsDataProvider.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright (C) 2023 con terra GmbH (info@conterra.de)
* Copyright (C) 2024 con terra GmbH (info@conterra.de)
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
Expand Down
2 changes: 1 addition & 1 deletion src/main/js/bundles/dn_charting/C3ChartsFactory.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright (C) 2023 con terra GmbH (info@conterra.de)
* Copyright (C) 2024 con terra GmbH (info@conterra.de)
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<!--
Copyright (C) 2023 con terra GmbH (info@conterra.de)
Copyright (C) 2024 con terra GmbH (info@conterra.de)
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright (C) 2023 con terra GmbH (info@conterra.de)
* Copyright (C) 2024 con terra GmbH (info@conterra.de)
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright (C) 2023 con terra GmbH (info@conterra.de)
* Copyright (C) 2024 con terra GmbH (info@conterra.de)
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
Expand Down
2 changes: 1 addition & 1 deletion src/main/js/bundles/dn_charting/QueryController.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright (C) 2023 con terra GmbH (info@conterra.de)
* Copyright (C) 2024 con terra GmbH (info@conterra.de)
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright (C) 2023 con terra GmbH (info@conterra.de)
* Copyright (C) 2024 con terra GmbH (info@conterra.de)
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
Expand Down
2 changes: 1 addition & 1 deletion src/main/js/bundles/dn_charting/css/styles.css
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/**
* Copyright (C) 2023 con terra GmbH (info@conterra.de)
* Copyright (C) 2024 con terra GmbH (info@conterra.de)
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
Expand Down
2 changes: 1 addition & 1 deletion src/main/js/bundles/dn_charting/main.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright (C) 2023 con terra GmbH (info@conterra.de)
* Copyright (C) 2024 con terra GmbH (info@conterra.de)
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
Expand Down
2 changes: 1 addition & 1 deletion src/main/js/bundles/dn_charting/module.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright (C) 2023 con terra GmbH (info@conterra.de)
* Copyright (C) 2024 con terra GmbH (info@conterra.de)
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
Expand Down
2 changes: 1 addition & 1 deletion src/main/js/bundles/dn_charting/nls/bundle.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright (C) 2023 con terra GmbH (info@conterra.de)
* Copyright (C) 2024 con terra GmbH (info@conterra.de)
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
Expand Down
2 changes: 1 addition & 1 deletion src/main/js/bundles/dn_charting/nls/de/bundle.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright (C) 2023 con terra GmbH (info@conterra.de)
* Copyright (C) 2024 con terra GmbH (info@conterra.de)
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
Expand Down
2 changes: 1 addition & 1 deletion src/main/js/bundles/dn_charting/tests/all.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright (C) 2023 con terra GmbH (info@conterra.de)
* Copyright (C) 2024 con terra GmbH (info@conterra.de)
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
Expand Down
2 changes: 1 addition & 1 deletion src/test/resources/application.properties
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
#
# Copyright (C) 2023 con terra GmbH (info@conterra.de)
# Copyright (C) 2024 con terra GmbH (info@conterra.de)
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
Expand Down
2 changes: 1 addition & 1 deletion src/test/webapp/index.html
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<!--
Copyright (C) 2023 con terra GmbH (info@conterra.de)
Copyright (C) 2024 con terra GmbH (info@conterra.de)
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
Expand Down
2 changes: 1 addition & 1 deletion src/test/webapp/init.css
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/**
* Copyright (C) 2023 con terra GmbH (info@conterra.de)
* Copyright (C) 2024 con terra GmbH (info@conterra.de)
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
Expand Down
2 changes: 1 addition & 1 deletion src/test/webapp/js/tests/init-packs.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright (C) 2023 con terra GmbH (info@conterra.de)
* Copyright (C) 2024 con terra GmbH (info@conterra.de)
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
Expand Down
2 changes: 1 addition & 1 deletion src/test/webapp/js/tests/runTests.html
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<!--
Copyright (C) 2023 con terra GmbH (info@conterra.de)
Copyright (C) 2024 con terra GmbH (info@conterra.de)
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
Expand Down
2 changes: 1 addition & 1 deletion src/test/webapp/js/tests/test-init.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright (C) 2023 con terra GmbH (info@conterra.de)
* Copyright (C) 2024 con terra GmbH (info@conterra.de)
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
Expand Down
2 changes: 1 addition & 1 deletion src/test/webapp/login.css
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/**
* Copyright (C) 2023 con terra GmbH (info@conterra.de)
* Copyright (C) 2024 con terra GmbH (info@conterra.de)
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
Expand Down

0 comments on commit 56f01e5

Please sign in to comment.