Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
62 commits
Select commit Hold shift + click to select a range
848e493
fix: docker_dev/Dockerfile.dev to reduce vulnerabilities
snyk-bot Dec 6, 2022
7ab92d8
build(deps): bump json5 from 1.0.1 to 1.0.2 in /web-user
dependabot[bot] Jan 3, 2023
5ec6b87
build(deps): bump socket.io-parser from 4.0.4 to 4.0.5 in /web-user
dependabot[bot] Nov 9, 2022
57d8325
build(deps): bump loader-utils from 1.4.0 to 1.4.2 in /web-user
dependabot[bot] Nov 16, 2022
d9eb363
build(deps): bump engine.io from 6.2.0 to 6.2.1 in /web-user
dependabot[bot] Nov 22, 2022
90698a4
build(deps): bump decode-uri-component from 0.2.0 to 0.2.2 in /web-user
dependabot[bot] Dec 8, 2022
7fab441
build(deps): bump terser and @angular-devkit/build-angular in /web-user
dependabot[bot] Oct 22, 2022
62d6d1a
Added message to ctf-wall
Apr 18, 2023
321373c
Update ctf-wall.component.html
Ping7123 Apr 20, 2024
d6d32c3
Up version to 0.2.52
sea5kg Jan 3, 2023
d7f0072
Added reading game.info from file_storage/games/
sea5kg Jan 5, 2023
549e75f
Fix loading icon for game model
sea5kg Feb 11, 2023
4b7617f
Updated tslib to 2.4.1 (by snyk)
sea5kg Feb 11, 2023
f056e9d
Moved src-libhv to src/third-party/libhv and moved quazip-0.7.3 to th…
sea5kg Jan 8, 2024
f1253a6
Added sqlite3 and TODO
sea5kg Jan 8, 2024
da41a8c
Updated email-validator
sea5kg Jan 8, 2024
ec9bce7
Added copyright to any source file
sea5kg Jan 8, 2024
ad5e208
Redesign from ifdef to #pragma once
sea5kg Jan 8, 2024
09104fd
Applyed clang-format
sea5kg Jan 8, 2024
3b868f7
Preapre example for init sqlite database
sea5kg Jan 8, 2024
88ad66d
Removed FindPostgreSQL.cmake
sea5kg Jan 8, 2024
4830403
Removed tests/code-check (redesign to libfhqpm) and fix clang-format …
sea5kg Jan 8, 2024
1b67709
Updated README.md
sea5kg Jul 20, 2024
1a07ca4
Updated REAADME.md
sea5kg Jul 20, 2024
c44ccb5
Fix build
sea5kg Jul 20, 2024
a8eed73
Fix
sea5kg Jul 20, 2024
d8e2846
Redesign script rebuild_environment_images.sh to pm.py
sea5kg Jul 20, 2024
f523606
Removed github pages theme
sea5kg Jul 20, 2024
e736518
Removed proposal translate
sea5kg Jul 20, 2024
ec293ff
Updated to from angular 12 to angular 14
sea5kg Jul 20, 2024
1d00d4e
Fix knowlwdge base
sea5kg Jul 20, 2024
fda2ac4
Fix ci/travis/run1_language_cpp.sh
sea5kg Jul 21, 2024
500e088
Prepare moving to sqlite
sea5kg Jul 21, 2024
3a03e95
Updated CHANGELOG.md
sea5kg Jul 21, 2024
9c59ba7
Fix .dockerignore
sea5kg Jul 22, 2024
298458d
Update ctf-wall.component.html
NS-1212 Nov 7, 2024
58f8b8f
Add message to ctf-wall from szcm4wo
s7r4ngl3r Jul 5, 2025
8b4bb29
Add message to ctf-wall from ghost-webshell813
lendai-token Jul 30, 2025
7ed625f
Up version to 0.2.53
sea5kg Aug 5, 2025
cb2378c
Removed empty file SECURITY.md
sea5kg Aug 4, 2024
6d0cc3a
Added version to CHANGELOG.md
sea5kg Aug 6, 2025
4d41080
Updated version to v0.2.53 for web
sea5kg Aug 6, 2025
475d301
Fix remove item from knowledge base
sea5kg Aug 6, 2024
24a9dcf
Moved clean.sh to './pm.py clean'
sea5kg Aug 5, 2024
c53a92f
Updated years to -2025
sea5kg Jun 14, 2025
ad0a885
Redesign pm and fix pylint
sea5kg Jun 22, 2025
756326b
Updated CHANGELOG.md
sea5kg Aug 6, 2025
98a4af7
Updated wsjcpp-yaml from 0.1.7 to 0.1.8
sea5kg Jun 14, 2025
d5c6056
Updated wsjcpp-core from v0.2.2 to v0.2.3
sea5kg Aug 6, 2025
e1ea546
Updated wsjcpp-validators from v0.1.2 to v0.1.3
sea5kg Aug 6, 2025
952211a
Added EmployUuids, added models for useful_links, added new handlers …
sea5kg Aug 6, 2025
5801675
Removed donate component
sea5kg Aug 6, 2025
6601cc8
Added src/third-party/easyzip/ https://github.com/winsoft666/easyzip …
sea5kg Jul 17, 2025
6711c2e
Redesign zipping to easyzip and removed quazip-0.7.3
sea5kg Jul 21, 2025
7f0ca06
Added generate models for pm.py
sea5kg Aug 6, 2025
e65000a
Fix Dockerfile and .dockerignore
sea5kg Aug 6, 2025
776d3bd
Fix pylint
sea5kg Aug 6, 2025
36a2d7c
Fix clang-format
sea5kg Aug 6, 2025
e931592
Moved Dockerfile.*-environment to libfhqpm/command_rebuild_environmen…
sea5kg Aug 6, 2025
32ae64b
Fix pm.py, improved logging system in pm. Updated dockerfile
sea5kg Aug 10, 2025
520ed29
Added tests/test-fhq-run
sea5kg Aug 10, 2025
4c63c2d
fix: upgrade core-js from 3.37.1 to 3.44.0
snyk-bot Aug 11, 2025
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
26 changes: 13 additions & 13 deletions .clang-format
Original file line number Diff line number Diff line change
Expand Up @@ -2,14 +2,14 @@
Language: Cpp
# BasedOnStyle: LLVM
AccessModifierOffset: -2
AlignAfterOpenBracket: Align
AlignArrayOfStructures: None
AlignAfterOpenBracket: BlockIndent
AlignArrayOfStructures: Right
AlignConsecutiveMacros: None
AlignConsecutiveAssignments: None
AlignConsecutiveBitFields: None
AlignConsecutiveDeclarations: None
AlignEscapedNewlines: Right
AlignOperands: Align
AlignOperands: Align
AlignTrailingComments: true
AllowAllArgumentsOnNextLine: true
AllowAllParametersOfDeclarationOnNextLine: true
Expand All @@ -26,8 +26,8 @@ AlwaysBreakBeforeMultilineStrings: false
AlwaysBreakTemplateDeclarations: MultiLine
AttributeMacros:
- __capability
BinPackArguments: true
BinPackParameters: true
BinPackArguments: false
BinPackParameters: false
BraceWrapping:
AfterCaseLabel: false
AfterClass: false
Expand Down Expand Up @@ -61,8 +61,8 @@ ColumnLimit: 120
CommentPragmas: '^ IWYU pragma:'
QualifierAlignment: Leave
CompactNamespaces: false
ConstructorInitializerIndentWidth: 4
ContinuationIndentWidth: 4
ConstructorInitializerIndentWidth: 2
ContinuationIndentWidth: 2
Cpp11BracedListStyle: true
DeriveLineEnding: true
DerivePointerAlignment: false
Expand Down Expand Up @@ -136,7 +136,7 @@ ReferenceAlignment: Pointer
ReflowComments: true
RemoveBracesLLVM: false
SeparateDefinitionBlocks: Leave
ShortNamespaceLines: 1
ShortNamespaceLines: 0
SortIncludes: CaseSensitive
SortJavaStaticImport: Before
SortUsingDeclarations: true
Expand All @@ -145,18 +145,18 @@ SpaceAfterLogicalNot: false
SpaceAfterTemplateKeyword: true
SpaceBeforeAssignmentOperators: true
SpaceBeforeCaseColon: false
SpaceBeforeCpp11BracedList: false
SpaceBeforeCpp11BracedList: true
SpaceBeforeCtorInitializerColon: true
SpaceBeforeInheritanceColon: true
SpaceBeforeParens: ControlStatements
SpaceBeforeParensOptions:
AfterControlStatements: true
AfterForeachMacros: true
AfterFunctionDefinitionName: false
AfterFunctionDeclarationName: false
AfterFunctionDefinitionName: true
AfterFunctionDeclarationName: true
AfterIfMacros: true
AfterOverloadedOperator: false
BeforeNonEmptyParentheses: false
AfterOverloadedOperator: true
BeforeNonEmptyParentheses: true
SpaceAroundPointerQualifiers: Default
SpaceBeforeRangeBasedForLoopColon: true
SpaceInEmptyBlock: false
Expand Down
25 changes: 0 additions & 25 deletions .code-check.json

