6 Commits

Author SHA1 Message Date
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
24a59f204d Merge branch 'master' into 3-parse-rule
# Conflicts:
#	src/main/java/ru/ulstu/fc/rule/model/Variable.java
#	src/main/java/ru/ulstu/fc/rule/service/FuzzyInferenceService.java
#	src/main/resources/templates/default.html
2023-11-06 19:21:39 +04:00
72df590dae #8 -- Fix UI 2023-11-06 14:50:36 +04:00
df4fd6d0ff #3 -- Add models and pages 2023-09-26 21:58:00 +04:00
b88ed0211f #3 -- Add rule controller 2023-09-11 19:05:13 +04:00
ca91187271 init 2023-09-06 12:31:54 +04:00