Nightblade73
|
689a7799e3
|
#55 added method in controller
|
2019-04-08 22:04:30 +04:00 |
|
Anton Romanov
|
518f587eed
|
Merge branch '85-issue-templates' into 'dev'
Resolve "Шаблоны задач"
Closes #85
See merge request romanov73/ng-tracker!48
|
2019-04-08 07:36:33 +00:00 |
|
user
|
3017366c91
|
№85 try to add issue template
|
2019-04-08 11:27:15 +03: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 |
|
Anton Romanov
|
d26ab93629
|
Merge branch '83-docker-hub' into 'dev'
Resolve "Образ для docker hub"
Closes #83
See merge request romanov73/ng-tracker!46
|
2019-04-05 18:03:16 +00: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
|
0feef9016a
|
#83 disable cache
|
2019-04-05 17:48:23 +04:00 |
|
Anton Romanov
|
94dabd07fb
|
#83 fix code
|
2019-04-05 17:47:10 +04:00 |
|
Anton Romanov
|
7a7dfb337f
|
#83 fix postgres service
|
2019-04-05 17:41:31 +04:00 |
|
Anton Romanov
|
c7cdbe9044
|
#83 add tasks, modify build script for passing application properties
|
2019-04-05 17:35:17 +04:00 |
|
Anton Romanov
|
fe1820d540
|
#83 try to change container
|
2019-04-05 16:37:03 +04:00 |
|
Nightblade73
|
67bfad22f9
|
#55 added create and update methods
|
2019-04-05 16:30:45 +04:00 |
|
Anton Romanov
|
4a05d52e4c
|
#83 try to change container
|
2019-04-05 16:25:10 +04:00 |
|
Anton Romanov
|
bbc398251f
|
#83 try to change container
|
2019-04-05 16:16:40 +04:00 |
|
Anton Romanov
|
0d7c594a94
|
Merge branch '82-paper-formatted-list' into 'dev'
Resolve "Метод в rest для список опубликованных статей"
Closes #82
See merge request romanov73/ng-tracker!45
|
2019-04-05 09:42:30 +00: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 |
|
Семенова Мария
|
ded0ab482a
|
add nonstopmode
|
2019-04-03 17:46:45 +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
|
54bbd2375d
|
Merge branch '57-classes-creating' into 'dev'
Resolve "Создание классов для модуля Конференции"
Closes #57
See merge request romanov73/ng-tracker!42
|
2019-04-03 04:03:46 +00:00 |
|
Nightblade73
|
0428bad048
|
#57 created classes
|
2019-04-02 10:53:09 +04:00 |
|
Anton Romanov
|
0c84f30498
|
Merge branch '81-students-create-database' into 'dev'
Resolve "Создание базы данных"
Closes #81
See merge request romanov73/ng-tracker!41
|
2019-04-01 05:36:15 +00: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 |
|
Anton Romanov
|
539095c89e
|
partially restored commits page
|
2019-03-28 14:59:35 +04:00 |
|
Семенова Мария
|
0c34571354
|
remove JLR library using
|
2019-03-28 14:51:17 +04:00 |
|