Commit 1a5991bb authored by Kevin Di Lallo's avatar Kevin Di Lallo
Browse files

Merge branch 'stf599-hotfix' into develop

parents d522e892 6d673324

build.sh

+1 −0
Original line number Original line Diff line number Diff line
@@ -10,6 +10,7 @@ install_package() { 
    echo ""

    echo ""

    echo "+ Installing $1"

    echo "+ Installing $1"

    rm -rf $BASEDIR/js-packages/$1

    rm -rf $BASEDIR/js-packages/$1

    mkdir -p $BASEDIR/js-packages/$1

    cp -r $MEEPDIR/js-packages/$1 $BASEDIR/js-packages

    cp -r $MEEPDIR/js-packages/$1 $BASEDIR/js-packages

    cd $BASEDIR/js-packages/$1

    cd $BASEDIR/js-packages/$1

    npm ci

    npm ci

js-apps/frontend/src/js/app-constants.js

+1 −2
Original line number Original line Diff line number Diff line
@@ -18,9 +18,8 @@ export const MIN_SCREEN_HEIGHT = 0; 




// URLs

// URLs

export const WIKI_HELP_URL = 'https://mecwiki.etsi.org/index.php?title=MEC_Sandbox_Help';

export const WIKI_HELP_URL = 'https://mecwiki.etsi.org/index.php?title=MEC_Sandbox_Help';

export const WIKI_DISCUSSION_BOARD_URL = 'https://mecwiki.etsi.org/index.php?title=MEC_Sandbox_Help#Discussion_Board';

export const WIKI_DISCUSSION_BOARD_URL = 'https://mecwiki.etsi.org/index.php?title=MEC_Sandbox_Help#Discussion_Board_.28Slack_channels.29';

export const WIKI_REPORT_ISSUE_URL = 'https://mecwiki.etsi.org/index.php?title=MEC_Sandbox_Help#Reporting_Issues';

export const WIKI_REPORT_ISSUE_URL = 'https://mecwiki.etsi.org/index.php?title=MEC_Sandbox_Help#Reporting_Issues';



export const ETSI_MEC_URL = 'https://www.etsi.org/technologies/multi-access-edge-computing';

export const ETSI_MEC_URL = 'https://www.etsi.org/technologies/multi-access-edge-computing';

export const ETSI_PORTAL_URL = 'https://portal.etsi.org/tb.aspx?tbid=826&SubTB=826';

export const ETSI_PORTAL_URL = 'https://portal.etsi.org/tb.aspx?tbid=826&SubTB=826';

export const ETSI_FORGE_URL = 'https://forge.etsi.org';

export const ETSI_FORGE_URL = 'https://forge.etsi.org';

js-apps/frontend/src/js/containers/top-bar-container.js

+4 −0
Original line number Original line Diff line number Diff line
@@ -183,7 +183,11 @@ class TopBarContainer extends Component { 
                            window.open(WIKI_DISCUSSION_BOARD_URL,'_blank');

                            window.open(WIKI_DISCUSSION_BOARD_URL,'_blank');

                          }}

                          }}

                        >

                        >

<<<<<<< HEAD

                          <Typography use="body1">Discussion Board</Typography>

                          <Typography use="body1">Discussion Board</Typography>

=======

                          <Typography use="body1">Join Slack</Typography>

>>>>>>> stf599-hotfix

                        </MenuItem>

                        </MenuItem>

                        <MenuItem

                        <MenuItem

                          onClick={() => {

                          onClick={() => {