Merge pull request #1648 from Catrobat/release/v3.9.0

Release v3.9.0 into master

.env

@@ -14,7 +14,7 @@
 # https://symfony.com/doc/current/best_practices/configuration.html#infrastructure-related-configuration
 
 # Define the App Environment
-APP_VERSION='3.8.7'
+APP_VERSION='3.9.0'
 APP_ENV=dev
 APP_DEBUG=0
 APP_NAME="PocketCode Share"
@@ -120,3 +120,7 @@ APPLE_SECRET=''
 #
 FB_OAUTH_PUBLIC_KEY="-----BEGIN PUBLIC KEY-----\nMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAt8PoehZlIGzBqrm8fLTr\n2vVkLC1H/CYCv7DFz16KGiTVqMEyKiAYoCudcmtGJTJ5+Do62Zvl+VRwpOMmNUof\nEfe7ngUYNWu1/cab3P74HxGDy3mBcBZUhBk7V+nvN/j+mWCfDRaKxZZUjv1TVLUa\n990kUHnPchwyVMFEIrP//xhY5z0K8FijfKuSgjeBuXT5wRreUP7Y9L4v8WjnWuUM\nteptT5Oh+k0E13Oui4hCIELGW2tMnmrPjb6ObGx4swKN5wAePZeJ4mP0Xn39G8Vd\n+bkMtZeosNmo6S/oNIdE+TfKT0Hpe4HK4ft4MWtMyzj27zEqqCfzqNfMqiNIYjHb\nHwIDAQAB\n-----END PUBLIC KEY-----"
 ###< hwi/oauth-bundle ###
+
+###> translation ###
+ITRANSLATE_API_KEY=''
+###< translation ###

.github/workflows/check_for_new_bricks.yml

@@ -37,7 +37,7 @@ jobs:
     name: Check for new Catroid Bricks
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v2.3.4
 
       - name: Set Permissions
         run: sudo chmod 755 bin/checkCatroidRepositoryForNewBricks

.github/workflows/code_quality.yml

@@ -60,7 +60,7 @@ jobs:
     name: JavaScript [ESLint]
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v2.3.4
 
       # Download and set up node (caching is enabled)
       - uses: actions/[email protected]
@@ -97,7 +97,7 @@ jobs:
     name: Sass,CSS [StyleLint]
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v2.3.4
 
       # Download and set up node (caching is enabled)
       - uses: actions/[email protected]
@@ -136,7 +136,7 @@ jobs:
     name: PHP Code Style [Php-CS-Fixer]
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v2.3.4
 
       - name: Install dependencies (php-imagick)
         run: |
@@ -179,7 +179,7 @@ jobs:
     name: PHP Static Analysis [Php-Stan]
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v2.3.4
 
       - name: Install dependencies (php-imagick)
         run: |
@@ -223,10 +223,10 @@ jobs:
     name: PHP Static Analysis [Psalm]
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v2.3.4
 
       - name: Setup PHP 7.4
-        uses: shivammathur/setup-php@v2
+        uses: shivammathur/setup-php@2.11.0
         with:
           php-version: 7.4
 
@@ -269,7 +269,7 @@ jobs:
     name: PHP Static Analysis [PhpCPD]
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v2.3.4
       - name: PHP Copy Paste Detector
         uses: StephaneBour/[email protected]
         with:
@@ -284,7 +284,7 @@ jobs:
     name: PHP Static Analysis [Phpdd]
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v2.3.4
 
       - name: Install dependencies (php-imagick)
         run: |
@@ -324,7 +324,7 @@ jobs:
     name: PHP Info [PhpLoc]
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v2.3.4
       - run: wget https://phar.phpunit.de/phploc.phar
       - run: php phploc.phar src tests
 
@@ -337,7 +337,7 @@ jobs:
     name: Twig [Lint]
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v2.3.4
 
       - name: Install dependencies (php-imagick)
         run: |
@@ -378,7 +378,7 @@ jobs:
     name: Yaml [Lint]
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v2.3.4
 
       - name: Install dependencies (php-imagick)
         run: |
@@ -423,7 +423,7 @@ jobs:
     name: Symfony Container [Lint]
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v2.3.4
 
       - name: Install dependencies (php-imagick)
         run: |

.github/workflows/container_tests.yml

@@ -43,7 +43,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout
-        uses: actions/checkout@v2
+        uses: actions/checkout@v2.3.4
 
       - name: Build and start all containers (Docker Compose)
         run: |

