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 |
|
Anton Romanov
|
7269f45662
|
Merge branch '80-no-records-message' into 'dev'
Resolve "Добавить сообщения на пустые страницы"
Closes #80
See merge request romanov73/ng-tracker!37
|
2019-03-28 10:39:06 +00:00 |
|
Anton Romanov
|
7b0b7a041a
|
#80 hide mvc controllers from api
|
2019-03-28 14:45:39 +04:00 |
|
Anton Romanov
|
c70c35f4f3
|
#80 add no records message
|
2019-03-28 14:36:58 +04:00 |
|
Anton Romanov
|
e74fcb316c
|
#33 small external link
|
2019-03-27 13:27:49 +04:00 |
|
Anton Romanov
|
37e20fb472
|
Update README.md
|
2019-03-27 09:07:02 +00:00 |
|
Anton Romanov
|
1dbb9b9136
|
Merge branch '33-paper-url' into 'dev'
Resolve "Добавить в конференцию/статью ссылку на сайт"
Closes #33
See merge request romanov73/ng-tracker!36
|
2019-03-27 07:58:58 +00:00 |
|
Семенова Мария
|
b90e7c054b
|
#33 link in new tab
|
2019-03-23 12:23:30 +04:00 |
|
Семенова Мария
|
c228f5aee0
|
Merge branch 'dev' into 33-paper-url
# Conflicts:
# src/main/java/ru/ulstu/paper/model/Paper.java
# src/main/java/ru/ulstu/paper/service/PaperService.java
# src/main/resources/db/changelog-master.xml
|
2019-03-23 12:04:51 +04:00 |
|
Anton Romanov
|
f5ce1aa269
|
Merge branch '13-paper-files' into 'dev'
Resolve "Загрузка и сохранение файлов статей"
Closes #13
See merge request romanov73/ng-tracker!35
|
2019-03-22 10:36:09 +00:00 |
|
Anton Romanov
|
482e74e10e
|
#13 reduce of code
|
2019-03-22 13:58:03 +04:00 |
|
Anton Romanov
|
7012c00c5f
|
#13 fix condition
|
2019-03-22 13:52:06 +04:00 |
|
Семенова Мария
|
a0b65f341b
|
#13 streams refactoring
|
2019-03-22 13:21:32 +04:00 |
|
Семенова Мария
|
5da9de1bab
|
#13 rename 'deleted', move creating fileDto to service
|
2019-03-22 09:32:21 +04:00 |
|
Семенова Мария
|
c702e2abb4
|
#13 fileDataDto instead of Object[]
|
2019-03-21 18:26:28 +04:00 |
|
Семенова Мария
|
3c068df201
|
#13 some refactoring
|
2019-03-19 17:59:19 +04:00 |
|
Семенова Мария
|
1a522f7b44
|
Merge branch 'dev' into 13-paper-files
|
2019-03-19 17:41:02 +04:00 |
|
Семенова Мария
|
e6bf603edc
|
#33 url in paper
|
2019-03-18 23:31:33 +04:00 |
|
Anton Romanov
|
c374cb4232
|
merge deploy environments
|
2019-03-18 22:35:01 +04:00 |
|
Anton Romanov
|
d35e0f7ba3
|
add environment
|
2019-03-18 22:25:28 +04:00 |
|
Семенова Мария
|
1425cceb63
|
#13 download files
|
2019-03-18 21:02:26 +04:00 |
|
Семенова Мария
|
8dc5eec35c
|
#13 add files to db
|
2019-03-18 19:17:28 +04:00 |
|
Семенова Мария
|
4fb8061653
|
#13 addNewFile js function
|
2019-03-18 18:39:15 +04:00 |
|
Семенова Мария
|
e609b27518
|
Merge branch 'dev' into 13-paper-files
# Conflicts:
# src/main/java/ru/ulstu/paper/model/PaperDto.java
|
2019-03-18 16:13:22 +04:00 |
|
Семенова Мария
|
cb394edf90
|
#13 file list on paper page
|
2019-03-18 16:02:55 +04:00 |
|
Anton Romanov
|
9418a47a1d
|
Merge branch '50-refactorForGrants' into 'dev'
Resolve "Тех. долг: отрефакторить контроллеры и модели"
Closes #50
See merge request romanov73/ng-tracker!32
|
2019-03-18 11:08:15 +00:00 |
|
T-Midnight
|
29df7120bf
|
Delete DeadlineDTO and update usages
|
2019-03-18 14:27:54 +04:00 |
|
Семенова Мария
|
0764d961fa
|
#13 add fileDataDto
|
2019-03-18 13:00:34 +04:00 |
|
Семенова Мария
|
7b601c744f
|
#13 change model, schema
|
2019-03-18 11:07:30 +04:00 |
|
T-Midnight
|
99d85a5648
|
Add new status for grant
|
2019-03-15 12:24:02 +04:00 |
|
T-Midnight
|
c25c17d8ba
|
Rename title
|
2019-03-15 12:19:25 +04:00 |
|
T-Midnight
|
de96be2471
|
Create Navigation class to avoid "magic strings" and code duplication
|
2019-03-15 12:19:01 +04:00 |
|
Anton Romanov
|
ae58a5b6e4
|
Merge branch '72-link-to-timetable' into 'dev'
Resolve "Ссылка на расписание пользователя"
Closes #72
See merge request romanov73/ng-tracker!31
|
2019-03-13 07:16:32 +00:00 |
|
Anton Romanov
|
90bb94d864
|
add patronymic
|
2019-03-12 14:44:11 +04:00 |
|
Anton Romanov
|
48894b2176
|
display user in filter
|
2019-03-12 13:40:48 +04:00 |
|
Anton Romanov
|
da7a17ee49
|
add service methods
|
2019-03-12 12:51:59 +03:00 |
|
Anton Romanov
|
20ecb47867
|
add timetable link
|
2019-03-12 12:35:09 +03:00 |
|
Anton Romanov
|
3169551968
|
Merge branch '54-view-conference' into 'dev'
Resolve "Вёрстка страницы просмотра информации о конференции"
Closes #54
See merge request romanov73/ng-tracker!26
|
2019-03-11 10:49:07 +00:00 |
|
Nightblade73
|
5cb865eb70
|
#54 deleted edit btn
|
2019-03-11 14:43:32 +04:00 |
|
Nightblade73
|
2fec35264c
|
#54 add back link, css fixes
|
2019-03-11 12:58:40 +04:00 |
|
Nightblade73
|
f90d92b19d
|
#54 add custom paper-list
|
2019-03-11 11:36:00 +04:00 |
|
Nightblade73
|
d332282e03
|
#54 add custom deadline-list, add edit-button, add edit and delete icons
|
2019-03-10 22:15:09 +04:00 |
|
Nightblade73
|
7fff337c3a
|
#54 add member list
|
2019-03-07 22:50:37 +04:00 |
|
Nightblade73
|
76ec5add30
|
#54 part of make-up
|
2019-03-06 20:51:46 +04:00 |
|
Nightblade73
|
c21a65a075
|
#54 add transitions
|
2019-03-06 16:48:51 +04:00 |
|
Anton Romanov
|
42fdb51337
|
fix login
|
2019-03-06 16:40:33 +04:00 |
|
Nightblade73
|
93e68b1929
|
#50 creating html page, changing href
|
2019-03-06 16:27:25 +04:00 |
|
Anton Romanov
|
febdb0b027
|
Merge branch '29-page-header' into 'dev'
Resolve "Адаптивный заголовок на странице"
Closes #29
See merge request romanov73/ng-tracker!28
|
2019-03-06 12:25:34 +00:00 |
|