Merge branch 'master' into sync-released-62f04c7db

Author: omichel

.github/ISSUE_TEMPLATE/config.yml

@@ -6,8 +6,8 @@ contact_links:
   - name: GitHub Discussions
     url: https://github.com/cyberbotics/webots/discussions/new
     about: Ask a question or request a new feature in Webots
-  - name: StackOverflow
-    url: https://stackoverflow.com/questions/tagged/webots
+  - name: Robotics StackExchange
+    url: https://robotics.stackexchange.com
     about: Ask technical questions (be sure to use the 'webots' tag).
   - name: Discord Server
     url: https://discordapp.com/invite/nTWbN9m

.github/pull_request_template.md

@@ -1,20 +1,25 @@
 **Description**
-Describe the bug you are fixing, the new feature your are introducing or the enhancement you are proposing.
+Describe the bug fix, enhancement or new feature your are proposing.
 
 **Related Issues**
 This pull-request fixes issue #
 
 **Tasks**
 Add the list of tasks of this PR.
+  - [ ] Update the [changelog](https://github.com/cyberbotics/webots/blob/master/docs/reference/changelog-r2024.md)
+  - [ ] Update the documentation (if needed)
   - [ ] Task 1
   - [ ] Task 2
+  - [ ] ...
 
 **Documentation**
 If this pull-request changes the doc, add the link to the related page, including the `?version=BRANCH_NAME`, such as:
-https://cyberbotics.com/doc/guide/getting-started-with-webots?version=develop
+https://cyberbotics.com/doc/guide/getting-started-with-webots?version=my_repo:my_branch
+or
+https://cyberbotics.com/doc/guide/getting-started-with-webots?version=my_branch (if the branch is on this repository)
 
 **Screenshots**
-If this pull-request includes any new robots/simulations/etc. add one or more screenshots of the result.
+If this pull-request includes any interesting visible result, add one or more screenshots.
 
 **Additional context**
 Add any other context about the pull-request here.

.github/workflows/test_suite_linux.yml

@@ -177,7 +177,7 @@ jobs:
         path: artifact
     - name: Get branch name
       id: branch-name
-      uses: tj-actions/branch-names@v5.1
+      uses: tj-actions/branch-names@v7.0.7
     - name: Extract Webots and Cache
       run: |
         tar xjf artifact/webots-*-x86-64*.tar.bz2 -C artifact

.github/workflows/test_suite_linux_develop.yml

@@ -170,7 +170,7 @@ jobs:
         path: artifact
     - name: Get branch name
       id: branch-name
-      uses: tj-actions/branch-names@v5.1
+      uses: tj-actions/branch-names@v7.0.7
     - name: Extract Webots and Cache
       run: |
         tar xjf artifact/webots-*-x86-64*.tar.bz2 -C artifact

.github/workflows/test_suite_mac.yml

@@ -43,6 +43,7 @@ jobs:
     - name: Install Webots Compilation Dependencies
       run: |
         # swig wget and cmake are already installed
+        pip install setuptools
         npm install -g appdmg
     - name: Set Commit SHA in Version
       if: ${{ github.event_name == 'schedule' }}

.github/workflows/test_suite_mac_develop.yml

@@ -39,6 +39,7 @@ jobs:
     - name: Install Webots Compilation Dependencies
       run: |
         # swig wget and cmake are already installed
+        pip install setuptools
         npm install -g appdmg
     - name: Set Commit SHA in Version
       if: ${{ github.event_name == 'schedule' }}

Contents/Info.plist

@@ -35,7 +35,7 @@
 	<key>CFBundleExecutable</key>
 	<string>webots</string>
 	<key>CFBundleGetInfoString</key>
-	<string>Webots R2023b, Copyright 1998-2023 Cyberbotics Ltd.</string>
+	<string>Webots R2024a, Copyright 1998-2024 Cyberbotics Ltd.</string>
 	<key>CFBundleIconFile</key>
 	<string>webots_icon</string>
 	<key>CFBundleIdentifier</key>
@@ -47,11 +47,11 @@
 	<key>CFBundlePackageType</key>
 	<string>APPL</string>
 	<key>CFBundleShortVersionString</key>
-	<string>R2023b</string>
+	<string>R2024a</string>
 	<key>CFBundleSignature</key>
 	<string>wbt </string>
 	<key>CFBundleVersion</key>
-	<string>R2023b</string>
+	<string>R2024a</string>
 	<key>LSMinimumSystemVersion</key>
 	<string>10.14</string>
 	<key>CSResourcesFileMapped</key>

docs/css/webots-doc.css

@@ -601,7 +601,7 @@ body {
 .ui-icon {
   display: inline-block;
   background-repeat: no-repeat;
-  background-image: url('https://cyberbotics.com/wwi/{{ webots.version.major }}/images/icons.svg');
+  background-image: url('https://cyberbotics.com/wwi/R2024a/images/icons.svg');
   background-color: transparent;
   border: none;
   width: 34px;