.github/workflows/create_release_pull_request.yml

@@ -28,7 +28,7 @@ jobs:
     if: '[[ ${{ github.event.inputs.versionCode }} =~ ^[0-9]+\.[0-9]+\.[0-9]+$ ]]'
 
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v2.3.4
 
       # The changes here will be overwritten, however we need changes, else the PR will be automatically closed by GitHub
       - name: Dummy Changes to keep PR open
@@ -37,7 +37,7 @@ jobs:
 
       - name: Create Pull Request to main branch
         id: cpr-main
-        uses: peter-evans/create-pull-request@v3
+        uses: peter-evans/create-pull-request@v3.9.2
         with:
           token: ${{ secrets.GITHUB_TOKEN }}
           commit-message: Prepare release v${{ github.event.inputs.versionCode }}
@@ -70,15 +70,15 @@ jobs:
     needs: createRelease_01
 
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v2.3.4
 
       - name: Set Version Code
         run: |
           sed -i -E "s/APP_VERSION='[0-9]+\.[0-9]+\.[0-9]+'/APP_VERSION='${{ github.event.inputs.versionCode }}'/" .env
 
       - name: Create Pull Request to develop branch
         id: cpr-develop
-        uses: peter-evans/create-pull-request@v3
+        uses: peter-evans/create-pull-request@v3.9.2
         with:
           token: ${{ secrets.GITHUB_TOKEN }}
           commit-message: Prepare release v${{ github.event.inputs.versionCode }}

.github/workflows/deployment.yml

@@ -28,7 +28,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout
-        uses: actions/checkout@v2
+        uses: actions/checkout@v2.3.4
 
       - name: Connect to TUG via VPN
         run: |

.github/workflows/sync_crowdin.yml

@@ -45,7 +45,7 @@ jobs:
     name: Synchronize Crowdin Translations
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v2.3.4
 
       - uses: crowdin/[email protected]
         with:

.github/workflows/tests.yml

@@ -32,7 +32,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout
-        uses: actions/checkout@v2
+        uses: actions/checkout@v2.3.4
 
       - name: Build catroweb app image
         run: |
@@ -62,7 +62,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout
-        uses: actions/checkout@v2
+        uses: actions/checkout@v2.3.4
 
       - name: Pull the latest images to build (Faster than caching)
         run: |
@@ -98,7 +98,7 @@ jobs:
           name: PhpUnitTestReport
           path: tests/testreports/coverage/phpunit
 
-      - uses: codecov/codecov-action@v1
+      - uses: codecov/codecov-action@v1.5.0
         with:
           # token: ${{ secrets.CODECOV_TOKEN }} # not required for public repos
           file: tests/testreports/coverage/phpunit/coverage.xml
@@ -149,6 +149,7 @@ jobs:
           - api-deprecated-profile
           - api-deprecated-upload
 
+          - web-achievements
           - web-admin
           - web-apk-generation
           - web-authentication
@@ -172,7 +173,7 @@ jobs:
 
     steps:
       - name: Checkout
-        uses: actions/checkout@v2
+        uses: actions/checkout@v2.3.4
 
       - name: Pull the latest images to build (Faster than caching)
         run: |
@@ -240,7 +241,7 @@ jobs:
             docker exec app.catroweb bin/behat -s ${{ matrix.testSuite }} -f pretty;
           fi
 
-      - uses: codecov/codecov-action@v1
+      - uses: codecov/codecov-action@v1.5.0
         with:
           # token: ${{ secrets.CODECOV_TOKEN }} # not required for public repos
           file: tests/testreports/coverage/behat/coverage.xml

.gitignore

@@ -88,6 +88,7 @@ behat.yml
 ###> friendsofphp/php-cs-fixer ###
 /.php_cs
 /.php_cs.cache
+/.php-cs-fixer.cache
 ###< friendsofphp/php-cs-fixer ###
 
 ###> lexik/jwt-authentication-bundle ###

.php_cs.dist → .php-cs-fixer.dist.php

@@ -2,9 +2,14 @@
 
 $finder = PhpCsFixer\Finder::create()
   ->exclude(['Migrations', 'Resources'])
-  ->in(['src', 'tests']);
+  ->in(['src', 'tests'])
+  ->append([
+      __DIR__.'/php-cs-fixer',
+  ]);
 
