Commit 5f610eca authored by Kostis Trantzas's avatar Kostis Trantzas
Browse files

Merging 2024Q2_RC into main, creating 2024Q2 Release

parent 1a97d4db

.gitignore

+1 −0
Original line number Diff line number Diff line
@@ -49,3 +49,4 @@ src/assets/config/config.prod.json 
src/assets/config/config.theming.json

/src/assets/config/theming.scss

/.angular

/.tmp/

.gitlab-ci.yml

0 → 100644
+40 −0
Original line number Diff line number Diff line 
include:

  - project: osl/code/org.etsi.osl.main

    ref: main

    file: 

      - ci-templates/default.yml

      - ci-templates/build.yml

    rules:

      - if: '$CI_COMMIT_REF_NAME == "main"'

  

  - project: osl/code/org.etsi.osl.main

    ref: develop

    file: 

      - ci-templates/default.yml

      - ci-templates/build.yml

    rules:

      - if: '$CI_COMMIT_REF_NAME == "develop"'



  - project: osl/code/org.etsi.osl.main

    ref: $CI_COMMIT_REF_NAME

    file: 

      - ci-templates/default.yml

      - ci-templates/build.yml

    rules:

      - if: '$CI_COMMIT_REF_PROTECTED && $CI_COMMIT_REF_NAME != "main" && $CI_COMMIT_REF_NAME != "develop"'



  - project: osl/code/org.etsi.osl.main

    ref: develop

    file: 

      - ci-templates/default.yml

      - ci-templates/build_unprotected.yml

    rules:

      - if: '$CI_COMMIT_REF_NAME != "main" && $CI_COMMIT_REF_NAME != "develop" && !$CI_COMMIT_REF_PROTECTED'



angular_build:

  extends: .angular_build



docker_build:

  extends: .docker_build

  needs:

    - angular_build

nginx-custom.conf

+4 −5
Original line number Diff line number Diff line 


        # Expires map

        map $sent_http_content_type $expires {

            default                    off;
@@ -13,11 +12,11 @@ 
                listen 80;

                include /etc/nginx/mime.types;



          server_name  localhost;

          location ^~/services/ {

              root /usr/share/nginx/html;

          server_name tmf_web;

          location / {

              root /usr/share/nginx/html/services;

              index index.html index.htm;

              try_files $uri $uri/ /services/index.html =404;

              try_files $uri $uri/ /index.html =404;

            }



          expires $expires;

package-lock.json

+708 −201

File changed.

Preview size limit exceeded, changes collapsed.

package.json

+2 −0
Original line number Diff line number Diff line
@@ -34,9 +34,11 @@ 
    "@fullcalendar/timegrid": "~5.11.2",

    "@iplab/ngx-file-upload": "~13.0.0",

    "@ng-bootstrap/ng-bootstrap": "~11.0.1",

    "ang-jsoneditor": "^1.10.5",

    "angular-oauth2-oidc": "~13.0.1",

    "blockly": "git://github.com/google/blockly.git#6.20210701.0",

    "bootstrap": "~4.6.0",

    "jsoneditor": "^9.10.0",

    "jwt-decode": "~2.2.0",

    "ngx-markdown": "~13.1.0",

    "ngx-progressbar": "~8.0.0",