ASH
|
c59bb45c70
|
#79 fixing codestyle
|
2019-05-11 23:06:30 +04:00 |
|
ASH
|
0de34c89fe
|
#79 fixing planner and year generation
|
2019-05-11 22:58:57 +04:00 |
|
Nightblade73
|
6edcf8f594
|
#103 add sort and filter test, fixed delete conference, if it has fk with event
|
2019-05-10 23:36:07 +04:00 |
|
T-Midnight
|
77e2ad0651
|
#119 add send notification functions
|
2019-05-09 01:24:55 +04:00 |
|
T-Midnight
|
74a8dcbd8a
|
#119 add leader changed notification
|
2019-05-09 01:23:17 +04:00 |
|
T-Midnight
|
b640dea99a
|
#119 create scheduler
|
2019-05-09 00:45:54 +04:00 |
|
Nightblade73
|
b57142e28f
|
#70 added unique name control
|
2019-05-08 17:08:37 +04:00 |
|
T-Midnight
|
e3ad5ba510
|
Merge remote-tracking branch 'remotes/origin/dev' into 119-notification-grants
|
2019-05-08 16:22:39 +04:00 |
|
Семенова Мария
|
2fba252df0
|
#109 show other paper attachs
|
2019-05-07 23:53:10 +04:00 |
|
Семенова Мария
|
1e07c5424d
|
#109 only one conference for paper
|
2019-05-07 21:35:50 +04:00 |
|
Семенова Мария
|
dffd839905
|
#109 only uncompleted for grant
|
2019-05-07 20:26:49 +04:00 |
|
Васин Антон
|
279cc0e18a
|
#101 project model edited
|
2019-05-07 14:00:24 +03:00 |
|
T-Midnight
|
2dae39a100
|
#119 create grants notification service
|
2019-05-06 23:57:16 +04:00 |
|
Васин Антон
|
241c489b21
|
#98 deadline edited
|
2019-05-06 22:10:40 +03: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 |
|
Васин Антон
|
4bab980f62
|
#98 deadline model and service edited
|
2019-05-06 20:17:10 +03:00 |
|
Васин Антон
|
ee55e08fee
|
#98 project tasks deadline edited
|
2019-05-06 17:43:20 +03:00 |
|
T-Midnight
|
da382b659a
|
#32 add deadlines on timeline page
|
2019-05-06 00:32:28 +04:00 |
|
T-Midnight
|
beb334f2fa
|
#32 add variable "events"
|
2019-05-04 23:59:03 +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 |
|
T-Midnight
|
74d43dcd0d
|
#117 resolve last discussion
|
2019-05-02 22:49:58 +04:00 |
|
T-Midnight
|
de625923e9
|
#117 resolve discussions v.2
|
2019-05-02 21:56:54 +04:00 |
|
T-Midnight
|
b334b5d70e
|
#117 resolve discussions
|
2019-05-02 21:42:06 +04:00 |
|
T-Midnight
|
8b333ab3a6
|
Merge branch '38-attach-file-grants' into 117-filter-users
|
2019-05-02 21:29:20 +04:00 |
|
Nightblade73
|
6350e1c0d6
|
#70 add hashCode for deadline
|
2019-05-02 14:51:22 +04:00 |
|
Nightblade73
|
6820c617f3
|
#70 remove conflicts
|
2019-05-02 14:42:08 +04:00 |
|
Nightblade73
|
60bdd9d233
|
#70 fixes
|
2019-05-02 14:35:40 +04:00 |
|
T-Midnight
|
2ebd61016d
|
#38 add variable "files"
|
2019-04-30 23:40:40 +04:00 |
|
ASH
|
7ce8b20841
|
#79 fixing bug
|
2019-04-30 22:05:57 +04:00 |
|
Nightblade73
|
0e062f1337
|
#70 fast fix
|
2019-04-30 11:41:36 +04:00 |
|
Nightblade73
|
9edcf35338
|
#70 added ping notification
|
2019-04-30 10:43:36 +04:00 |
|
ASH
|
b4c11a7f90
|
#79 year generation
|
2019-04-28 23:58:35 +04:00 |
|
Nightblade73
|
0e8752e460
|
#70 style fixes
|
2019-04-27 20:34:49 +04:00 |
|
Nightblade73
|
e178cd1639
|
#70 added checking empty fields of deadline, fix bug on EventDto
|
2019-04-27 09:45:47 +04:00 |
|
T-Midnight
|
9cf002ad95
|
Merge remote-tracking branch 'remotes/origin/dev' into 117-filter-users
|
2019-04-26 15:22:04 +04:00 |
|
T-Midnight
|
39f3c69479
|
#117 add scopus papers filter
|
2019-04-26 15:16:04 +04:00 |
|
Nightblade73
|
dbcdb96dbf
|
#70 added event method, don't work, because trying to find null entity
|
2019-04-26 15:12:34 +04:00 |
|
Nightblade73
|
51877023d1
|
#70 added new column to event
|
2019-04-26 09:28:20 +04:00 |
|
T-Midnight
|
51e121ae24
|
#117 add BAK papers filter
|
2019-04-26 00:29:20 +04:00 |
|
Семенова Мария
|
8f3e3fd9a7
|
#108 add formatting methods
|
2019-04-26 00:00:01 +04:00 |
|
Семенова Мария
|
71ec7bb726
|
#108 add reference dto
|
2019-04-25 22:08:24 +04:00 |
|
Nightblade73
|
34925b81ff
|
#70 added schedule for deadline of conference
|
2019-04-25 21:17:48 +04:00 |
|
Nightblade73
|
16e9bf1fb5
|
#70 added update notification for all participants
|
2019-04-25 19:15:19 +04:00 |
|
Nightblade73
|
c489ebbf91
|
#70 added create notification for all users about new conference
|
2019-04-25 17:12:39 +04:00 |
|
Anton Romanov
|
88ec35faa0
|
Merge branch '68-ping-conf' into 'dev'
Resolve "Ping конференции в списке конференций"
Closes #68
See merge request romanov73/ng-tracker!69
|
2019-04-25 10:00:34 +00:00 |
|
T-Midnight
|
4fa0c14ae6
|
#116 add removeDeadline method
|
2019-04-25 13:25:32 +04:00 |
|
T-Midnight
|
7c5a0826c5
|
#116 add new variable
|
2019-04-25 13:24:36 +04:00 |
|
T-Midnight
|
8ced83ad2b
|
#116 delete annotation
|
2019-04-25 13:23:36 +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
|
70d260c34b
|
#68 ping but style
|
2019-04-24 21:52:13 +04:00 |
|
Nightblade73
|
d4b514a9b0
|
#68 added ping in db
|
2019-04-24 21:24:32 +04:00 |
|
Nightblade73
|
d921def09d
|
#68 added ping method
|
2019-04-24 21:05:25 +04:00 |
|
Nightblade73
|
f556b969b4
|
#68 added demo version of charts, using highcharts lib
|
2019-04-24 18:55:52 +04:00 |
|
Nightblade73
|
b16b3ed2e3
|
#68 added class structure
|
2019-04-24 17:41:19 +04:00 |
|
Anton Romanov
|
4dd0a6c210
|
fix merge bug
|
2019-04-24 13:45:09 +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
|
d37c9bda57
|
#64 excluded adding articles with the same name
|
2019-04-24 10:17:32 +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 |
|
Васин Антон
|
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
|
c18ecea13b
|
#115 move method to service
|
2019-04-23 22:03:06 +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 |
|
Васин Антон
|
2f3c1addbb
|
#114 unused imports removed
|
2019-04-23 14:20:17 +03: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 |
|
Васин Антон
|
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 |
|
ASH
|
3698d31bc8
|
#76 fixing conflicts
|
2019-04-22 21:52:26 +04: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 |
|
Васин Антон
|
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 |
|
Nightblade73
|
a4ae42f072
|
#60 added sorting
|
2019-04-21 15:03:31 +04:00 |
|
Семенова Мария
|
a3d1834ab8
|
#110 add paper type
|
2019-04-21 12:17:31 +04:00 |
|
Nightblade73
|
a9f4a326c5
|
#59 fixed styles
|
2019-04-19 18:38:56 +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 |
|
Nightblade73
|
34033fac5f
|
#59 added filtration
|
2019-04-19 17:36:46 +04:00 |
|
Nightblade73
|
e2b49689d5
|
#59 changed filterDto
|
2019-04-19 17:31: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
|
9e31bfa7d7
|
#106 add checkstyle rules
|
2019-04-19 17:08:12 +04:00 |
|
Nightblade73
|
b623402aa8
|
#69 changed method getConference in controller
|
2019-04-19 14:39:07 +04:00 |
|
Nightblade73
|
9edcebb2f5
|
#69 changed isCurrentUserParticipant
|
2019-04-19 14:29:08 +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 |
|
Семенова Мария
|
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
|
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 |
|
Семенова Мария
|
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 |
|
Nightblade73
|
96431701df
|
#69 added button disabling take part, if cur user already taken part
|
2019-04-18 15:38:45 +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 |
|
Васин Антон
|
d015b02862
|
#96 removed wildcards from imports
|
2019-04-18 13:26:11 +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 |
|
Семенова Мария
|
789fda9c98
|
remove nonstopmode from bibtex
|
2019-04-18 10:49:36 +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 |
|
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
|
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
|
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 |
|
anastasia shulga
|
95f70f425a
|
Update2 TagService.java
|
2019-04-16 08:21:36 +00:00 |
|
anastasia shulga
|
dbd61ce80c
|
Update TagService.java
|
2019-04-16 07:55:37 +00:00 |
|
Nightblade73
|
dca644eba1
|
#66 added handling of adding articles not added to the picker.
|
2019-04-16 10:42:40 +04:00 |
|
Nightblade73
|
fbf9a7943b
|
#66 changed from Set to List
|
2019-04-16 09:51:31 +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 |
|
Nightblade73
|
f88f035e65
|
#55 little fix
|
2019-04-14 21:34:39 +04:00 |
|
Nightblade73
|
8cfc64ea85
|
#55 added delete input style
|
2019-04-14 20:42:11 +04:00 |
|
ASH
|
d6a11a5902
|
#74 fixing codestyle and tags
|
2019-04-14 17:50:23 +04:00 |
|
Anton Romanov
|
8b2a559d37
|
#42 fix thymeleaf expressions
|
2019-04-13 23:56:24 +04:00 |
|
Anton Romanov
|
34499abd60
|
#62 fix remove deadline in other JPA operation
|
2019-04-13 22:59:59 +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
|
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 |
|
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 |
|
T-Midnight
|
51c755ac07
|
#42 method hasErrors didn't work, return to the previous state
|
2019-04-10 09:39:07 +04:00 |
|
ASH
|
9b697c6f3f
|
#74 adding models, controllers and services
|
2019-04-09 23:18:39 +04:00 |
|
T-Midnight
|
e2e10477ac
|
#42 delete GrantStatusDto
|
2019-04-09 21:31:23 +04:00 |
|