-return PhpCsFixer\Config::create()
+$config = new PhpCsFixer\Config();
+$config
+  ->setRiskyAllowed(true)
   ->setRules([
     '@PSR2'               => true,
     '@PhpCsFixer'         => true,
@@ -15,3 +20,5 @@
   ->setFinder($finder)
   ->setUsingCache(true)
   ->setIndent('  ');
+
+return $config;

.stylelintrc.json

@@ -15,13 +15,16 @@
         ]
       }
     ],
+    "selector-class-pattern": "^[a-z]([a-z0-9\\-]*(__|--)?)*[a-z0-9]+$",
     "property-no-vendor-prefix": null,
     "selector-no-vendor-prefix": null,
     "value-no-vendor-prefix": null,
     "at-rule-no-vendor-prefix": null,
 
     "function-linear-gradient-no-nonstandard-direction": null,
 
-    "declaration-no-important": null
+    "declaration-no-important": null,
+    "no-invalid-position-at-import-rule": null,
+    "selector-class-pattern": "^[a-z][a-z0-9\\-\\_]*[a-z0-9]$"
   }
 }

CHANGELOG.md

@@ -3,6 +3,17 @@ All notable changes to this project will be documented in this file.
 
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
+
+## [3.9.0]
+- new API route: authentication/upgrade
+- Removed deprecated unused API routes
+- Updated dependencies
+- Fix tabs on user profiles
+- Fix invisible loading spinners
+- Disable click outside popups  
+- Achievements Overview + Updater 
+- Part 1 iTranslate integration  
+- Internal enhancements
 ## [3.8.5]
 - Upgraded API version
 - Updated dependencies
@@ -286,7 +297,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [2.1.1]
 ### Fixed
-- Fixes a problem in db connection with `server_version` in `doctrine.yml`([Source])
+- Fixes a problem in db connection with `server_version` in `doctrine.yml`([DoctrineSource])
 ## [2.1.0]
 ### Added
 - Program Owner now visible on small devices too.
@@ -297,7 +308,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 - Production logs are now rotating.
 - Deployment script adapted for more privacy and more modularity.
 - On the profile page all programs are loaded at once, are ordered and all own programs will be displayed.
-- Headlines are now centered through out all designs.
+- Headlines are now centered throughout all designs.
 - Programs that are uploaded ar no longer set to private if languageVersion is higher than supported.
 ### Changed
 - Recommended Program section will only be displayed if programs for this section exist.
@@ -317,8 +328,13 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 - Follow Icon gets positioned correctly again.
 - Color of text in search field is adjusted for "Luna & Cat"
 
-[Source]: https://github.com/doctrine/DoctrineBundle/issues/351
-[Unreleased]: https://github.com/Catrobat/Catroweb/compare/v3.8.3...HEAD
+[DoctrineSource]: https://github.com/doctrine/DoctrineBundle/issues/351
+[Unreleased]: https://github.com/Catrobat/Catroweb/compare/v3.9.0...HEAD
+[3.9.0]: https://github.com/Catrobat/Catroweb/compare/v3.8.7...v3.9.0
+[3.8.5]: https://github.com/Catrobat/Catroweb/compare/v3.8.6...v3.8.7
+[3.8.5]: https://github.com/Catrobat/Catroweb/compare/v3.8.5...v3.8.6
+[3.8.4]: https://github.com/Catrobat/Catroweb/compare/v3.8.4...v3.8.5
+[3.8.3]: https://github.com/Catrobat/Catroweb/compare/v3.8.3...v3.8.4
 [3.8.2]: https://github.com/Catrobat/Catroweb/compare/v3.8.2...v3.8.3
 [3.8.2]: https://github.com/Catrobat/Catroweb/compare/v3.8.1...v3.8.2
 [3.8.1]: https://github.com/Catrobat/Catroweb/compare/v3.8.0...v3.8.1

Gruntfile.js

@@ -152,10 +152,6 @@ const COPY_CONFIG =
       src: 'node_modules/jquery-contextmenu/dist/jquery.ui.position.min.js',
       dest: PUBLIC_DIRECTORY + '/js/modules/jquery.ui.position.min.js'
     },
-    animatedModal_js: {
-      src: 'node_modules/animatedmodal/animatedModal.min.js',
-      dest: PUBLIC_DIRECTORY + '/js/modules/animatedModal.min.js'
-    },
     animate_css: {
       src: 'node_modules/animate.css/animate.min.css',
       dest: PUBLIC_DIRECTORY + '/css/modules/animate.min.css'