Skip to content

Commit ed57214

Browse files
authored
Merge pull request #1872 from Catrobat/release/v3.12.2
Release v3.12.2 into master
2 parents b85263e + 491558d commit ed57214

25 files changed

+22080
-4175
lines changed

.env

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
# https://symfony.com/doc/current/best_practices/configuration.html#infrastructure-related-configuration
1515

1616
# Define the App Environment
17-
APP_VERSION='3.12.1'
17+
APP_VERSION='3.12.2'
1818
APP_ENV=dev
1919
APP_DEBUG=0
2020
APP_NAME="PocketCode Share"

Gruntfile.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ module.exports = function (grunt) {
1414
// enable plugins
1515
grunt.loadNpmTasks('grunt-contrib-copy')
1616
grunt.loadNpmTasks('grunt-contrib-concat')
17-
grunt.loadNpmTasks('grunt-contrib-uglify-es')
17+
grunt.loadNpmTasks('grunt-contrib-uglify')
1818
grunt.loadNpmTasks('grunt-contrib-sass')
1919
grunt.loadNpmTasks('grunt-contrib-watch')
2020
grunt.loadNpmTasks('grunt-purgecss');

composer.lock

Lines changed: 33 additions & 32 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

config/packages/sonata_admin.yaml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -164,6 +164,8 @@ sonata_admin:
164164
items:
165165
- catrowebadmin.block.statistics.programs
166166
- catrowebadmin.block.statistics.clicks
167+
- catrowebadmin.block.statistics.project_machine_translation
168+
- catrowebadmin.block.statistics.comment_machine_translation
167169

168170
security:
169171

config/services.yaml

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -908,3 +908,23 @@ services:
908908
class: App\Translation\MachineTranslationListener
909909
tags:
910910
- { name: kernel.event_listener, event: kernel.terminate, method: onTerminateEvent }
911+
912+
catrowebadmin.block.statistics.project_machine_translation:
913+
class: App\Admin\Translation\ProjectMachineTranslationAdmin
914+
tags:
915+
- { name: sonata.admin, manager_type: orm, label: "Project Machine Translation" }
916+
arguments:
917+
- ~
918+
- App\Entity\Translation\ProjectMachineTranslation
919+
- App\Admin\Translation\Controller\ProjectMachineTranslationAdminController
920+
public: true
921+
922+
catrowebadmin.block.statistics.comment_machine_translation:
923+
class: App\Admin\Translation\CommentMachineTranslationAdmin
924+
tags:
925+
- { name: sonata.admin, manager_type: orm, label: "Comment Machine Translation" }
926+
arguments:
927+
- ~
928+
- App\Entity\Translation\CommentMachineTranslation
929+
- \App\Admin\Translation\Controller\CommentMachineTranslationAdminController
930+
public: true

0 commit comments

Comments
 (0)