125 Commits

Author SHA1 Message Date
9981c07015 fix ci
All checks were successful
CI fuzzy controller / container-test-job (push) Successful in 1m39s
2025-02-25 13:49:25 +04:00
06c96fe1d1 fix ci
All checks were successful
CI fuzzy controller / container-test-job (push) Successful in 3m46s
2025-02-25 13:45:03 +04:00
d94d23c713 fix ci
Some checks failed
CI fuzzy controller / container-test-job (push) Has been cancelled
2025-02-25 13:43:35 +04:00
8f3e5196da Merge pull request '3-parse-rule' (#10) from 3-parse-rule into master
All checks were successful
CI fuzzy controller / container-test-job (push) Successful in 2m31s
Reviewed-on: #10
2025-02-25 13:34:08 +04:00
1f3caff440 #3 -- Rename controller
All checks were successful
CI fuzzy controller / container-test-job (push) Successful in 1m5s
2025-02-25 12:43:12 +04:00
78fe8236be #3 -- Parse rule for list
All checks were successful
CI fuzzy controller / container-test-job (push) Successful in 1m10s
2025-02-25 12:21:16 +04:00
8d0b5cef99 #3 -- Add some controls
All checks were successful
CI fuzzy controller / container-test-job (push) Successful in 58s
2025-02-24 22:43:19 +04:00
1e58c907ca #3 -- Remove templates
All checks were successful
CI fuzzy controller / container-test-job (push) Successful in 58s
2025-02-24 21:59:14 +04:00
2d06ca9e24 #3 -- Fix models
All checks were successful
CI fuzzy controller / container-test-job (push) Successful in 59s
2025-02-24 21:49:56 +04:00
900cfdd036 Merge branch 'master' into 3-parse-rule
Some checks failed
CI fuzzy controller / container-test-job (push) Failing after 52s
# Conflicts:
#	src/main/java/ru/ulstu/fc/rule/controller/RuleController.java
#	src/main/java/ru/ulstu/fc/rule/model/Variable.java
#	src/main/java/ru/ulstu/fc/rule/repository/VariableRepository.java
#	src/main/java/ru/ulstu/fc/rule/service/FuzzyInferenceService.java
#	src/main/java/ru/ulstu/fc/rule/service/VariableService.java
#	src/main/resources/templates/default.html
#	src/main/resources/templates/listRules.html
2025-02-24 21:42:35 +04:00
2e0478e9d2 Merge branch 'master' into 3-parse-rule
# Conflicts:
#	src/main/java/ru/ulstu/fc/rule/controller/RuleController.java
#	src/main/java/ru/ulstu/fc/rule/model/Variable.java
#	src/main/java/ru/ulstu/fc/rule/repository/VariableRepository.java
#	src/main/java/ru/ulstu/fc/rule/service/FuzzyInferenceService.java
#	src/main/java/ru/ulstu/fc/rule/service/VariableService.java
#	src/main/resources/templates/default.html
#	src/main/resources/templates/listRules.html
2025-02-24 21:42:04 +04:00
936f4386b7 Merge branch 'master' into 3-parse-rule
# Conflicts:
#	src/main/java/ru/ulstu/fc/rule/controller/RuleController.java
#	src/main/java/ru/ulstu/fc/rule/model/Variable.java
#	src/main/java/ru/ulstu/fc/rule/repository/VariableRepository.java
#	src/main/java/ru/ulstu/fc/rule/service/FuzzyInferenceService.java
#	src/main/java/ru/ulstu/fc/rule/service/VariableService.java
#	src/main/resources/templates/default.html
#	src/main/resources/templates/listRules.html
2025-02-24 21:40:59 +04:00
d10b47e864 Merge pull request '5-save-rules' (#15) from 5-save-rules into master
All checks were successful
CI fuzzy controller / container-test-job (push) Successful in 1m2s
Reviewed-on: #15
2025-02-24 21:26:13 +04:00
6918f52422 #5 -- Fix relation
All checks were successful
CI fuzzy controller / container-test-job (push) Successful in 59s
2025-02-24 21:25:45 +04:00
9f3af7033e #5 -- Edit terms
All checks were successful
CI fuzzy controller / container-test-job (push) Successful in 1m28s
2025-02-24 15:00:11 +04:00
746da497de #5 -- Add rule only if variables are defined
All checks were successful
CI fuzzy controller / container-test-job (push) Successful in 1m1s
2025-02-21 11:45:38 +04:00
df451f01ce #5 -- Fix layout
All checks were successful
CI fuzzy controller / container-test-job (push) Successful in 1m45s
2025-02-21 11:40:49 +04:00
202d8cd0d3 #5 -- Fix validation
All checks were successful
CI fuzzy controller / container-test-job (push) Successful in 1m10s
2025-02-21 10:40:47 +04:00
c33680fd66 #5 -- Fix table identity strategy
Some checks failed
CI fuzzy controller / container-test-job (push) Failing after 11s
2025-02-21 10:40:03 +04:00
47059bc2de #5 -- Add rule edit link
All checks were successful
CI fuzzy controller / container-test-job (push) Successful in 1m4s
2025-02-20 18:53:39 +04:00
4449902185 #5 -- Validate edit
All checks were successful
CI fuzzy controller / container-test-job (push) Successful in 2m28s
2025-02-20 16:14:55 +04:00
972284fad3 #5 -- Fix save variables
All checks were successful
CI fuzzy controller / container-test-job (push) Successful in 1m11s
2025-02-20 13:52:14 +04:00
fb01034fc8 #5 -- Fix variables
All checks were successful
CI fuzzy controller / container-test-job (push) Successful in 57s
2025-02-19 17:44:51 +04:00
3723881909 #5 -- Add variables and terms to db
All checks were successful
CI fuzzy controller / container-test-job (push) Successful in 1m2s
2025-02-19 17:02:37 +04:00
11fc4e46d1 #5 -- Show and edit rules
All checks were successful
CI fuzzy controller / container-test-job (push) Successful in 1m47s
2025-02-19 14:33:29 +04:00
486981c0ff #5 -- Rule model as a string
All checks were successful
CI fuzzy controller / container-test-job (push) Successful in 1m3s
2025-02-18 17:54:30 +04:00
0d7f970629 Merge pull request '13-register' (#14) from 13-register into master
All checks were successful
CI fuzzy controller / container-test-job (push) Successful in 1m10s
Reviewed-on: #14
2025-02-18 14:17:08 +04:00
cabadba885 Merge branch 'master' of ssh://nio17.ulstu.ru:22023/romanov73/fuzzy-controller into 13-register
All checks were successful
CI fuzzy controller / container-test-job (push) Successful in 1m16s
2025-02-18 14:11:09 +04:00
c82a171e3b rm db
All checks were successful
CI fuzzy controller / container-test-job (push) Successful in 1m26s
2025-02-18 14:10:41 +04:00
ecf5e1fab9 #13 -- Add buttons
All checks were successful
CI fuzzy controller / container-test-job (push) Successful in 1m12s
2025-02-18 14:02:43 +04:00
63ec2cc289 #13 -- Add link to rule edit page
All checks were successful
CI fuzzy controller / container-test-job (push) Successful in 1m10s
2025-02-18 12:03:15 +04:00
48e65bd53d #13 -- Fix ci
All checks were successful
CI fuzzy controller / container-test-job (push) Successful in 10m2s
2025-02-18 11:30:06 +04:00
887de9979b #13 -- Fix ci
All checks were successful
CI fuzzy controller / container-test-job (push) Successful in 1m3s
2025-02-18 10:54:36 +04:00
f3adce05df #13 -- Fix deploy
All checks were successful
CI fuzzy controller / container-test-job (push) Successful in 1m6s
2025-02-18 10:40:10 +04:00
e2ddf48aa8 #13 -- Fix deploy
All checks were successful
CI fuzzy controller / container-test-job (push) Successful in 1m7s
2025-02-18 10:03:55 +04:00
5fc7e89c7c #13 --Fox deploy script
All checks were successful
CI fuzzy controller / container-test-job (push) Successful in 58s
2025-02-17 17:34:31 +04:00
a79c79ab77 #13 -- Fix deploy script
All checks were successful
CI fuzzy controller / container-test-job (push) Successful in 1m6s
2025-02-17 16:46:07 +04:00
86d8f85e3c #13 -- Fix jdk
All checks were successful
CI fuzzy controller / container-test-job (push) Successful in 1m4s
2025-02-17 16:43:45 +04:00
76a4738682 Merge branch 'master' of ssh://nio17.ulstu.ru:22023/romanov73/fuzzy-controller
All checks were successful
CI fuzzy controller / container-test-job (push) Successful in 1m3s
2025-02-17 16:40:05 +04:00
01b3408faf #13 -- Fix stages 2025-02-17 16:39:53 +04:00
64b70fabff Обновить README.md
Some checks failed
CI fuzzy controller / container-test-job (push) Failing after 47s
2025-02-17 15:22:59 +04:00
29990ca26e add Jenkinsfile
Some checks failed
CI fuzzy controller / container-test-job (push) Has been cancelled
2025-02-17 15:21:47 +04:00
73b5dd47df #13 -- Add jenkinsfile
All checks were successful
CI fuzzy controller / container-test-job (push) Successful in 1m33s
2025-02-17 15:12:33 +04:00
c2019def08 #13 -- Add rule edit form
All checks were successful
CI fuzzy controller / container-test-job (push) Successful in 1m31s
2025-02-17 15:00:45 +04:00
495b04e51d #13 -- Add rule crud
All checks were successful
CI fuzzy controller / container-test-job (push) Successful in 2m1s
2025-02-17 14:08:58 +04:00
be3f70f14c xfgdfgf
Some checks failed
CI fuzzy controller / container-test-job (push) Failing after 2m53s
2025-02-17 13:18:04 +04:00
9666419ed2 #13 -- Fix rule models
All checks were successful
CI fuzzy controller / container-test-job (push) Successful in 1m19s
2025-02-17 12:09:24 +04:00
ef9b78251c #13 -- Show rules of project
All checks were successful
CI fuzzy controller / container-test-job (push) Successful in 1m36s
2025-02-17 10:44:14 +04:00
2ca47e0d98 #13 -- Add proejct rules list
All checks were successful
CI fuzzy controller / container-test-job (push) Successful in 1m5s
2025-02-16 22:01:51 +04:00
dde1bfec7b #13 -- Fix ci
All checks were successful
CI fuzzy controller / container-test-job (push) Successful in 1m1s
2025-02-16 21:30:43 +04:00