Commit Graph

646 Commits

Author SHA1 Message Date
dec256e115 Merge pull request 'master' (#161) from master into release
Some checks failed
SHS Gitea/shstk/pipeline/head There was a failure building this commit
Reviewed-on: https://git.shs.tools/SHS/shstk/pulls/161
2023-01-09 15:43:56 +03:00
f6d4f9bbac pip, qad 2023-01-09 15:43:30 +03:00
1c1284caa0 .editorconfig, format, pivaluetree, pivaluetreeedit 2022-12-16 16:45:44 +03:00
9b0d5a0a75 add .clang-format file 2022-12-12 12:42:36 +03:00
e7755da10c pip,qad 2022-12-07 10:56:10 +03:00
cb0b515c31 Merge pull request 'master' (#160) from master into release
All checks were successful
SHS Gitea/shstk/pipeline/head This commit looks good
Reviewed-on: https://git.shs.tools/SHS/shstk/pulls/160
2022-11-24 15:32:49 +03:00
038ce7476b qad 2022-11-24 15:29:41 +03:00
56fc061699 pip 2022-11-15 09:50:06 +03:00
c9fa22c838 Merge pull request 'pip' (#159) from master into release
All checks were successful
SHS Gitea/shstk/pipeline/head This commit looks good
Reviewed-on: https://git.shs.tools/SHS/shstk/pulls/159
2022-11-12 13:38:26 +03:00
751c9370d7 pip 2022-11-12 13:38:12 +03:00
659a14aba8 Merge pull request 'pip, wad' (#158) from master into release
Some checks failed
SHS Gitea/shstk/pipeline/head There was a failure building this commit
Reviewed-on: https://git.shs.tools/SHS/shstk/pulls/158
2022-11-12 13:34:04 +03:00
4158c263e0 pip, wad 2022-11-12 13:31:50 +03:00
0bcd60b9db Merge pull request 'pip' (#157) from master into release
All checks were successful
SHS Gitea/shstk/pipeline/head This commit looks good
Reviewed-on: https://git.shs.tools/SHS/shstk/pulls/157
2022-11-11 16:29:27 +03:00
87f7113057 pip 2022-11-11 16:29:10 +03:00
866188b663 Merge pull request 'pip' (#156) from master into release
All checks were successful
SHS Gitea/shstk/pipeline/head This commit looks good
Reviewed-on: https://git.shs.tools/SHS/shstk/pulls/156
2022-11-10 19:37:20 +03:00
8871b29819 pip 2022-11-10 19:37:09 +03:00
c761fc3b28 Merge pull request 'pip, cd' (#155) from master into release
All checks were successful
SHS Gitea/shstk/pipeline/head This commit looks good
Reviewed-on: https://git.shs.tools/SHS/shstk/pulls/155
2022-11-10 17:05:22 +03:00
4156c945c0 pip, cd 2022-11-10 16:17:08 +03:00
df6464d258 Merge pull request 'qad' (#154) from master into release
All checks were successful
SHS Gitea/shstk/pipeline/head This commit looks good
Reviewed-on: https://git.shs.tools/SHS/shstk/pulls/154
2022-10-28 19:46:18 +03:00
b114935959 qad 2022-10-28 19:43:59 +03:00
c9a8c823a4 Merge pull request 'pip, qad' (#153) from master into release
All checks were successful
SHS Gitea/shstk/pipeline/head This commit looks good
Reviewed-on: https://git.shs.tools/SHS/shstk/pulls/153
2022-10-28 13:44:17 +03:00
9b5ac6acaa pip, qad 2022-10-28 13:42:42 +03:00
5bda48df56 Merge pull request 'master' (#152) from master into release
All checks were successful
SHS Gitea/shstk/pipeline/head This commit looks good
Reviewed-on: https://git.shs.tools/SHS/shstk/pulls/152
2022-10-26 21:17:57 +03:00
d22d4a56f6 Merge branch 'master' of https://git.shs.tools/SHS/shstk 2022-10-26 21:17:34 +03:00
f0f804a69b qglengine getImage 2022-10-26 21:17:30 +03:00
6b7bc54449 Merge pull request 'qglengine' (#151) from master into release
All checks were successful
SHS Gitea/shstk/pipeline/head This commit looks good
Reviewed-on: https://git.shs.tools/SHS/shstk/pulls/151
2022-10-13 23:08:34 +03:00
1db79b7e60 qglengine 2022-10-13 23:08:23 +03:00
05edd4714c Merge pull request 'pip' (#150) from master into release
All checks were successful
SHS Gitea/shstk/pipeline/head This commit looks good
Reviewed-on: https://git.shs.tools/SHS/shstk/pulls/150
2022-09-18 12:38:56 +03:00
0809ce5af6 pip 2022-09-18 12:36:19 +03:00
ce9bf3f209 pip 2022-09-18 12:33:56 +03:00
efeab7fc37 Merge pull request 'master' (#149) from master into release
All checks were successful
SHS Gitea/shstk/pipeline/head This commit looks good
Reviewed-on: https://git.shs.tools/SHS/shstk/pulls/149
2022-08-11 11:44:34 +03:00
Бычков Андрей
4d72bec451 Merge branch 'release' of https://git.shs.tools/SHS/shstk 2022-08-11 11:43:48 +03:00
Бычков Андрей
a74f845cee pip 2022-08-11 11:41:59 +03:00
af9493cf67 ready to release 2022-08-10 23:44:40 +03:00
da1c314ad8 pip v3 2022-08-10 22:58:21 +03:00
d8b843c8e8 PIP 2.99, new SHSTKMacros 2022-08-07 22:08:21 +03:00
4195aa9f52 update qad
All checks were successful
SHS Gitea/shstk/pipeline/head This commit looks good
2022-08-04 11:37:46 +03:00
Бычков Андрей
e57a2a6364 qad_types доработки, cmake bat
All checks were successful
SHS Gitea/shstk/pipeline/head This commit looks good
2022-06-30 17:56:55 +03:00
925e496561 pip
All checks were successful
SHS Gitea/shstk/pipeline/head This commit looks good
2022-06-24 16:44:53 +03:00
Бычков Андрей
9377c30c58 pip_cmg правки + gif record в graohic
All checks were successful
SHS Gitea/shstk/pipeline/head This commit looks good
2022-06-24 14:49:42 +03:00
Бычков Андрей
41dbad5921 fix Jenkinsfile 4
All checks were successful
SHS Gitea/shstk/pipeline/head This commit looks good
2022-06-09 17:23:49 +03:00
Бычков Андрей
e0f4935345 fix Jenkinsfile 3
Some checks failed
SHS Gitea/shstk/pipeline/head There was a failure building this commit
2022-06-09 17:13:45 +03:00
Бычков Андрей
bde2c85591 fix Jenkinsfile 2
Some checks failed
SHS Gitea/shstk/pipeline/head There was a failure building this commit
2022-06-09 17:12:51 +03:00
Бычков Анлрей
9fddb4445a fix Jenkinsfile
Some checks failed
SHS Gitea/shstk/pipeline/head There was a failure building this commit
2022-06-09 17:10:09 +03:00
Бычков Анлрей
9725423074 update cmake
Some checks failed
SHS Gitea/shstk/pipeline/head Something is wrong with the build of this commit
2022-06-09 17:00:04 +03:00
Бычков Анлрей
08446a58ba Merge branch 'release' of https://git.shs.tools/SHS/shstk into release
Some checks failed
SHS Gitea/shstk/pipeline/head There was a failure building this commit
2022-06-09 15:39:07 +03:00
Бычков Анлрей
6a26324d62 release branch for Dockerfile 2022-06-09 15:39:00 +03:00
Бычков Анлрей
56bd00ed11 Merge branch 'master' of https://git.shs.tools/SHS/shstk 2022-06-09 13:50:42 +03:00
Бычков Анлрей
2faecd4183 update submodules 2022-06-09 13:50:36 +03:00
Бычков Анлрей
e0f3df2217 Merge branch 'release' of https://git.shs.tools/SHS/shstk 2022-06-09 13:46:48 +03:00