19 Commits

Author SHA1 Message Date
Anton Romanov
a878f8c22c fix remove older events 2019-05-31 09:06:21 +04:00
Anton Romanov
d2ce6d604e fix merging collection 2019-05-31 08:46:21 +04:00
Nightblade73
58a8495835 Merge remote-tracking branch 'remotes/origin/dev' into 103-autotest-conf
# Conflicts:
#	src/main/java/ru/ulstu/timeline/service/EventService.java
2019-05-13 20:27:52 +04:00
ASH
a11e10dec4 #123 adding task timeline 2019-05-12 01:00:26 +04:00
Nightblade73
6edcf8f594 #103 add sort and filter test, fixed delete conference, if it has fk with event 2019-05-10 23:36:07 +04:00
T-Midnight
da382b659a #32 add deadlines on timeline page 2019-05-06 00:32:28 +04:00
Nightblade73
60bdd9d233 #70 fixes 2019-05-02 14:35:40 +04:00
Nightblade73
dbcdb96dbf #70 added event method, don't work, because trying to find null entity 2019-04-26 15:12:34 +04:00
Nightblade73
51877023d1 #70 added new column to event 2019-04-26 09:28:20 +04:00
Семенова Мария
2f0c461524 #18 add paper events 2019-03-28 12:40:10 +04:00
Anton Romanov
58299d749d fix for remove event 2018-11-19 08:21:22 +04:00
Anton Romanov
2d78753b06 show events 2018-11-17 11:56:52 +04:00
Anton Romanov
f0ac06c900 refactor and db changes 2018-11-11 01:29:06 +04:00
Alyona
e76e7ad864 fix 2018-11-09 15:43:42 +04:00
Alyona
25707db6cd added period event 2018-11-09 14:48:21 +04:00
Alyona
92d3067dd3 added event status 2018-10-30 23:59:42 +04:00
Anton Romanov
e27e56aa9b fix time 2018-06-10 01:53:32 +04:00
Anton Romanov
da1fbc3124 send notification 2018-06-10 01:49:38 +04:00
Anton Romanov
aa919906aa add event controller 2018-06-10 01:12:28 +04:00