Commit Graph

256 Commits

Author SHA1 Message Date
5ef8599576 #74 -- remove old dependencies 2022-10-25 16:31:31 +04:00
81bcc89096 #74 -- recommendations without time series data 2022-10-25 16:26:54 +04:00
591f183e8b #74 -- fix merge 2022-10-25 15:41:20 +04:00
12c28b9ba0 Merge branch 'master' into 74-add-jFuzzyLogic
# Conflicts:
#	src/main/java/ru/ulstu/extractor/core/Route.java
#	src/main/java/ru/ulstu/extractor/rule/service/RuleService.java
#	src/main/resources/templates/listRules.html
2022-10-25 15:40:27 +04:00
1a0d57a78e #74 -- fix rules 2022-10-25 15:37:54 +04:00
5b080f41c2 #74 -- add new library, create middle service 2022-10-25 14:48:05 +04:00
f043e45b49 Merge remote-tracking branch 'origin/74-add-jFuzzyLogic' into 74-add-jFuzzyLogic
# Conflicts:
#	src/main/java/ru/ulstu/extractor/GitExtractorApplication.java
#	src/main/java/ru/ulstu/extractor/rule/service/FuzzyInferenceService.java
2022-10-25 14:46:24 +04:00
f2f53b1980 #74 -- add new library, create middle service 2022-10-25 14:44:27 +04:00
5e9afaaddd Merge pull request '76-edit-and-delete-rule' (#77) from 76-edit-and-delete-rule into master
Reviewed-on: #77
2022-10-24 17:05:15 +04:00
BarminaA
f7338f34c9 #76-fix removing rule 2022-10-24 17:03:43 +04:00
BarminaA
bf87d34f20 #76-add edit rule function 2022-10-24 16:55:43 +04:00
281d24bde2 #76 -- fix edit 2022-10-21 23:20:48 +04:00
301a32d610 #74 -- partially add middle logic 2022-10-21 23:02:27 +04:00
BarminaA
616bb3385e #76-add rule delete function 2022-10-21 13:07:34 +04:00
374415e154 #74 -- complete fis 2022-10-18 15:02:33 +04:00
00119b896c #74 -- add some fuzzy rules 2022-10-18 00:19:07 +04:00
f59dc9b523 Merge pull request 'ts types' (#73) from 72-ts-types into master
Reviewed-on: #73
2022-10-16 01:16:42 +04:00
49598824db #72 -- fix data model 2022-10-16 01:15:26 +04:00
bfec08c1f4 #72 -- add time series type 2022-10-15 23:37:22 +04:00
957c1bbc8c #72 -- classes refactor 2022-10-15 22:36:08 +04:00
9c6a7a170f Merge pull request '70-run-rules' (#71) from 70-run-rules into master
Reviewed-on: #71
2022-10-15 22:11:51 +04:00
BarminaA
76f1a60754 #70-add button 2022-10-15 20:43:33 +04:00
079babdf9c Merge pull request '68-add-rule' (#69) from 68-add-rule into master
Reviewed-on: #69
2022-10-15 20:04:12 +04:00
BarminaA
7dbe89169e #68-save rule in db 2022-10-15 14:26:53 +04:00
ff7c9ce665 Merge pull request '66-derivation-of-rules' (#67) from 66-derivation-of-rules into master
Reviewed-on: #67
2022-10-14 11:29:15 +04:00
BarminaA
2e18e34647 #66-view list rules 2022-10-14 11:27:27 +04:00
ac239d796c Merge pull request '64-model-rule' (#65) from #64-model-rule into master
Reviewed-on: #65
2022-10-13 15:34:05 +04:00
BarminaA
1621e151d9 #64-add model and changelog 2022-10-13 15:18:34 +04:00
BarminaA
c85c7e7917 #64-add model for rule 2022-10-09 08:01:10 +04:00
fd001da317 #59 -- sort time series values 2022-10-08 12:24:36 +04:00
cfe1197a3f Merge pull request '61-rules-pages' (#63) from 61-rules-pages into master
Reviewed-on: #63
2022-10-07 13:44:30 +04:00
BarminaA
ea6e77b9f9 #61-add pages for rules 2022-10-07 13:40:41 +04:00
b711d70eac fix time series name 2022-10-07 12:43:13 +04:00
57bfdc331c fix gradlew version 2022-10-06 19:22:12 +04:00
69b4f53894 fix gradlew version 2022-10-06 19:19:43 +04:00
4c9ace2dd6 Merge pull request 'Временные ряды' (#59) from influx into master
Reviewed-on: #59
2022-10-06 16:09:37 +04:00
bca338e2ee #59 -- send time series to remove service 2022-10-06 16:04:47 +04:00
0dc4dc46d7 #59 -- fix multiple time series generation 2022-10-06 14:40:06 +04:00
312d613d7c #58 -- validate git project directory 2022-06-21 11:14:13 +04:00
a7add46348 #58 -- fix models naming, refactor 2022-06-21 10:39:53 +04:00
156cdbc672 #58 -- save time series on indexing 2022-06-21 00:51:52 +04:00
4f8d25e56e #58 -- add tests, add time series mapper 2022-06-20 23:45:40 +04:00
08751b9452 #58 -- add scheduler 2022-06-17 16:33:53 +04:00
BarminaA
5426253b39 #58-add new TS classes 2022-06-14 16:19:41 +04:00
BarminaA
9a38056a94 #58-add AbstractTSExtractor 2022-06-08 15:44:53 +04:00
BarminaA
f41ae7e536 #58 - Add TS storage 2022-04-26 13:02:26 +04:00
Anton Romanov
571e51fc64 Merge branch '29-statistic-filter' into 'master'
Resolve "фильтр в статистике"

Closes #29

See merge request romanov73/git-extractor!28
2021-05-12 09:56:22 +00:00
Anton Romanov
5d0e884006 #29 -- add statistic filer 2021-05-12 13:53:16 +04:00
Anton Romanov
7eea26b20b Merge branch '28-bug' into 'master'
Resolve "BUG:не отображается динамика коммитов"

Closes #28

See merge request romanov73/git-extractor!27
2021-05-12 07:08:11 +00:00
Anton Romanov
1cd0f3fe31 #28-Change database request 2021-05-12 11:07:14 +04:00