Artem.Arefev
|
3d02f551cc
|
Merge branch 'lk_v2' into 87-inviting-user
|
2019-05-15 00:53:52 +04:00 |
|
Artem.Arefev
|
95fc9da47d
|
lk base, created from dev
|
2019-05-15 00:49:54 +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
|
1c5c05b5e4
|
#104 test take part
|
2019-05-14 18:01:50 +04:00 |
|
Nightblade73
|
e6cb991463
|
#104 test is member
|
2019-05-14 17:54:18 +04:00 |
|
Nightblade73
|
a8d987b01f
|
#104 test copy from dto method
|
2019-05-14 17:49:22 +04:00 |
|
Nightblade73
|
3a9fde3404
|
#104 setUp fields
|
2019-05-14 16:20:19 +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 |
|
Anton Romanov
|
10a9bd7a28
|
Merge branch '111-unique-name-control-conf' into 'dev'
Resolve "Контроль уникальности названия"
See merge request romanov73/ng-tracker!86
|
2019-05-13 19:20:44 +00: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 |
|
Nightblade73
|
ab59cb524e
|
#103 fix code style
|
2019-05-13 20:26:13 +04:00 |
|
Nightblade73
|
1f8722e3ff
|
#103 code refactoring
|
2019-05-13 20:13:53 +04:00 |
|
Nightblade73
|
6044d6f8e3
|
#111 save method refactor
|
2019-05-13 19:08:21 +04:00 |
|
Anton Romanov
|
a3afdeb988
|
Merge branch '123-student-task-timeline' into 'dev'
Resolve "Добавление таймлайна для дедлайнов задач"
Closes #123
See merge request romanov73/ng-tracker!91
|
2019-05-13 07:15:57 +00:00 |
|
Anton Romanov
|
aaa21d591d
|
Merge branch '121-reduce-paper-title' into 'dev'
Resolve "Сокращение названий статей в прикреплении"
Closes #121
See merge request romanov73/ng-tracker!89
|
2019-05-13 06:54:49 +00:00 |
|
T-Midnight
|
f6830d499b
|
#121 update view
|
2019-05-12 15:31:50 +04:00 |
|
T-Midnight
|
99ec7af319
|
#121 reduce paper title
|
2019-05-12 15:30:09 +04:00 |
|
T-Midnight
|
e1907d3169
|
#121 change Paper to PaperDto in attaching papers
|
2019-05-12 15:28:47 +04:00 |
|
Nightblade73
|
451e7e5d04
|
#103 fix code style
|
2019-05-12 13:50:46 +04:00 |
|
Nightblade73
|
5cbbb6c319
|
#103 fix code style
|
2019-05-12 13:49:49 +04:00 |
|
Nightblade73
|
70062992ae
|
#103 clear code
|
2019-05-12 13:45:17 +04:00 |
|
Nightblade73
|
fe53c86136
|
#103 fixed delete conf test
|
2019-05-12 13:42:50 +04:00 |
|
ASH
|
5b4180e685
|
#123 fixing layout
|
2019-05-12 11:04:43 +04:00 |
|
ASH
|
a11e10dec4
|
#123 adding task timeline
|
2019-05-12 01:00:26 +04:00 |
|
Nightblade73
|
d846192046
|
#111 fixes
|
2019-05-12 00:28:03 +04:00 |
|
ASH
|
7798508d4f
|
Merge branch 'dev' into 79-students-tags-generation
# Conflicts:
# src/main/resources/db/changelog-20190505_000000-schema.xml
# src/main/resources/db/changelog-master.xml
|
2019-05-11 23:26:21 +04:00 |
|
ASH
|
c59bb45c70
|
#79 fixing codestyle
|
2019-05-11 23:06:30 +04:00 |
|
ASH
|
0de34c89fe
|
#79 fixing planner and year generation
|
2019-05-11 22:58:57 +04:00 |
|
Nightblade73
|
b2e8a43cee
|
#103 delete conf test
|
2019-05-11 00:51:57 +04:00 |
|
Nightblade73
|
3f32a61ed2
|
Merge remote-tracking branch 'origin/103-autotest-conf' into 103-autotest-conf
# Conflicts:
# src/test/java/IndexConferenceTest.java
|
2019-05-10 23:38:54 +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
|
4686406954
|
#103 add undock article
|
2019-05-10 21:15:49 +04:00 |
|
Nightblade73
|
4e4e7ae194
|
#103 add paper transition
|
2019-05-10 20:54:43 +04:00 |
|
Nightblade73
|
cad8682088
|
#103 add adding article
|
2019-05-10 20:07:55 +04:00 |
|
Nightblade73
|
d9a4224317
|
#103 add attach article
|
2019-05-10 19:15:22 +04:00 |
|
Nightblade73
|
7b4318a3b5
|
#103 add delete deadline
|
2019-05-10 17:40:24 +04:00 |
|
Nightblade73
|
0cb7b05c25
|
#103 add check take part
|
2019-05-10 17:21:36 +04:00 |
|
Nightblade73
|
253f4b4aad
|
#103 add check new deadline
|
2019-05-10 17:03:47 +04:00 |
|
Nightblade73
|
1ad66d6fb1
|
#103 change name method test
|
2019-05-10 15:54:12 +04:00 |
|
Nightblade73
|
961fdf9397
|
#70 added conference class, added create method test
|
2019-05-10 15:07:47 +04:00 |
|
Anton Romanov
|
ff7f535980
|
Merge branch '119-notification-grants' into 'dev'
Resolve "Реализовать уведомления на почту"
Closes #119
See merge request romanov73/ng-tracker!84
|
2019-05-09 04:18:55 +00:00 |
|
T-Midnight
|
77e2ad0651
|
#119 add send notification functions
|
2019-05-09 01:24:55 +04:00 |
|
T-Midnight
|
74a8dcbd8a
|
#119 add leader changed notification
|
2019-05-09 01:23:17 +04:00 |
|
T-Midnight
|
4262446aef
|
#119 create all mail templates
|
2019-05-09 01:21:56 +04:00 |
|
T-Midnight
|
b640dea99a
|
#119 create scheduler
|
2019-05-09 00:45:54 +04:00 |
|
T-Midnight
|
2d9fd05060
|
#119 create grantCreateNotification mail template
|
2019-05-08 23:32:37 +04:00 |
|
Nightblade73
|
b57142e28f
|
#70 added unique name control
|
2019-05-08 17:08:37 +04:00 |
|
T-Midnight
|
e3ad5ba510
|
Merge remote-tracking branch 'remotes/origin/dev' into 119-notification-grants
|
2019-05-08 16:22:39 +04:00 |
|