Merge branch 'dev' v0.2.46

freehackquest · Nov 28, 2021 · 960e834 · 960e834
2 parents 5523916 + bec018a
commit 960e834
Show file tree

Hide file tree

Showing 26 changed files with 260 additions and 230 deletions.
diff --git a/.snyk b/.snyk
@@ -0,0 +1,3 @@
+# Snyk (https://snyk.io) policy file, patches or ignores known vulnerabilities.
+version: v1.14.0
+ignore: {}
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -5,16 +5,42 @@ All notable changes to fhq-server project will be documented in this file.
 The format is based on [Keep a Changelog](http://keepachangelog.com/)
 and this project adheres to [Semantic Versioning](http://semver.org/).
 
+## [v0.2.46] - 2021-11-28 (2021 Nov 28)
+
+### Changed
+
+- Forbidden registration for domain fmshool72.ru
+- web-user: Renamed news to events
+- web-user: Redesign menu
+- web-user: Updated web-user/src/app/services/email-validator.service.ts
+- Updated license (year up)
+
+### Fixed
+
+- web-admin: Fixed cursor for codemirror
+- web-admin: Fixed kb edit
+
+### Security
+
+- web-user: Fix alerts in map-activity.component.ts by lgtm
+- web-user: [synk] upgrade core-js from 3.16.3 to 3.17.3
+- web-user: [snyk] Upgrade bootstrap from 4.6.0 to 4.6.1
+- web-user: [snyk] Upgrade multiple dependencies with Snyk
+- web-user: [snyk] Upgrade @angular/localize from 12.2.4 to 12.2.5
+- web-user: build(deps): bump path-parse from 1.0.6 to 1.0.7 in /web-user
+- web-user: build(deps): bump nth-check from 2.0.0 to 2.0.1 in /web-user
+- web-user: build(deps): bump jszip from 3.5.0 to 3.7.1 in /web-user
+
 ## [v0.2.45] - 2021-09-29 (2021 Sept 29)
 
 ### Security
 
-- web-user: [sync] Upgrade @angular/cdk from 12.2.1 to 12.2.2.
-- web-user: [sync] Upgrade @angular/material from 12.2.1 to 12.2.2.
-- web-user: [sync] Upgrade tslib from 2.3.0 to 2.3.1
-- web-user: [sync] Upgrade core-js from 3.16.2 to 3.16.3
-- web-user: [sync] Upgrade jquery from 3.5.1 to 3.6.0
-- web-user: [sync] Upgrade prismjs from 1.24.1 to 1.25.0
+- web-user: [synk] Upgrade @angular/cdk from 12.2.1 to 12.2.2.
+- web-user: [synk] Upgrade @angular/material from 12.2.1 to 12.2.2.
+- web-user: [synk] Upgrade tslib from 2.3.0 to 2.3.1
+- web-user: [synk] Upgrade core-js from 3.16.2 to 3.16.3
+- web-user: [synk] Upgrade jquery from 3.5.1 to 3.6.0
+- web-user: [synk] Upgrade prismjs from 1.24.1 to 1.25.0
 
 ## Added 
 

diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -1,3 +1,35 @@
+#*********************************************************************************
+#          Project
+#    __ _                                              
+#   / _| |__   __ _       ___  ___ _ ____   _____ _ __ 
+#  | |_| '_ \ / _` | ___ / __|/ _ \ '__\ \ / / _ \ '__|
+#  |  _| | | | (_| ||___|\__ \  __/ |   \ V /  __/ |   
+#  |_| |_| |_|\__, |     |___/\___|_|    \_/ \___|_|   
+#                |_|                                   
+#
+# Copyright (c) 2011-2021 FreeHackQuest
+#
+# Permission is hereby granted, free of charge, to any person obtaining a copy
+# of this software and associated documentation files (the "Software"), to deal
+# in the Software without restriction, including without limitation the rights
+# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+# copies of the Software, and to permit persons to whom the Software is
+# furnished to do so, subject to the following conditions:
+# 
+# The above copyright notice and this permission notice shall be included in all
+# copies or substantial portions of the Software.
+# 
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+# SOFTWARE.
+#
+##################################################################################
+# fhq-server CMake script
+
 cmake_minimum_required(VERSION 3.0)
 
 project(fhq-server)

diff --git a/src.wsjcpp/CMakeLists.txt b/src.wsjcpp/CMakeLists.txt
@@ -1,7 +1,7 @@
 # Automaticly generated by [email protected]
 cmake_minimum_required(VERSION 3.0)
 
-add_definitions(-DWSJCPP_APP_VERSION="v0.2.45")
+add_definitions(-DWSJCPP_APP_VERSION="v0.2.46")
 add_definitions(-DWSJCPP_APP_NAME="fhq-server")
 
 if (${CMAKE_SYSTEM_NAME} MATCHES "Darwin")

diff --git a/src/storages/mysql/mysql_storage.cpp b/src/storages/mysql/mysql_storage.cpp
@@ -135,6 +135,7 @@ bool MySqlStorageConnection::insertUpdateInfo(const std::string &sVersion, const
 }
 
 // ----------------------------------------------------------------------
+// MySqlStorage
 
 MySqlStorage::MySqlStorage() {
     TAG = "MySqlStorage";

diff --git a/unit-tests.wsjcpp/CMakeLists.txt b/unit-tests.wsjcpp/CMakeLists.txt
@@ -2,7 +2,7 @@
 cmake_minimum_required(VERSION 3.0)
 
 project(unit-tests C CXX)
-add_definitions(-DWSJCPP_APP_VERSION="ut-v0.2.45")
+add_definitions(-DWSJCPP_APP_VERSION="ut-v0.2.46")
 add_definitions(-DWSJCPP_APP_NAME="unit-tests-fhq-server")
 
 if (${CMAKE_SYSTEM_NAME} MATCHES "Darwin")
@@ -100,7 +100,7 @@ list (APPEND WSJCPP_INCLUDE_DIRS "../src.wsjcpp/wsjcpp_arguments/")
 list (APPEND WSJCPP_SOURCES "../src.wsjcpp/wsjcpp_arguments/wsjcpp_arguments.cpp")
 list (APPEND WSJCPP_SOURCES "../src.wsjcpp/wsjcpp_arguments/wsjcpp_arguments.h")
 
-# fhq-server:v0.2.45
+# fhq-server:v0.2.46
 list (APPEND WSJCPP_INCLUDE_DIRS "../src")
 list (APPEND WSJCPP_SOURCES "../src/validators/validators.h")
 list (APPEND WSJCPP_SOURCES "../src/validators/validators.cpp")

diff --git a/web-admin/css/swa-pages.css b/web-admin/css/swa-pages.css
@@ -127,6 +127,10 @@ input[type="file"] {
     box-shadow: none;
 }
 
+.CodeMirror div.CodeMirror-cursor {
+    border-left: 1px solid #0f0;
+}
+
 hr {
     background-color: #0f0;
 }

diff --git a/web-admin/js/fhq.admin.knowledge_base.js b/web-admin/js/fhq.admin.knowledge_base.js
@@ -80,7 +80,7 @@ fhqadmin.knowledge_base_load_current_item = function(kbid, proposal_id) {
 		}
 		list.append(`<div class="${classes}" kbid="${kbid}" propid="-1">Original</div> `);
 
-		fhq.classbook_proposal_list({
+		fhq.ws.classbook_proposal_list({
 			"classbookid": kbid
 		}).done(function(r){
 			for (let idx = 0; idx < r.data.length; idx++) {
@@ -170,7 +170,7 @@ fhqadmin.knowledge_base_load_current_item = function(kbid, proposal_id) {
 
 			if (propid === -1) {
 				// classbook_update_record
-				fhq.classbook_update_record({
+				fhq.ws.classbook_update_record({
 					"classbookid": kbid,
 					"name": $('#edit_kb_name').val(),
 					"content": window['edit_kb_content'].value(),

diff --git a/web-admin/js/fhq.ws.admin.js b/web-admin/js/fhq.ws.admin.js
@@ -306,6 +306,12 @@ fhq.ws.classbook_localization_update_record = function(params){
     return fhq.ws.send(params);
 }
 
+fhq.ws.classbook_proposal_list = function(params){
+    params = params || {};
+    params.cmd = 'classbook_proposal_list';
+    return fhq.ws.send(params);
+}
+
 fhq.ws.addhint = function(params){
     params = params || {};
     params.cmd = 'addhint';

diff --git a/web-user/LICENSE b/web-user/LICENSE
@@ -1,6 +1,6 @@
 MIT License
 
-Copyright (c) 2011-2019 FreeHackQuest
+Copyright (c) 2011-2021 FreeHackQuest
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal