romanov73/fuzzy-controller
1
0
Fork 0
Code Issues 2 Pull Requests 1 Actions Packages Projects Releases Wiki Activity

3-parse-rule #10

Merged
romanov73 merged 17 commits from 3-parse-rule into master 2025-02-25 13:34:08 +04:00
Conversation 1 Commits 17 Files Changed 37 +332 -294
romanov73 commented 2023-09-11 19:54:31 +04:00
Owner
Copy Link
No description provided.
romanov73 added 5 commits 2023-09-11 19:54:31 +04:00
romanov73 added 4 commits 2023-11-06 20:00:09 +04:00 
# 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
romanov73 added 1 commit 2025-02-24 21:41:05 +04:00 
# 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
romanov73 added 1 commit 2025-02-24 21:42:22 +04:00 
# 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
romanov73 added 1 commit 2025-02-24 21:42:41 +04:00
Merge branch 'master' into 3-parse-rule
Some checks failed
CI fuzzy controller / container-test-job (push) Failing after 52s
Details
900cfdd036 
# 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
romanov73 added 1 commit 2025-02-24 21:50:00 +04:00
#3 -- Fix models
All checks were successful
CI fuzzy controller / container-test-job (push) Successful in 59s
Details
2d06ca9e24
romanov73 added 1 commit 2025-02-24 21:59:18 +04:00
#3 -- Remove templates
All checks were successful
CI fuzzy controller / container-test-job (push) Successful in 58s
Details
1e58c907ca
romanov73 added 1 commit 2025-02-24 22:43:24 +04:00
#3 -- Add some controls
All checks were successful
CI fuzzy controller / container-test-job (push) Successful in 58s
Details
8d0b5cef99
romanov73 added 1 commit 2025-02-25 12:21:20 +04:00
#3 -- Parse rule for list
All checks were successful
CI fuzzy controller / container-test-job (push) Successful in 1m10s
Details
78fe8236be
romanov73 added 1 commit 2025-02-25 12:43:15 +04:00
#3 -- Rename controller
All checks were successful
CI fuzzy controller / container-test-job (push) Successful in 1m5s
Details
1f3caff440
romanov73 commented 2025-02-25 13:33:44 +04:00
Author
Owner
Copy Link

closes #3

closes #3
romanov73 merged commit 8f3e5196da into master 2025-02-25 13:34:08 +04:00
romanov73 deleted branch 3-parse-rule 2025-02-25 13:34:09 +04:00
Sign in to join this conversation.
Reviewers
No Reviewers
Labels
No items
No Label
Milestone
No items
No Milestone
Projects
Clear projects
No project
Assignees
Clear assignees
No Assignees
1 Participants
Notifications
Due Date
No due date set.
Dependencies

No dependencies set.

Reference: romanov73/fuzzy-controller#10
No description provided.
Delete Branch "3-parse-rule"

Deleting a branch is permanent. Although the deleted branch may continue to exist for a short time before it actually gets removed, it CANNOT be undone in most cases. Continue?