This file was deleted.

8 changes: 6 additions & 2 deletions .dockerignore
Original file line number Diff line number Diff line change
@@ -1,11 +1,15 @@
.git
ci
code-check
contrib
docker_dev
fhqjad-store
install
tests
/web-user/node_modules
/web-user/dist
_config.yml
_config.yml
/tmp
/web-user/.angular
/backups
/Dockerfile.build-environment
/Dockerfile.release-environment
9 changes: 8 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
dckr_mysql/*
/build
# Compiled Object files
*.slo
*.lo
Expand Down Expand Up @@ -52,6 +53,7 @@ lintian.log
freehackquest-backend.pro.user
/html/*
/latex/*
/ci/travis/data/file_storage/db/*

.qmake.stash
.DS_Store
Expand All @@ -77,6 +79,7 @@ tests/get-pip.py
fhq-server/fhq-server.debian95
.idea
/data
/backups
/docker_test
.wsjcpp
fhq-server
Expand All @@ -89,4 +92,8 @@ contrib/docker_compose_example/nginx/logs/*.log
TODO
12.webp
__pycache__
/tmp
/tmp
node_modules
web-user/.angular
Dockerfile.build-environment
Dockerfile.release-environment
50 changes: 49 additions & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,54 @@ 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.53] - 2025-06-14

- Updated wsjcpp-yaml from 0.1.7 to 0.1.8
- Updated years to -2025
- Fix remove item from knowledge base
- Moved clean.sh to './pm.py clean'
- Removed empty file SECURITY.md
- Updated wsjcpp-core from v0.2.2 to v0.2.3
- Updated wsjcpp-validators from v0.1.2 to v0.1.3
- Added EmployUuids, added models for useful_links, added new handlers `server_uuid_generate`, `server_uuid_info`
- Redesign work with sqlite
- Added src/third-party/easyzip/ https://github.com/winsoft666/easyzip (for replacement quazip-0.7.3
- Redesign zipping to easyzip and removed quazip-0.7.3
- Added generate models for pm.py

## [v0.2.52] - 2024-07-21 (2024 Jule 21)

### Added

- Added reading game.info from file_storage/games/
- Added copyright to any source file

### Removed

- [web-user] Removed proposal translate
- Removed github pages theme
- Removed FindPostgreSQL.cmake

### Fixed

- Fix knowlwdge base
- Updated email-validator

### Security

- [snyk] Updated tslib to 2.4.1
- Updated to from angular 12 to angular 14

### Changed

- Redesign script rebuild_environment_images.sh to pm.py
- Removed tests/code-check (redesign to libfhqpm) and fix clang-format style
- Prepare example for init sqlite database
- Redesign from ifdef to #pragma once
- Applyed clang-format
- Moved src-libhv to src/third-party/libhv and moved quazip-0.7.3 to third-party


## [v0.2.51] - 2023-01-03 (2023 Jan 3)

### Added
Expand Down Expand Up @@ -38,7 +86,7 @@ and this project adheres to [Semantic Versioning](http://semver.org/).
## [v0.2.50] - 2022-10-23 (2022 Oct 23)

### Fixed

- Fix admin create user
- Fix #318 - simplify start server via docker-compose

Expand Down
Loading
Loading