Commit Graph

82 Commits

Author SHA1 Message Date
Artem.Arefev
abea3c7dad #112 ping model changed 2019-06-02 21:53:51 +04:00
Artem.Arefev
3898dcf1c1 #112 changed mapping 2019-06-01 12:57:20 +04:00
Artem.Arefev
a405267092 merged with dev 2019-05-31 22:42:19 +04:00
Artem.Arefev
e680aa30c4 #112 ping activity 2019-05-31 00:33:21 +04:00
Artem.Arefev
505a054cc8 Merge remote-tracking branch 'origin/dev' into 91-users-info 2019-05-24 01:53:54 +04:00
Nightblade73
8b52518c4a #125 check method 2019-05-21 15:53:42 +04:00
Artem.Arefev
d7c4e6b222 #91 base users dashboard 2019-05-21 02:09:07 +04:00
Nightblade73
80de18d3ee #104 create fixed, remove update 2019-05-16 16:31:10 +04:00
Nightblade73
bde9cb51fb #104 some methods fixed 2019-05-16 15:55:29 +04:00
Nightblade73
1e06edfcc0 Merge remote-tracking branch 'remotes/origin/dev' into 104-module-test-conf
# Conflicts:
#	src/main/java/ru/ulstu/conference/service/ConferenceService.java
2019-05-15 01:28:08 +04:00
Nightblade73
7952787229 #104 add new tests, fixes 2019-05-15 01:14:02 +04:00
Nightblade73
00c5d5f755 #104 test refactoring 2019-05-15 00:54:30 +04:00
Nightblade73
11cab955b4 #104 test create 2019-05-14 18:51:03 +04:00
Nightblade73
c88c77cd7d #104 test find one dto 2019-05-14 18:20:01 +04:00
Nightblade73
a8d987b01f #104 test copy from dto method 2019-05-14 17:49:22 +04:00
Nightblade73
9da5fd8a7a #104 shock, the first unit test works 2019-05-14 00:02:30 +04:00
Anton Romanov
51851baa48 Merge branch '103-autotest-conf' into 'dev'
Resolve "Реализовать интеграционные автотесты для проверки модулей"

See merge request romanov73/ng-tracker!90
2019-05-13 19:46:29 +00:00
Nightblade73
6044d6f8e3 #111 save method refactor 2019-05-13 19:08:21 +04:00
Nightblade73
d846192046 #111 fixes 2019-05-12 00:28:03 +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
Nightblade73
b57142e28f #70 added unique name control 2019-05-08 17:08:37 +04:00
Nightblade73
60bdd9d233 #70 fixes 2019-05-02 14:35:40 +04:00
Nightblade73
9edcf35338 #70 added ping notification 2019-04-30 10:43:36 +04:00
Nightblade73
e178cd1639 #70 added checking empty fields of deadline, fix bug on EventDto 2019-04-27 09:45:47 +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
Nightblade73
34925b81ff #70 added schedule for deadline of conference 2019-04-25 21:17:48 +04:00
Nightblade73
16e9bf1fb5 #70 added update notification for all participants 2019-04-25 19:15:19 +04:00
Nightblade73
c489ebbf91 #70 added create notification for all users about new conference 2019-04-25 17:12:39 +04:00
Nightblade73
bc73265109 Merge remote-tracking branch 'remotes/origin/dev' into 68-ping-conf
# Conflicts:
#	src/main/java/ru/ulstu/conference/repository/ConferenceRepository.java
#	src/main/java/ru/ulstu/conference/service/ConferenceService.java
#	src/main/resources/db/changelog-master.xml
2019-04-24 22:41:48 +04:00
Nightblade73
70d260c34b #68 ping but style 2019-04-24 21:52:13 +04:00
Nightblade73
d4b514a9b0 #68 added ping in db 2019-04-24 21:24:32 +04:00
Nightblade73
d921def09d #68 added ping method 2019-04-24 21:05:25 +04:00
Nightblade73
f556b969b4 #68 added demo version of charts, using highcharts lib 2019-04-24 18:55:52 +04:00
Nightblade73
d37c9bda57 #64 excluded adding articles with the same name 2019-04-24 10:17:32 +04:00
Nightblade73
7eb5dce94e #64 style fixes 2019-04-24 09:42:00 +04:00
Anton Romanov
8f2f6adc3b #64 show global message 2019-04-23 23:15:22 +04:00
Nightblade73
6d6ea3136d #64 dont show error message 2019-04-23 13:37:56 +04:00
Nightblade73
53cc777734 #64 delete conference refactor 2019-04-22 21:46:42 +04:00
Nightblade73
2767403128 #64 added saving in db 2019-04-22 15:11:52 +04:00
Nightblade73
5bfeaff054 #64 added method addPaper 2019-04-22 11:13:04 +04:00
Nightblade73
ddd21dab1c #60 added dashboard 2019-04-21 17:18:44 +04:00
Nightblade73
a4ae42f072 #60 added sorting 2019-04-21 15:03:31 +04:00
Nightblade73
a9f4a326c5 #59 fixed styles 2019-04-19 18:38:56 +04:00
Nightblade73
338d7c2e09 #59 added begin-end dates in conferenceRow 2019-04-19 18:32:24 +04:00
Nightblade73
34033fac5f #59 added filtration 2019-04-19 17:36:46 +04:00
Nightblade73
e2b49689d5 #59 changed filterDto 2019-04-19 17:31:30 +04:00
Nightblade73
b623402aa8 #69 changed method getConference in controller 2019-04-19 14:39:07 +04:00
Nightblade73
9edcebb2f5 #69 changed isCurrentUserParticipant 2019-04-19 14:29:08 +04:00
Nightblade73
96431701df #69 added button disabling take part, if cur user already taken part 2019-04-18 15:38:45 +04:00