Merge pull request 'pip' (#298 ) from master into release

Reviewed-on: #298
pip
2025-09-29 18:50:15 +03:00 · 2025-09-29 18:48:30 +03:00 · 2025-09-27 15:35:39 +03:00 · 2025-09-27 15:35:31 +03:00 · 2025-09-23 21:39:28 +03:00 · 2025-09-23 21:17:06 +03:00
7 changed files with 9 additions and 6 deletions
--- a/.clang-format
+++ b/.clang-format
@@ -135,7 +135,7 @@ JavaScriptWrapImports: true
 KeepEmptyLinesAtTheStartOfBlocks: false
 LambdaBodyIndentation: Signature
 MacroBlockBegin: "PRIVATE_DEFINITION_START|STATIC_INITIALIZER_BEGIN"
-MacroBlockEnd: "PRIVATE_DEFINITION_END|STATIC_INITIALIZER_END"
+MacroBlockEnd: "PRIVATE_DEFINITION_END|PRIVATE_DEFINITION_END_NO_INITIALIZE|STATIC_INITIALIZER_END"
 MaxEmptyLinesToKeep: 2
 NamespaceIndentation: None
 ObjCBinPackProtocolList: Auto
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -5,6 +5,9 @@ cmake_policy(SET CMP0020 NEW) # Automatically link Qt executables to qtmain targ
 if (POLICY CMP0053)
 	cmake_policy(SET CMP0053 NEW) # simpler variable expansion and escape sequence evaluation rules
 endif()
 if (POLICY CMP0177)
 	cmake_policy(SET CMP0177 OLD)
 endif()
 project(shstk)
 set(CMAKE_MODULE_PATH
 	"${CMAKE_CURRENT_SOURCE_DIR}"
--- a/2
+++ b/2
--- a/2
+++ b/2
--- a/2
+++ b/2
--- a/2
+++ b/2
--- a/2
+++ b/2
Author	SHA1	Message	Date
Пелипенко Иван	4e4f9c156c	Merge pull request 'pip' (#298 ) from master into release All checks were successful SHS Gitea/shstk/pipeline/head This commit looks good Details Reviewed-on: #298	2025-09-29 18:50:15 +03:00
peri4	676d57a7d8	pip	2025-09-29 18:48:30 +03:00
Пелипенко Иван	19c5957e67	Merge pull request 'pip' (#297 ) from master into release All checks were successful SHS Gitea/shstk/pipeline/head This commit looks good Details Reviewed-on: #297	2025-09-27 15:35:39 +03:00
peri4	836c4b956d	pip	2025-09-27 15:35:31 +03:00
Пелипенко Иван	d93743c3e6	Merge pull request 'pip' (#296 ) from master into release All checks were successful SHS Gitea/shstk/pipeline/head This commit looks good Details Reviewed-on: #296	2025-09-23 21:39:28 +03:00
peri4	10e9c1b140	pip	2025-09-23 21:17:06 +03:00
Пелипенко Иван	306ae6f2b5	Merge pull request 'master' (#295 ) from master into release All checks were successful SHS Gitea/shstk/pipeline/head This commit looks good Details Reviewed-on: #295	2025-09-22 22:35:39 +03:00
peri4	9bb63cdaf3	pip	2025-09-22 22:35:07 +03:00
peri4	736972b8e4	pip	2025-09-22 20:59:07 +03:00
peri4	7b03919deb	pip	2025-09-22 16:26:19 +03:00
peri4	00fe1dfa03	.clang-format	2025-09-21 21:08:41 +03:00
Пелипенко Иван	a67b636db5	Merge pull request 'pip' (#294 ) from master into release All checks were successful SHS Gitea/shstk/pipeline/head This commit looks good Details Reviewed-on: #294	2025-09-21 21:06:22 +03:00
peri4	1a3945f436	pip	2025-09-21 21:06:08 +03:00
Пелипенко Иван	f2be5b519d	Merge pull request 'pip, qad' (#293 ) from master into release All checks were successful SHS Gitea/shstk/pipeline/head This commit looks good Details Reviewed-on: #293	2025-09-21 20:10:07 +03:00
peri4	bea339e3f5	pip, qad	2025-09-19 17:40:08 +03:00
Пелипенко Иван	45cc5a70ff	Merge pull request 'pip' (#292 ) from master into release Some checks failed SHS Gitea/shstk/pipeline/head Something is wrong with the build of this commit Details Reviewed-on: #292	2025-09-18 20:20:20 +03:00
peri4	f2e2c77552	pip	2025-09-18 20:20:12 +03:00
Пелипенко Иван	94a5b8c37c	Merge pull request 'pip' (#291 ) from master into release All checks were successful SHS Gitea/shstk/pipeline/head This commit looks good Details Reviewed-on: #291	2025-09-15 22:30:35 +03:00
peri4	29736b3b2a	pip	2025-09-15 21:26:36 +03:00
peri4	4e9e03b5e2	Merge branch 'release' of https://git.shstk.ru/SHS/shstk into release All checks were successful SHS Gitea/shstk/pipeline/head This commit looks good Details	2025-09-10 16:14:47 +03:00
peri4	55da9b02e1	Merge branch 'master' into release	2025-09-10 16:12:17 +03:00
peri4	32d834882c	pip	2025-09-10 16:09:11 +03:00
andrey	dfe7f9f3fa	revert pip to 5.1 Some checks failed SHS Gitea/shstk/pipeline/head Something is wrong with the build of this commit Details	2025-09-09 17:18:55 +03:00
Пелипенко Иван	57b6890eba	Merge pull request 'pip' (#289 ) from master into release All checks were successful SHS Gitea/shstk/pipeline/head This commit looks good Details Reviewed-on: #289	2025-09-05 22:09:46 +03:00
peri4	a2c377f784	pip Some checks failed SHS Gitea/shstk/pipeline/head There was a failure building this commit Details	2025-09-05 22:09:40 +03:00
Пелипенко Иван	a9222d1dbb	Merge pull request 'pip' (#288 ) from master into release Some checks failed SHS Gitea/shstk/pipeline/head Something is wrong with the build of this commit Details Reviewed-on: #288	2025-09-05 22:07:33 +03:00
peri4	aee673d02e	pip	2025-09-05 22:07:25 +03:00
Пелипенко Иван	0647564dc4	Merge pull request 'master' (#287 ) from master into release All checks were successful SHS Gitea/shstk/pipeline/head This commit looks good Details Reviewed-on: #287	2025-08-30 17:13:02 +03:00
peri4	0653392576	pip	2025-08-30 17:12:51 +03:00
peri4	d373e3b539	pip	2025-08-15 18:54:30 +03:00
peri4	f42df80891	pip	2025-08-14 17:34:54 +03:00
peri4	82e1ec849f	pip	2025-08-14 10:25:26 +03:00
peri4	d2903884de	pip	2025-08-13 18:50:07 +03:00
Пелипенко Иван	ec175fdadf	Merge pull request 'pip' (#286 ) from master into release All checks were successful SHS Gitea/shstk/pipeline/head This commit looks good Details Reviewed-on: #286	2025-07-31 20:57:07 +03:00
peri4	2ef3c2cb61	pip	2025-07-31 20:56:55 +03:00
peri4	c04d8b138f	pip	2025-07-31 20:56:04 +03:00
Пелипенко Иван	b5b76089df	Merge pull request 'pip' (#285 ) from master into release All checks were successful SHS Gitea/shstk/pipeline/head This commit looks good Details Reviewed-on: #285	2025-07-30 20:58:15 +03:00
peri4	a94109fbdd	pip	2025-07-30 20:58:05 +03:00
Пелипенко Иван	91c047e923	Merge pull request 'cmake' (#284 ) from master into release All checks were successful SHS Gitea/shstk/pipeline/head This commit looks good Details Reviewed-on: #284	2025-07-17 16:17:12 +03:00
peri4	8f9f13f006	cmake	2025-07-17 16:17:02 +03:00
Пелипенко Иван	304ac79357	Merge pull request 'master' (#283 ) from master into release All checks were successful SHS Gitea/shstk/pipeline/head This commit looks good Details Reviewed-on: #283	2025-07-17 11:23:40 +03:00
peri4	8180a792a0	Merge branch 'master' of https://git.shstk.ru/SHS/shstk # Conflicts: # pip	2025-07-17 11:22:14 +03:00
peri4	79c780024d	cmake, pip, qad	2025-07-17 11:18:30 +03:00
Пелипенко Иван	df52365e8c	Merge pull request 'pip and qad' (#282 ) from master into release All checks were successful SHS Gitea/shstk/pipeline/head This commit looks good Details Reviewed-on: #282	2025-06-26 18:32:44 +03:00
Andrey Bychkov	eb1e7e6827	pip	2025-06-26 17:45:13 +03:00
Andrey Bychkov	55d315d8b3	qcodeedit fix incorrect completer position	2025-06-26 17:43:51 +03:00
peri4	2c656dec36	qad	2025-06-10 00:02:56 +03:00
peri4	24061a4a50	qad	2025-06-09 23:42:08 +03:00
peri4	9df894d3e4	pip, qad	2025-06-07 11:12:55 +03:00
peri4	51fe3a686c	pip	2025-05-18 18:53:41 +03:00
peri4	ec470da92a	pip	2025-05-14 19:46:53 +03:00
Пелипенко Иван	63d820d590	Merge pull request 'master' (#281 ) from master into release All checks were successful SHS Gitea/shstk/pipeline/head This commit looks good Details Reviewed-on: #281	2025-05-07 13:24:13 +03:00
peri4	5dd239c77c	pip	2025-04-30 15:07:34 +03:00
peri4	a0b39f5917	new cmake, pip	2025-04-29 21:51:36 +03:00
Пелипенко Иван	0105212d4a	Merge pull request 'master' (#280 ) from master into release All checks were successful SHS Gitea/shstk/pipeline/head This commit looks good Details Reviewed-on: #280	2025-04-09 10:57:47 +03:00
peri4	bee3c14f63	pip	2025-04-03 16:00:49 +03:00
peri4	35b31d6505	qad	2025-03-20 18:48:26 +03:00
peri4	7812b76afa	qad	2025-03-19 22:04:03 +03:00
peri4	18e88a5f4d	qad	2025-03-18 16:24:13 +03:00
peri4	55c5f7700c	qad	2025-03-18 15:17:24 +03:00
peri4	179f03d057	qad	2025-03-18 12:16:22 +03:00
peri4	20aeb0c32f	pip	2025-03-06 16:26:49 +03:00
peri4	2f64085db6	pip	2025-03-04 20:20:17 +03:00
peri4	90bb880dc8	qad	2025-03-04 19:59:44 +03:00
peri4	eaa9ad2646	pip	2025-02-27 21:26:40 +03:00
Пелипенко Иван	c943be5bdc	Merge pull request 'pip' (#279 ) from master into release All checks were successful SHS Gitea/shstk/pipeline/head This commit looks good Details Reviewed-on: #279	2025-02-13 17:22:07 +03:00
peri4	464e40b8fd	pip	2025-02-06 11:13:54 +03:00