Васин Антон
|
c25392337a
|
#98 project deadlines edited
|
2019-05-28 16:16:41 +03:00 |
|
a.vasin
|
3b0a2dd964
|
#98 executors list added
|
2019-05-28 11:12:27 +04:00 |
|
Васин Антон
|
4bb4fd6bca
|
#98 changelog edited
|
2019-05-27 09:35:58 +03:00 |
|
Васин Антон
|
4eeb79ab80
|
#98 changelog edited
|
2019-05-27 09:19:52 +03:00 |
|
Anton Romanov
|
837a9f465c
|
#120 merge dev
|
2019-05-25 12:39:44 +04:00 |
|
Семенова Мария
|
7c1b124c94
|
#127 references tab, crud
|
2019-05-23 15:48:46 +04:00 |
|
Семенова Мария
|
29cfadef02
|
#127 reference model, schema
|
2019-05-23 15:02:55 +04:00 |
|
T-Midnight
|
c0e66e81a2
|
#120 drop unnecessary table column
|
2019-05-20 20:47:10 +04:00 |
|
Васин Антон
|
097f7827b0
|
#98 db edited
|
2019-05-17 10:30:34 +03:00 |
|
ASH
|
cd1caa559e
|
Merge branch 'dev' into 79-students-tags-generation
# Conflicts:
# src/main/java/ru/ulstu/students/service/TaskService.java
|
2019-05-16 00:14:05 +04:00 |
|
ASH
|
a11e10dec4
|
#123 adding task timeline
|
2019-05-12 01:00:26 +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 |
|
T-Midnight
|
e3ad5ba510
|
Merge remote-tracking branch 'remotes/origin/dev' into 119-notification-grants
|
2019-05-08 16:22:39 +04:00 |
|
T-Midnight
|
7ffe04f1db
|
#122 move to right directory
|
2019-05-07 22:47:27 +04:00 |
|
T-Midnight
|
d244437858
|
#122 fix bug
|
2019-05-07 22:35:44 +04:00 |
|
T-Midnight
|
934d194df1
|
#119 gelete unnecessary column
|
2019-05-07 22:15:49 +04:00 |
|
Васин Антон
|
4025aa67ca
|
#98 project completion added
|
2019-05-06 21:51:58 +03:00 |
|
ASH
|
65dea9bce2
|
#79 adding task planer generation
|
2019-05-06 22:39:08 +04:00 |
|
Васин Антон
|
ee55e08fee
|
#98 project tasks deadline edited
|
2019-05-06 17:43:20 +03:00 |
|
T-Midnight
|
114f6769ac
|
#32 create changelog
|
2019-05-05 23:54:02 +04:00 |
|
Anton Romanov
|
68737b976f
|
Merge branch '117-filter-users' into 'dev'
Resolve "Фильтрация участников гранта по двум новым параметрам"
Closes #117
See merge request romanov73/ng-tracker!77
|
2019-05-03 05:58:19 +00:00 |
|
Nightblade73
|
6820c617f3
|
#70 remove conflicts
|
2019-05-02 14:42:08 +04:00 |
|
T-Midnight
|
c8cfde67a9
|
Merge remote-tracking branch 'remotes/origin/dev' into 38-attach-file-grants
|
2019-05-01 00:21:56 +04:00 |
|
T-Midnight
|
1f6d15b74b
|
#38 create changelogs
|
2019-04-30 23:55:31 +04:00 |
|
Васин Антон
|
5c677a975c
|
#114 changelog edited
|
2019-04-30 01:01:30 +03:00 |
|
Nightblade73
|
51877023d1
|
#70 added new column to event
|
2019-04-26 09:28:20 +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
|
b16b3ed2e3
|
#68 added class structure
|
2019-04-24 17:41:19 +04:00 |
|
Nightblade73
|
5bff419dbd
|
#68 added ping table
|
2019-04-24 16:44:17 +04:00 |
|
T-Midnight
|
6df1a87367
|
#107 merge with dev
|
2019-04-23 15:01:47 +04:00 |
|
Васин Антон
|
53cc947a17
|
#97 copy from DTO edited
|
2019-04-22 15:48:29 +03:00 |
|
Семенова Мария
|
a3d1834ab8
|
#110 add paper type
|
2019-04-21 12:17:31 +04:00 |
|
T-Midnight
|
f29d31b840
|
#41 create changelog
|
2019-04-19 17:45:22 +04:00 |
|
Nightblade73
|
713e50043e
|
Merge remote-tracking branch 'remotes/origin/dev' into 69-take-part-conf
# Conflicts:
# src/main/resources/db/changelog-master.xml
|
2019-04-19 14:24:32 +04:00 |
|
Anton Romanov
|
5a55e3cfc8
|
Merge branch '42--2' into 'dev'
Resolve "Форма добавления и фильтра участников гранта"
Closes #42
See merge request romanov73/ng-tracker!44
|
2019-04-18 18:40:37 +00:00 |
|
T-Midnight
|
416ad7eeda
|
#42 merge with dev
|
2019-04-18 22:34:20 +04:00 |
|
Семенова Мария
|
a2dca6b7c6
|
Merge branch 'dev' into paper-latex-editing
# Conflicts:
# src/main/java/ru/ulstu/paper/model/Paper.java
# src/main/java/ru/ulstu/paper/model/PaperDto.java
# src/main/java/ru/ulstu/paper/service/PaperService.java
# src/main/resources/db/changelog-master.xml
# src/main/resources/templates/papers/paper.html
|
2019-04-18 18:20:51 +04:00 |
|
Васин Антон
|
ced3b0a978
|
#96 database edited
|
2019-04-18 12:10:27 +03:00 |
|
T-Midnight
|
97d7d00098
|
#42 merge with dev
|
2019-04-17 13:30:14 +04:00 |
|
Nightblade73
|
8564f2cf34
|
#69 managed to create a connection through a new entity
|
2019-04-17 13:00:48 +04:00 |
|
Anton Romanov
|
cafb3abcee
|
#4--2 merge with dev
|
2019-04-11 22:37:32 +04:00 |
|
T-Midnight
|
f7d766f02d
|
#42 rename birth_date column
|
2019-04-11 21:37:24 +04:00 |
|
ASH
|
f019806a8e
|
#74 fixing adding and db everything added except tags
|
2019-04-10 23:57:55 +04:00 |
|
T-Midnight
|
e8461e26eb
|
#42 fix birthDate and degree to User
|
2019-04-10 10:09:41 +04:00 |
|
T-Midnight
|
7465803162
|
#42 add columns 'birth_date'&'degree' to User
|
2019-04-05 22:06:16 +04:00 |
|
T-Midnight
|
566b7821d1
|
#42 merge dev into 42
|
2019-04-04 09:43:26 +04:00 |
|
T-Midnight
|
8a7117d713
|
#42 Add leader and authors
|
2019-04-04 09:38:18 +04:00 |
|
Anton Romanov
|
4104aa04cd
|
fixes for wrong build. entities always extends BaseEntity, tables must contains version column
|
2019-04-03 10:39:55 +04:00 |
|
Anton Romanov
|
5ffb2d547e
|
Merge branch 'dev' into 81-students-create-database
# Conflicts:
# src/main/resources/db/changelog-master.xml
|
2019-04-01 09:42:40 +04:00 |
|
ASH
|
4e89c65c22
|
#81 adding main tables
|
2019-03-31 18:58:57 +04:00 |
|