Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Prodløft #2853

Merged
merged 52 commits into from
Aug 9, 2024
+4,221 −4,291
Merged

Prodløft #2853

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
52 commits
Select commit Hold shift + click to select a range
3d44244
MIM-342:Første utkast makro formel
ssb-cgn May 22, 2024
6906e9d
MIM-342:Lagt til melding om at formel ikke vises i edit mode
ssb-cgn May 29, 2024
ff1f92b
Merge branch 'develop' of github.com:statisticsnorway/mimir into MIM-…
ssb-cgn May 29, 2024
e0b685b
Merge branch 'develop' of github.com:statisticsnorway/mimir into MIM-…
ssb-cgn May 30, 2024
75f8040
Fjernet klasse som ikke var i bruk
ssb-cgn May 31, 2024
977c332
Macro and content type working
michaelpande Jun 14, 2024
f466212
Merge pull request #2802 from statisticsnorway/master
annesiri Jun 14, 2024
4982e2a
Bump dawidd6/action-download-artifact from 5 to 6
dependabot[bot] Jun 17, 2024
c9897f7
Bump the dependencies-patch-updates group with 14 updates (#2804)
dependabot[bot] Jun 17, 2024
53a2a57
Merge branch 'develop' into dependabot/github_actions/dawidd6/action-…
Glenruben Jun 17, 2024
f94596f
Merge pull request #2803 from statisticsnorway/dependabot/github_acti…
Glenruben Jun 17, 2024
55e3d88
[MIM-1994] Ta med innhold som er publisert siste døgn (#2809)
ssb-cgn Jun 21, 2024
adf6176
[MIM-1762] Add checkbox to toggle time for modified date for statist…
johnnadeluy Jun 21, 2024
ad7ffea
Bump docker/build-push-action from 5 to 6 (#2811)
dependabot[bot] Jun 24, 2024
4c3fc60
Remove replaceCharacters, update allow list in backend + frontend
Glenruben Jun 24, 2024
bf343ef
[MIM-1976] Mim-1976 fix formatting errors in rich text part (#2807)
annesiri Jun 25, 2024
19bde46
Merge branch 'develop' into MIM-1956-add-special-characters
Glenruben Jun 25, 2024
ca05b12
Merge pull request #2813 from statisticsnorway/MIM-1956-add-special-c…
Glenruben Jun 25, 2024
ca5661c
[MIM-1827] MIM-1827:Fikset markering siste punkt i highchart (#2814)
ssb-cgn Jun 28, 2024
a4b27ef
Bump com.enonic.lib:lib-react4xp from 5.1.0 to 5.1.1 (#2816)
dependabot[bot] Jul 1, 2024
8dd0e0b
Converted classbased component to functional and removed log line
michaelpande Jul 4, 2024
80192cd
Maths correctly previews the part now
Glenruben Jul 4, 2024
920eed4
Error in maco, now taking in string.
Glenruben Jul 4, 2024
9f2c740
Merge branch 'develop' into MIM-342-maths-macro
michaelpande Jul 4, 2024
26f9acc
Updated gradle properties
michaelpande Jul 4, 2024
7ba94fd
Merge pull request #2766 from statisticsnorway/MIM-342-maths-macro
michaelpande Jul 4, 2024
9dd67b5
[MIM-1995] Rename newsletter form url input name (#2819)
johnnadeluy Jul 9, 2024
3b92f7e
Remove annesiri from auto_assign.yml (#2810)
annesiri Jul 9, 2024
c09310e
[MIM-1997] Wrap highmap part body in section for spacing (#2818)
johnnadeluy Jul 10, 2024
fd04d97
bump ssb component library to 2.1.0 (#2823)
Carl-OW Jul 11, 2024
adfa9f0
Bump the dependencies-minor-updates group across 1 directory with 3 u…
dependabot[bot] Jul 15, 2024
9a6d92d
[MIM-1881] Adds option to hide articles in newsletter (rss) (#2821)
johnnadeluy Jul 15, 2024
419fbb4
[MIM-1986] Mim 1986 prepend environments in title (#2827)
johnnadeluy Jul 18, 2024
d421274
[MIM-1987] Mim 1987 logo environment overlay (#2829)
johnnadeluy Jul 18, 2024
5368f97
Bump commons-codec:commons-codec from 1.17.0 to 1.17.1 (#2830)
dependabot[bot] Jul 22, 2024
3e39ec7
Bump the dependencies-patch-updates group with 12 updates (#2831)
dependabot[bot] Jul 22, 2024
7c58669
Bump the dependencies-minor-updates group with 5 updates
dependabot[bot] Jul 22, 2024
764951b
Merge pull request #2832 from statisticsnorway/dependabot/npm_and_yar…
Glenruben Jul 22, 2024
801ed5c
[MIM-1882] Mim 1882 highmaps options (#2822)
johnnadeluy Jul 24, 2024
2d713e8
[MIM-1999] Opacity fix for dataLabels (#2828)
Carl-OW Jul 24, 2024
592e3b6
[MIM-848] Mim 848 feature toggle summer cleanup (#2820)
johnnadeluy Jul 24, 2024
c91d875
Removal of style-loader (#2834)
Carl-OW Jul 25, 2024
4d26ed9
Bump the dependencies-patch-updates group with 5 updates (#2836)
dependabot[bot] Jul 29, 2024
e4cbb7b
[MIM-1932] Mim 1932 sr arrow keyfigure (#2838)
johnnadeluy Jul 30, 2024
a533c59
Increase connection and read timeout for post and get rss functions (…
johnnadeluy Jul 30, 2024
4c7da34
[MIM-1793] Fix variables in series translations for highcharts (#2835)
johnnadeluy Jul 31, 2024
6c71e46
[MIM-1933] Mim 1933 alt text employee (#2839)
johnnadeluy Jul 31, 2024
03b0a52
[MIM-1934] Mim 1934 bugfix default selection contact form (#2844)
johnnadeluy Aug 1, 2024
f7173f7
[MIM-2020] Mim 2020 bugfix pre selected dropdown item (#2849)
johnnadeluy Aug 7, 2024
f6c4338
[MIM-2020] Mim 2020 bugfix pif calculator dropdown options (#2852)
johnnadeluy Aug 7, 2024
d0405fa
Update version number to v2.11.0
Aug 9, 2024
187fd21
Merge pull request #2854 from statisticsnorway/Bump-version-number-v2…
Carl-OW Aug 9, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/auto_assign.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ assignees:
- ssb-cgn
- Glenruben
- johnnadeluy
- annesiri
# - annesiri
- Carl-OW
- michaelpande

Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/deploy_nais.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -106,7 +106,7 @@ jobs:
type=sha
type=raw,value=${{ env.TAG }}, enable=true
- name: Build and push
uses: docker/build-push-action@v5
uses: docker/build-push-action@v6
with:
context: ./ssbno-xp-docker
file: "./ssbno-xp-docker/Dockerfile"
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/former_build_deploy_to_prod.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ jobs:
environment: 'production'
steps:
- name: Download workflow artifact
uses: dawidd6/action-download-artifact@v5
uses: dawidd6/action-download-artifact@v6
with:
workflow: deploy_to_prod.yaml
branch: master
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/former_build_deploy_to_qa.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ jobs:
environment: 'QA_mimir'
steps:
- name: Download workflow artifact
uses: dawidd6/action-download-artifact@v5
uses: dawidd6/action-download-artifact@v6
with:
workflow: deploy_to_qa.yaml
branch: develop
Expand Down
4 changes: 2 additions & 2 deletions build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,11 +37,11 @@ dependencies {
include "com.enonic.xp:lib-cluster:${xpVersion}"
include "com.enonic.xp:lib-mail:${xpVersion}"
include "com.enonic.xp:lib-scheduler:${xpVersion}"
implementation 'commons-codec:commons-codec:1.17.0'
implementation 'commons-codec:commons-codec:1.17.1'
include "no.item:wsutil-server:2.0.0"
include "com.gravitondigital:featuretogglelib:0.3.0"
include 'org.json:json:20240303'
include "com.enonic.lib:lib-react4xp:5.1.0"
include "com.enonic.lib:lib-react4xp:5.1.1"
include 'com.enonic.lib:lib-text-encoding:2.1.1'
include "com.enonic.xp:lib-value:${xpVersion}"
include "no.item:lib-xp-cristin:1.3.1"
Expand Down
4 changes: 2 additions & 2 deletions gradle.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
# Gradle Project settings
projectName = mimir
version = 2.10.0
version = 2.11.0

# XP App values
appDisplayName = Mimir application
appName = mimir
vendorName = SSB
vendorUrl = http://example.com
xpVersion = 7.13.3
xpVersion = 7.14.2

# Settings for publishing to a Maven repo
group =
Loading
Loading