Nightblade73
|
5bff419dbd
|
#68 added ping table
|
2019-04-24 16:44:17 +04:00 |
|
Anton Romanov
|
bb2518e5f4
|
Merge branch '76-students-tags-filter' into 'dev'
Resolve "Фильтр задач по типу (тегам)"
Closes #77, #75, and #76
See merge request romanov73/ng-tracker!61
|
2019-04-24 09:36:03 +00:00 |
|
Anton Romanov
|
1e6fbdc1fa
|
Merge branch '64-add-article-conf' into 'dev'
Resolve "Добавить новую статью к конференции"
Closes #64
See merge request romanov73/ng-tracker!70
|
2019-04-24 09:35:08 +00:00 |
|
Anton Romanov
|
54c6fe815d
|
Merge branch '113-delete-project' into 'dev'
Resolve "Реализовать удаление проекта"
Closes #113
See merge request romanov73/ng-tracker!71
|
2019-04-24 09:34:12 +00:00 |
|
Nightblade73
|
fe55890518
|
#64 more style fixes
|
2019-04-24 10:12:42 +04:00 |
|
Nightblade73
|
7eb5dce94e
|
#64 style fixes
|
2019-04-24 09:42:00 +04:00 |
|
ASH
|
7248a84c30
|
#76 adding sorting
|
2019-04-24 01:03:56 +04:00 |
|
Васин Антон
|
02d643727e
|
#113 projects/projects edited
|
2019-04-23 23:32:40 +03:00 |
|
Васин Антон
|
50a0f8aa78
|
#113 projects.js added
|
2019-04-23 23:19:25 +03:00 |
|
Васин Антон
|
2418e953be
|
#113 line fragment edited
|
2019-04-23 23:15:52 +03:00 |
|
Васин Антон
|
e32da7c7c2
|
#113 delete function
|
2019-04-23 23:11:45 +03:00 |
|
Anton Romanov
|
8f2f6adc3b
|
#64 show global message
|
2019-04-23 23:15:22 +04:00 |
|
T-Midnight
|
bf515a3fcb
|
Merge remote-tracking branch 'remotes/origin/107-attach-article' into 115-follow-up-from-resolve
|
2019-04-23 21:47:54 +04:00 |
|
Васин Антон
|
c78ea05255
|
#114 update edited
|
2019-04-23 14:11:42 +03:00 |
|
T-Midnight
|
26969dba5b
|
#107 merge with dev
|
2019-04-23 15:02:41 +04:00 |
|
T-Midnight
|
6df1a87367
|
#107 merge with dev
|
2019-04-23 15:01:47 +04:00 |
|
T-Midnight
|
546b0dc323
|
#107 add styles
|
2019-04-23 14:51:51 +04:00 |
|
Васин Антон
|
41bd00d645
|
project dashboard edited
|
2019-04-23 13:40:11 +03:00 |
|
Nightblade73
|
6d6ea3136d
|
#64 dont show error message
|
2019-04-23 13:37:56 +04:00 |
|
T-Midnight
|
d3b8be2cf1
|
#107 add view of the selected papers
|
2019-04-23 13:21:13 +04:00 |
|
Васин Антон
|
019fe7c652
|
#97 adding deadlines
|
2019-04-23 10:32:23 +03:00 |
|
Nightblade73
|
53cc777734
|
#64 delete conference refactor
|
2019-04-22 21:46:42 +04:00 |
|
Васин Антон
|
53cc947a17
|
#97 copy from DTO edited
|
2019-04-22 15:48:29 +03:00 |
|
Васин Антон
|
ba565746f5
|
#97 dashboard added
|
2019-04-22 14:41:58 +03:00 |
|
Васин Антон
|
519dd51446
|
#97 dashboard added
|
2019-04-22 14:31:46 +03:00 |
|
Васин Антон
|
349e7373ff
|
#97 save function
|
2019-04-22 14:19:01 +03:00 |
|
Nightblade73
|
2767403128
|
#64 added saving in db
|
2019-04-22 15:11:52 +04:00 |
|
Nightblade73
|
5bfeaff054
|
#64 added method addPaper
|
2019-04-22 11:13:04 +04:00 |
|
Anton Romanov
|
b6ced3ce1a
|
Merge branch '60-sort-conf' into 'dev'
Resolve "Сортировка списка конференций"
Closes #60
See merge request romanov73/ng-tracker!66
|
2019-04-22 03:12:00 +00:00 |
|
ASH
|
6876d09557
|
#76 adding style to filters
|
2019-04-21 19:02:27 +04:00 |
|
Nightblade73
|
ddd21dab1c
|
#60 added dashboard
|
2019-04-21 17:18:44 +04:00 |
|
ASH
|
8400c5d40d
|
Merge remote-tracking branch 'remotes/origin/dev' into 76-students-tags-filter
# Conflicts:
# src/main/resources/templates/students/dashboard.html
|
2019-04-21 15:47:56 +04:00 |
|
Семенова Мария
|
a3d1834ab8
|
#110 add paper type
|
2019-04-21 12:17:31 +04:00 |
|
Nightblade73
|
338d7c2e09
|
#59 added begin-end dates in conferenceRow
|
2019-04-19 18:32:24 +04:00 |
|
T-Midnight
|
eec739a49f
|
#41 create simple attach of articles
|
2019-04-19 17:49:36 +04:00 |
|
T-Midnight
|
f29d31b840
|
#41 create changelog
|
2019-04-19 17:45:22 +04:00 |
|
Nightblade73
|
34033fac5f
|
#59 added filtration
|
2019-04-19 17:36:46 +04:00 |
|
Nightblade73
|
9f664b2618
|
#59 add front thymeleaf
|
2019-04-19 17:30:30 +04:00 |
|
Anton Romanov
|
21ba06170a
|
Merge branch '106-papers-bug' into 'dev'
Resolve "Bug: не отображается список статей"
Closes #106
See merge request romanov73/ng-tracker!62
|
2019-04-19 13:13:10 +00:00 |
|
Anton Romanov
|
2d0f2aeecd
|
Merge branch '69-take-part-conf' into 'dev'
Resolve "Принять участие в конференции пользователю"
Closes #69
See merge request romanov73/ng-tracker!56
|
2019-04-19 13:05:07 +00: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 |
|
T-Midnight
|
f387b4eb52
|
#41 add link to the grant page
|
2019-04-19 11:36:27 +04:00 |
|
Семенова Мария
|
6c8554a0b8
|
#106 change boolean to nullable
|
2019-04-18 23:37:08 +04:00 |
|
ASH
|
7bec7b4e44
|
#76 filters added
|
2019-04-18 23:15: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
|
958a0d461b
|
#42 merge with dev
|
2019-04-18 22:35:07 +04:00 |
|
T-Midnight
|
416ad7eeda
|
#42 merge with dev
|
2019-04-18 22:34:20 +04:00 |
|
ASH
|
59887e5141
|
#76 delete function added
|
2019-04-18 21:57:56 +04:00 |
|
ASH
|
9da227ab34
|
#76 fixing dashboard
|
2019-04-18 21:38:55 +04:00 |
|
Семенова Мария
|
6c6a748978
|
#105 danger message type
|
2019-04-18 19:03:04 +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 |
|
Васин Антон
|
f1f7c1f0f6
|
#97 cancel button edited
|
2019-04-18 16:49:10 +03:00 |
|
Nightblade73
|
96431701df
|
#69 added button disabling take part, if cur user already taken part
|
2019-04-18 15:38:45 +04:00 |
|
Nightblade73
|
8fd352aaa4
|
#69 added styles
|
2019-04-18 14:33:49 +04:00 |
|
Anton Romanov
|
8474fb492f
|
Merge branch '96-edit-project-page' into 'dev'
Resolve "Страница редактирования проекта"
Closes #96
See merge request romanov73/ng-tracker!57
|
2019-04-18 09:32:48 +00:00 |
|
Васин Антон
|
ced3b0a978
|
#96 database edited
|
2019-04-18 12:10:27 +03:00 |
|
T-Midnight
|
e284298200
|
#42 rename variables
|
2019-04-18 13:09:50 +04:00 |
|
Васин Антон
|
b722687050
|
#96 edit project page
|
2019-04-18 10:32:43 +03:00 |
|
Nightblade73
|
918079ac89
|
#69 fixed not working code, now user can take part in conference and choose participation and deposit
|
2019-04-18 11:20:44 +04:00 |
|
Anton Romanov
|
cfbe36197b
|
#102 add auto tests
|
2019-04-17 17:20:20 +04:00 |
|
Васин Антон
|
e85c814f70
|
#96 project comment added
|
2019-04-17 14:46:42 +03:00 |
|
Васин Антон
|
255692d6ea
|
#96 project status added
|
2019-04-17 14:38:07 +03:00 |
|
Васин Антон
|
f079e34a57
|
#96 project title added
|
2019-04-17 14:18:35 +03:00 |
|
Васин Антон
|
4ea40931eb
|
#96 project status fragment added
|
2019-04-17 14:06:38 +03:00 |
|
Васин Антон
|
a89d93a9b0
|
#96 project line fragment added
|
2019-04-17 14:01:45 +03:00 |
|
Nightblade73
|
7e4d8d4918
|
#69 added method take part in conference
|
2019-04-17 14:51:19 +04:00 |
|
Васин Антон
|
ca3e87a8c5
|
#96 edit project blank page
|
2019-04-17 13:50:22 +03:00 |
|
T-Midnight
|
506fa01fab
|
Revert: #42 merge with dev
|
2019-04-17 13:42:22 +04:00 |
|
T-Midnight
|
97d7d00098
|
#42 merge with dev
|
2019-04-17 13:30:14 +04:00 |
|
T-Midnight
|
1e6b3cba3a
|
#42 delete blank lines, fix js, fix leaderId validation
|
2019-04-17 13:25:10 +04:00 |
|
Nightblade73
|
8564f2cf34
|
#69 managed to create a connection through a new entity
|
2019-04-17 13:00:48 +04:00 |
|
Anton Romanov
|
487aa578a7
|
Merge branch '86-projects-main-page' into 'dev'
Resolve "Создать страницу списка проектов"
Closes #86
See merge request romanov73/ng-tracker!53
|
2019-04-17 07:35:00 +00:00 |
|
Васин Антон
|
f5c1bb940c
|
#86 projects main page
|
2019-04-17 11:24:30 +03:00 |
|
Nightblade73
|
14c28050c7
|
#65 changed interface
|
2019-04-17 11:19:23 +04:00 |
|
Nightblade73
|
81d07645c2
|
#65 added delete method of article, fixed copyFromDto method
|
2019-04-16 14:18:49 +04:00 |
|
Anton Romanov
|
3facc0c26e
|
Merge branch '74-students-add-new-task' into 'dev'
Resolve "Добавление новой задачи"
Closes #78 and #74
See merge request romanov73/ng-tracker!47
|
2019-04-16 09:36:58 +00:00 |
|
Anton Romanov
|
d81d1cf72c
|
#74 some code fixes
|
2019-04-16 13:41:10 +04:00 |
|
Nightblade73
|
d4b38d314f
|
#66 fixed bug, when attach-article lose what needed to attach after add or remove deadline
|
2019-04-16 13:22:15 +04:00 |
|
Nightblade73
|
735cbb5f7b
|
#66 added front-end part
|
2019-04-16 09:46:24 +04:00 |
|
Nightblade73
|
909c657c89
|
#58 added delete confirm
|
2019-04-15 15:48:17 +04:00 |
|
Nightblade73
|
0cc8de2d32
|
#58 added delete method of conference
|
2019-04-15 10:36:55 +04:00 |
|
ASH
|
1f36e04cd3
|
#74 fully adding tags
|
2019-04-14 21:24:22 +04:00 |
|
Nightblade73
|
8cfc64ea85
|
#55 added delete input style
|
2019-04-14 20:42:11 +04:00 |
|
Anton Romanov
|
8b2a559d37
|
#42 fix thymeleaf expressions
|
2019-04-13 23:56:24 +04:00 |
|
Nightblade73
|
9711febefb
|
#55 added delete deadline
|
2019-04-13 13:02:36 +04:00 |
|
T-Midnight
|
1756f29505
|
#42 filter authors by leader and degree
|
2019-04-13 12:39:53 +04:00 |
|
Nightblade73
|
b4a2a8086d
|
#62 remove verification of empty deadline list
|
2019-04-12 15:51:06 +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 |
|
ASH
|
5eae7305c4
|
#74 codestyle
|
2019-04-11 00:14:03 +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 |
|
ASH
|
9b697c6f3f
|
#74 adding models, controllers and services
|
2019-04-09 23:18:39 +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 |
|
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 |
|