Commit acfa930d authored by Kostis Trantzas's avatar Kostis Trantzas
Browse files

Merge branch '2024Q4_RC' into 'develop' 

Preparing the 2024Q4_RC:

See merge request !17
parents 87ce7637 b8e18fe9

src/app/shared/components/contact/contact.component.html

+1 −1
Original line number Diff line number Diff line
@@ -6,7 +6,7 @@ 
                <h3>Who we are</h3>

                <div *ngIf="!customIntroductionHTML">

                    <address class='font-weight-light'><span class='font-weight-bold'>ETSI SDG OpenSlice</span> | <a

                            href='https://osl.etsi.org/' class='text-white'>https://osl.etsi.org</a><br>The ETSI Software Development Group for OpenSlice (SDG OSL) is developing an open source service based Operations Support System (OSS) to deliver Network Slice as a Service (NSaaS).</address>

                            href='https://osl.etsi.org/' class='text-white'>https://osl.etsi.org</a><br>The ETSI Software Development Group for OpenSlice (SDG OSL) is developing an open source service based Operations Support System (OSS) to deliver Network as a Service (NaaS).</address>

                    <address class='font-weight-light'><span class='font-weight-bold'>{{config.TITLE}}</span> | <a

                            href='{{config.WEBURL}}' class='text-white'>{{config.WEBURL}}</a><br>A portal that allows 5G

                        experimenters to design and deploy network services towards the infrastructure.</address>

src/assets/config/config.prod.default.json

+1 −1
Original line number Diff line number Diff line 
{	      

    "TITLE": "OpenSlice by ETSI",

    "PORTALVERSION":"2024Q4-SNAPSHOT",

    "PORTALVERSION":"2024Q4",

    "WIKI": "https://osl.etsi.org/documentation",

    "BUGZILLA": "{BASEURL}/bugzilla/",

    "STATUS": "{BASEURL}/healthstatus/",

src/assets/config/config.theming.default.json

+2 −2
Original line number Diff line number Diff line
@@ -3,7 +3,7 @@ 
    "DEPLOYMENT_LOGO_PATH":"assets/images/logo_clear.png",

    "DEFAULT_SERVICE_LOGO_PATH":"assets/images/logo_icon_original.png",

    "FAVICON_PATH":"favicon.ico",   

    "WHO_WE_ARE_HTML":"<address class='font-weight-light'><span class='font-weight-bold'>ETSI SDG OpenSlice</span>|<a href='https://osl.etsi.org/' class='text-white'>https://osl.etsi.org</a><br>The ETSI Software Development Group for OpenSlice (SDG OSL) is developing an open source service based Operations Support System (OSS) to deliver Network Slice as a Service (NSaaS).</address><address class='font-weight-light'><span class='font-weight-bold'>OpenSlice by ETSI</span>|<a href='http' class='text-white'>http://portal.openslice.io</a><br>A portal that allows 5G experimenters to design and deploy network services towards the infrastructure.</address><address class='font-weight-light'><span class='font-weight-bold'>OpenSlice by ETSI wiki</span>|<a href='https://osl.etsi.org/documentation' class='text-white'>https://osl.etsi.org/documentation</a><br>A wiki containing OpenSlice software documentation.</address>",

    "WHO_WE_ARE_HTML":"<address class='font-weight-light'><span class='font-weight-bold'>ETSI SDG OpenSlice</span>|<a href='https://osl.etsi.org/' class='text-white'>https://osl.etsi.org</a><br>The ETSI Software Development Group for OpenSlice (SDG OSL) is developing an open source service based Operations Support System (OSS) to deliver Network as a Service (NaaS).</address><address class='font-weight-light'><span class='font-weight-bold'>OpenSlice by ETSI</span>|<a href='http' class='text-white'>http://portal.openslice.eu</a><br>A portal that allows 5G experimenters to design and deploy network services towards the infrastructure.</address><address class='font-weight-light'><span class='font-weight-bold'>OpenSlice by ETSI wiki</span>|<a href='https://osl.etsi.org/documentation' class='text-white'>https://osl.etsi.org/documentation</a><br>A wiki containing OpenSlice software documentation.</address>",

    "CONNECT_WITH_US_HTML":"<div class='col-lg-3 col-md-6 col-sm-12'><div><a class='font-weight-light text-white' href='https://www.linkedin.com/company/openslice'><i class='fab mr-2 fa-linkedin'></i>LinkedIn</a></div></div><div class='col-lg-3 col-md-6 col-sm-12'><div><a class='font-weight-light text-white' href='https://openslice.slack.com/'><i class='fab mr-2 fa-slack'></i>Slack</a></div></div><div class='col-lg-3 col-md-6 col-sm-12'><div><a class='font-weight-light text-white' href='https://twitter.com/OpensliceOSS'><i class='fab mr-2 fa-twitter'></i>Twitter</a></div></div>",

    "FOOTER_HTML":"<div class='row align-items-center'><div class='col-md-2'><img src='assets/images/eu-commission.png'></div><div class='col-md-10 font-weight-light'><div class='font-weight-light'>OpenSlice has received funding from various projects under European Programmes for research, technological development and demonstration. You may refer to our extensive <a href='https://osl.etsi.org/ecosystem/'>ecosystem</a> for further details.</div><div class='font-weight-light'>Openslice by ETSI running OSL version 2024Q4-SNAPSHOT | <a href='https://osl.etsi.org/files/SDG_OSL_Terms_and_Conditions.pdf' class='font-weight-light'>Terms and Conditions</a> | &copy; 2024 on behalf of <a target='_blank' href='https://osl.etsi.org/' title='osl.etsi.org' class='font-weight-light'>osl.etsi.org</a></div></div></div>"

    "FOOTER_HTML":"<div class='row align-items-center'><div class='col-md-2'><img src='assets/images/eu-commission.png'></div><div class='col-md-10 font-weight-light'><div class='font-weight-light'>OpenSlice has received funding from various projects under European Programmes for research, technological development and demonstration. You may refer to our extensive <a href='https://osl.etsi.org/ecosystem/'>ecosystem</a> for further details.</div><div class='font-weight-light'>Openslice by ETSI running OSL version 2024Q4 | <a href='https://osl.etsi.org/files/SDG_OSL_Terms_and_Conditions.pdf' class='font-weight-light'>Terms and Conditions</a> | &copy; 2025 on behalf of <a target='_blank' href='https://osl.etsi.org/' title='osl.etsi.org' class='font-weight-light'>osl.etsi.org</a></div></div></div>"

}
 
 No newline at end of file