#91 -- Add markup page menu item #94

Merged
romanov73 merged 29 commits from 91-markup into master 2023-04-23 23:43:14 +04:00

29 Commits

Author SHA1 Message Date
d2f898d758 #91 -- fix markup 2023-04-23 23:41:44 +04:00
07cd5abe9c #91 -- Fix format 2023-04-23 15:09:00 +04:00
e506566a5d #91 -- Fix data for markup 2023-04-23 15:08:26 +04:00
9c3a64b0d0 #91 -- Fix smoothing 2023-04-22 12:58:12 +04:00
1c62c520e9 #91 -- Fix db 2023-04-22 12:26:54 +04:00
8d31dc36b3 #91 -- Fix time series types 2023-04-21 23:11:09 +04:00
3bb4f5c49c #91 -- Run scheduled time series creators 2023-04-21 22:49:33 +04:00
1dc44f7988 #91 -- Fix fuzzy inference 2023-04-21 15:47:27 +04:00
6823f34997 #91 -- Fix fuzzy sets 2023-04-21 15:00:14 +04:00
d03cb194ee #91 -- Fix fuzzy inference 2023-04-21 13:23:48 +04:00
4596a25a59 #91 -- Fix fuzzy inference 2023-04-11 16:36:05 +04:00
5c6b388901 #91 -- Reformat 2023-03-16 23:09:26 +04:00
d111121e24 #91 -- Use new models 2023-03-16 23:09:04 +04:00
ddedfc9751 #91 -- Fix form 2023-03-15 14:36:47 +04:00
394873f63b #91 -- Remove copyright 2023-03-15 14:21:37 +04:00
2d374e1e20 Merge branch 'master' into 91-markup
# Conflicts:
#	src/main/java/ru/ulstu/extractor/ts/service/TimeSeriesService.java
2023-03-15 14:21:06 +04:00
80904e6221 #91 -- Restore 2023-03-14 23:20:57 +04:00
71652c7b79 #91 -- Add some rule generator 2023-03-11 00:55:43 +04:00
d7790dff70 #91 -- Save markup 2023-03-07 16:59:17 +04:00
211a8b004c #91 -- Add get markups form 2023-03-03 11:10:35 +04:00
0239b0afd4 #91 -- Add save operation 2023-03-03 10:44:26 +04:00
0883c5193b #91 -- Add dtos 2023-03-02 22:03:29 +04:00
ed68fa47f7 #91 -- Add markup table 2023-03-02 21:02:10 +04:00
704366f11a #91 -- Group list of ts tendencies 2023-02-27 23:35:31 +04:00
f4600c2ba5 #91 -- Group ts tendencies 2023-02-27 14:47:51 +04:00
41b23570c0 #91 -- Fix buttons 2023-02-25 12:26:48 +04:00
a701f943eb #91 -- Fix mvc config 2023-02-25 11:30:08 +04:00
f08e5447fd #91 -- Fix menu 2023-02-22 23:01:56 +04:00
4bd2f46046 #91 -- Add markup page menu item 2023-02-22 22:31:53 +04:00