T-Midnight
|
1e6b3cba3a
|
#42 delete blank lines, fix js, fix leaderId validation
|
2019-04-17 13:25:10 +04:00 |
|
Anton Romanov
|
8b2a559d37
|
#42 fix thymeleaf expressions
|
2019-04-13 23:56:24 +04:00 |
|
T-Midnight
|
1756f29505
|
#42 filter authors by leader and degree
|
2019-04-13 12:39:53 +04:00 |
|
Anton Romanov
|
4955e9a637
|
#4--2 merge with dev
|
2019-04-11 22:39:59 +04:00 |
|
Anton Romanov
|
cafb3abcee
|
#4--2 merge with dev
|
2019-04-11 22:37:32 +04:00 |
|
T-Midnight
|
bd3513118c
|
#42 this don't work
|
2019-04-11 21:42:28 +04:00 |
|
T-Midnight
|
f7d766f02d
|
#42 rename birth_date column
|
2019-04-11 21:37:24 +04:00 |
|
T-Midnight
|
e8461e26eb
|
#42 fix birthDate and degree to User
|
2019-04-10 10:09:41 +04:00 |
|
T-Midnight
|
51c755ac07
|
#42 method hasErrors didn't work, return to the previous state
|
2019-04-10 09:39:07 +04:00 |
|
T-Midnight
|
e2e10477ac
|
#42 delete GrantStatusDto
|
2019-04-09 21:31:23 +04:00 |
|
Nightblade73
|
c308a5e5af
|
#55 Navigation's method "hasErrors" don't work. it returns String, not redirection.
|
2019-04-09 14:47:14 +04:00 |
|
Nightblade73
|
689a7799e3
|
#55 added method in controller
|
2019-04-08 22:04:30 +04:00 |
|
Anton Romanov
|
7dca991c2f
|
Merge branch '55-new-conf' into 'dev'
Resolve "Добавление новой конференции"
Closes #55
See merge request romanov73/ng-tracker!43
|
2019-04-08 03:33:40 +00:00 |
|
Anton Romanov
|
e350f8b3c1
|
#55 refactor controller navigation, fix conference edit url
|
2019-04-08 07:40:26 +04:00 |
|
Nightblade73
|
c49b56916c
|
#55 added initialization of fields in ConferenceDto
|
2019-04-07 10:08:13 +04:00 |
|
Nightblade73
|
db43da9ec0
|
#55 added nav controller
|
2019-04-07 10:01:44 +04:00 |
|
Nightblade73
|
3e5aeaf290
|
#55 fast fixes
|
2019-04-06 14:41:10 +04:00 |
|
Nightblade73
|
926cd02096
|
#55 fixed adding to DB
|
2019-04-06 11:05:30 +04:00 |
|
Anton Romanov
|
b9af7c20c7
|
fix grids
|
2019-04-06 00:11:49 +04:00 |
|
T-Midnight
|
7465803162
|
#42 add columns 'birth_date'&'degree' to User
|
2019-04-05 22:06:16 +04:00 |
|
Anton Romanov
|
e0ca29fbab
|
#83 fix wrong entity
|
2019-04-05 21:47:42 +04:00 |
|
Nightblade73
|
eb524d49d0
|
#55 added html side, don't work, because can't parse date, like in deadlines
|
2019-04-05 18:01:43 +04:00 |
|
Anton Romanov
|
72add3638b
|
#83 check CI
|
2019-04-05 18:01:12 +04:00 |
|
Anton Romanov
|
c7cdbe9044
|
#83 add tasks, modify build script for passing application properties
|
2019-04-05 17:35:17 +04:00 |
|
Nightblade73
|
67bfad22f9
|
#55 added create and update methods
|
2019-04-05 16:30:45 +04:00 |
|
Anton Romanov
|
54edeb0559
|
#82 fix user abbreviate
|
2019-04-05 13:39:53 +04:00 |
|
Anton Romanov
|
91d2168012
|
#82 show paper formatted lines
|
2019-04-05 13:34:38 +04:00 |
|
Nightblade73
|
d6b7fe790a
|
#55 added transition to the page new conference
|
2019-04-05 13:21:15 +04:00 |
|
Nightblade73
|
9d69f75530
|
#55 fixes
|
2019-04-04 20:26:38 +04:00 |
|
Nightblade73
|
2d04b1b43a
|
#55 added findAll method in ConferenceService
|
2019-04-04 17:58:22 +04:00 |
|
Nightblade73
|
d189891e8c
|
#55 added ConferenceFilterDto
|
2019-04-04 17:47:18 +04:00 |
|
Nightblade73
|
e3bbade40b
|
#55 added ConferenceDto
|
2019-04-04 17:39:28 +04:00 |
|
Nightblade73
|
dc12a671d2
|
#55 added setters/getters
|
2019-04-04 12:50:12 +04:00 |
|
Nightblade73
|
be2dd291f6
|
#55 added conference model without user's participation and deposit. May be needed new user model.
|
2019-04-04 12:48:05 +04:00 |
|
T-Midnight
|
99a8550696
|
#42 merge dev into 42
|
2019-04-04 09:44:51 +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 |
|
Nightblade73
|
0428bad048
|
#57 created classes
|
2019-04-02 10:53:09 +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 |
|
Anton Romanov
|
61d4c67aac
|
Merge branch '56-creating-tables-in-DB' into 'dev'
Resolve "Создание таблиц в БД по модулю конференций"
Closes #56
See merge request romanov73/ng-tracker!40
|
2019-04-01 05:27:43 +00:00 |
|
Anton Romanov
|
c2dc080d23
|
Merge branch '71-add-task-layout' into 'dev'
Resolve "Верстка страницы добавления новой задачи, ПУ и списка задач"
Closes #71
See merge request romanov73/ng-tracker!29
|
2019-04-01 05:17:39 +00:00 |
|
ASH
|
4e89c65c22
|
#81 adding main tables
|
2019-03-31 18:58:57 +04:00 |
|
ASH
|
2ad03a5689
|
#71 adding dashboard
|
2019-03-31 13:47:15 +04:00 |
|
Nightblade73
|
e93f618779
|
#56 added database schema
|
2019-03-31 13:12:43 +04:00 |
|
Anton Romanov
|
76d4c15db5
|
Merge branch '18-paper-timeline' into 'dev'
Resolve "Реализовать добавление в таймлайн событий по дедлайнам статей"
Closes #18
See merge request romanov73/ng-tracker!39
|
2019-03-30 07:12:26 +00:00 |
|
Anton Romanov
|
e98445bb48
|
Merge branch '53-vyorstka-stranitsy-spiska-konferentsiy' into 'dev'
Resolve "Вёрстка страницы списка конференций"
Closes #53
See merge request romanov73/ng-tracker!33
|
2019-03-30 07:10:47 +00:00 |
|
Семенова Мария
|
030e1a3afb
|
Merge branch 'dev' into 18-paper-timeline
# Conflicts:
# src/main/java/ru/ulstu/paper/model/Paper.java
# src/main/resources/db/changelog-master.xml
|
2019-03-28 18:32:44 +04:00 |
|
Anton Romanov
|
ba64b7df16
|
Merge branch 'restore-commits-page' into 'dev'
partially restored commits page
See merge request romanov73/ng-tracker!38
|
2019-03-28 11:58:02 +00:00 |
|
Anton Romanov
|
103ff05846
|
fix displaying commits
|
2019-03-28 15:53:31 +03:00 |
|