Nightblade73
|
bde9cb51fb
|
#104 some methods fixed
|
5 years ago |
|
Nightblade73
|
c0937d721a
|
#104 removePaper, addPaper, takePart fixed
|
5 years ago |
|
Nightblade73
|
ce7b4c9c7a
|
#104 addDeadline, removeDeadline fixed
|
5 years ago |
Artem.Arefev
|
c47d4f8a05
|
#88 removed unused imports
|
5 years ago |
|
Artem.Arefev
|
33f62c04e7
|
Merge branch '87-inviting-user' into 88-change-password
|
5 years ago |
|
Artem.Arefev
|
d50673f5fa
|
87-inviting-user small fix in mail template, and changed default user name
|
5 years ago |
|
Artem.Arefev
|
f8f501b8ff
|
88-change-password base
|
5 years ago |
ASH
|
cd1caa559e
|
Merge branch 'dev' into 79-students-tags-generation
# Conflicts:
# src/main/java/ru/ulstu/students/service/TaskService.java
|
5 years ago |
|
ASH
|
bc9cca62d6
|
#79 refactoring
|
5 years ago |
|
Artem.Arefev
|
3226cc3971
|
87 fixed UserControllerV2 logger
|
5 years ago |
|
Artem.Arefev
|
48a18a3a57
|
87 fixed imports
|
5 years ago |
|
Artem.Arefev
|
d88f67ce00
|
87 transactional inviting
|
5 years ago |
|
Artem.Arefev
|
11ef644e5e
|
88 inviting user base
|
5 years ago |
|
Nightblade73
|
1e06edfcc0
|
Merge remote-tracking branch 'remotes/origin/dev' into 104-module-test-conf
# Conflicts:
# src/main/java/ru/ulstu/conference/service/ConferenceService.java
|
5 years ago |
|
Nightblade73
|
7952787229
|
#104 add new tests, fixes
|
5 years ago |
|
Nightblade73
|
00c5d5f755
|
#104 test refactoring
|
5 years ago |
|
Artem.Arefev
|
95fc9da47d
|
lk base, created from dev
|
5 years ago |
|
Nightblade73
|
11cab955b4
|
#104 test create
|
5 years ago |
|
Nightblade73
|
c88c77cd7d
|
#104 test find one dto
|
5 years ago |
|
Nightblade73
|
1c5c05b5e4
|
#104 test take part
|
5 years ago |
|
Nightblade73
|
e6cb991463
|
#104 test is member
|
5 years ago |
|
Nightblade73
|
a8d987b01f
|
#104 test copy from dto method
|
5 years ago |
|
Nightblade73
|
3a9fde3404
|
#104 setUp fields
|
5 years ago |
|
Nightblade73
|
9da5fd8a7a
|
#104 shock, the first unit test works
|
5 years ago |
Anton Romanov
|
51851baa48
|
Merge branch '103-autotest-conf' into 'dev'
Resolve "Реализовать интеграционные автотесты для проверки модулей"
See merge request romanov73/ng-tracker!90
|
5 years ago |
|
Anton Romanov
|
10a9bd7a28
|
Merge branch '111-unique-name-control-conf' into 'dev'
Resolve "Контроль уникальности названия"
See merge request romanov73/ng-tracker!86
|
5 years ago |
|
Nightblade73
|
58a8495835
|
Merge remote-tracking branch 'remotes/origin/dev' into 103-autotest-conf
# Conflicts:
# src/main/java/ru/ulstu/timeline/service/EventService.java
|
5 years ago |
|
Nightblade73
|
ab59cb524e
|
#103 fix code style
|
5 years ago |
|
Nightblade73
|
1f8722e3ff
|
#103 code refactoring
|
5 years ago |
|
Nightblade73
|
6044d6f8e3
|
#111 save method refactor
|
5 years ago |
|
Anton Romanov
|
a3afdeb988
|
Merge branch '123-student-task-timeline' into 'dev'
Resolve "Добавление таймлайна для дедлайнов задач"
Closes #123
See merge request romanov73/ng-tracker!91
|
5 years ago |
T-Midnight
|
f6830d499b
|
#121 update view
|
5 years ago |
|
T-Midnight
|
99ec7af319
|
#121 reduce paper title
|
5 years ago |
|
T-Midnight
|
e1907d3169
|
#121 change Paper to PaperDto in attaching papers
|
5 years ago |
|
Nightblade73
|
451e7e5d04
|
#103 fix code style
|
5 years ago |
|
Nightblade73
|
5cbbb6c319
|
#103 fix code style
|
5 years ago |
|
Nightblade73
|
70062992ae
|
#103 clear code
|
5 years ago |
|
Nightblade73
|
fe53c86136
|
#103 fixed delete conf test
|
5 years ago |
|
ASH
|
5b4180e685
|
#123 fixing layout
|
5 years ago |
|
ASH
|
a11e10dec4
|
#123 adding task timeline
|
5 years ago |
|
Nightblade73
|
d846192046
|
#111 fixes
|
5 years ago |
|
ASH
|
7798508d4f
|
Merge branch 'dev' into 79-students-tags-generation
# Conflicts:
# src/main/resources/db/changelog-20190505_000000-schema.xml
# src/main/resources/db/changelog-master.xml
|
5 years ago |
|
ASH
|
c59bb45c70
|
#79 fixing codestyle
|
5 years ago |
|
ASH
|
0de34c89fe
|
#79 fixing planner and year generation
|
5 years ago |
|
Nightblade73
|
b2e8a43cee
|
#103 delete conf test
|
5 years ago |
|
Nightblade73
|
6edcf8f594
|
#103 add sort and filter test, fixed delete conference, if it has fk with event
|
5 years ago |
|
Nightblade73
|
4e4e7ae194
|
#103 add paper transition
|
5 years ago |
|
Nightblade73
|
cad8682088
|
#103 add adding article
|
5 years ago |
|
Nightblade73
|
d9a4224317
|
#103 add attach article
|
5 years ago |
|
Nightblade73
|
7b4318a3b5
|
#103 add delete deadline
|
5 years ago |
|
Nightblade73
|
0cb7b05c25
|
#103 add check take part
|
5 years ago |
|
Nightblade73
|
253f4b4aad
|
#103 add check new deadline
|
5 years ago |
|
Nightblade73
|
1ad66d6fb1
|
#103 change name method test
|
5 years ago |
|
Nightblade73
|
961fdf9397
|
#70 added conference class, added create method test
|
5 years ago |
|
T-Midnight
|
77e2ad0651
|
#119 add send notification functions
|
5 years ago |
|
T-Midnight
|
74a8dcbd8a
|
#119 add leader changed notification
|
5 years ago |
|
T-Midnight
|
4262446aef
|
#119 create all mail templates
|
5 years ago |
|
T-Midnight
|
b640dea99a
|
#119 create scheduler
|
5 years ago |
|
T-Midnight
|
2d9fd05060
|
#119 create grantCreateNotification mail template
|
5 years ago |
|
Nightblade73
|
b57142e28f
|
#70 added unique name control
|
5 years ago |
|
T-Midnight
|
e3ad5ba510
|
Merge remote-tracking branch 'remotes/origin/dev' into 119-notification-grants
|
5 years ago |
|
Anton Romanov
|
09aa3d0084
|
Merge branch '122-bug-leader-grants' into 'dev'
Resolve "Bug: не отображается cписок грантов"
Closes #122
See merge request romanov73/ng-tracker!88
|
5 years ago |
Семенова Мария
|
2fba252df0
|
#109 show other paper attachs
|
5 years ago |
|
T-Midnight
|
7ffe04f1db
|
#122 move to right directory
|
5 years ago |
|
T-Midnight
|
d244437858
|
#122 fix bug
|
5 years ago |
|
T-Midnight
|
934d194df1
|
#119 gelete unnecessary column
|
5 years ago |
|
Семенова Мария
|
1e07c5424d
|
#109 only one conference for paper
|
5 years ago |
|
Семенова Мария
|
dffd839905
|
#109 only uncompleted for grant
|
5 years ago |
Васин Антон
|
279cc0e18a
|
#101 project model edited
|
5 years ago |
|
Васин Антон
|
b1e101c940
|
#101 db event edited
|
5 years ago |
|
T-Midnight
|
2dae39a100
|
#119 create grants notification service
|
5 years ago |
|
Васин Антон
|
241c489b21
|
#98 deadline edited
|
5 years ago |
|
Васин Антон
|
4025aa67ca
|
#98 project completion added
|
5 years ago |
|
ASH
|
65dea9bce2
|
#79 adding task planer generation
|
5 years ago |
|
Васин Антон
|
4bab980f62
|
#98 deadline model and service edited
|
5 years ago |
|
Васин Антон
|
ee55e08fee
|
#98 project tasks deadline edited
|
5 years ago |
|
T-Midnight
|
da382b659a
|
#32 add deadlines on timeline page
|
5 years ago |
|
T-Midnight
|
114f6769ac
|
#32 create changelog
|
5 years ago |
|
T-Midnight
|
beb334f2fa
|
#32 add variable "events"
|
5 years ago |
|
Anton Romanov
|
68737b976f
|
Merge branch '117-filter-users' into 'dev'
Resolve "Фильтрация участников гранта по двум новым параметрам"
Closes #117
See merge request romanov73/ng-tracker!77
|
5 years ago |
|
T-Midnight
|
74d43dcd0d
|
#117 resolve last discussion
|
5 years ago |
|
T-Midnight
|
0955388f27
|
#117 fix port
|
5 years ago |
|
T-Midnight
|
de625923e9
|
#117 resolve discussions v.2
|
5 years ago |
|
T-Midnight
|
b334b5d70e
|
#117 resolve discussions
|
5 years ago |
|
T-Midnight
|
8b333ab3a6
|
Merge branch '38-attach-file-grants' into 117-filter-users
|
5 years ago |
|
Nightblade73
|
6350e1c0d6
|
#70 add hashCode for deadline
|
5 years ago |
|
Nightblade73
|
6820c617f3
|
#70 remove conflicts
|
5 years ago |
|
Nightblade73
|
60bdd9d233
|
#70 fixes
|
5 years ago |
|
T-Midnight
|
c8cfde67a9
|
Merge remote-tracking branch 'remotes/origin/dev' into 38-attach-file-grants
|
5 years ago |
|
T-Midnight
|
1f6d15b74b
|
#38 create changelogs
|
5 years ago |
|
T-Midnight
|
a69a257f09
|
#38 add styles
|
5 years ago |
|
T-Midnight
|
6442a67ff1
|
#38 update view
|
5 years ago |
|
T-Midnight
|
2ebd61016d
|
#38 add variable "files"
|
5 years ago |
|
ASH
|
7ce8b20841
|
#79 fixing bug
|
5 years ago |
|
Nightblade73
|
0e062f1337
|
#70 fast fix
|
5 years ago |
|
Nightblade73
|
9edcf35338
|
#70 added ping notification
|
5 years ago |
|
Васин Антон
|
5c677a975c
|
#114 changelog edited
|
5 years ago |
|
ASH
|
b4c11a7f90
|
#79 year generation
|
5 years ago |
|
Nightblade73
|
0e8752e460
|
#70 style fixes
|
5 years ago |
|
Nightblade73
|
e178cd1639
|
#70 added checking empty fields of deadline, fix bug on EventDto
|
5 years ago |
|
T-Midnight
|
9cf002ad95
|
Merge remote-tracking branch 'remotes/origin/dev' into 117-filter-users
|
5 years ago |
|
T-Midnight
|
39f3c69479
|
#117 add scopus papers filter
|
5 years ago |
|
Nightblade73
|
dbcdb96dbf
|
#70 added event method, don't work, because trying to find null entity
|
5 years ago |
|
Семенова Мария
|
a8fbf98d85
|
#118 check if next deadline present
|
5 years ago |
|
Nightblade73
|
51877023d1
|
#70 added new column to event
|
5 years ago |
|
T-Midnight
|
51e121ae24
|
#117 add BAK papers filter
|
5 years ago |
|
Семенова Мария
|
8f3e3fd9a7
|
#108 add formatting methods
|
5 years ago |
|
Семенова Мария
|
71ec7bb726
|
#108 add reference dto
|
5 years ago |
|
Nightblade73
|
34925b81ff
|
#70 added schedule for deadline of conference
|
5 years ago |
|
Nightblade73
|
16e9bf1fb5
|
#70 added update notification for all participants
|
5 years ago |
|
Nightblade73
|
c489ebbf91
|
#70 added create notification for all users about new conference
|
5 years ago |
|
Anton Romanov
|
88ec35faa0
|
Merge branch '68-ping-conf' into 'dev'
Resolve "Ping конференции в списке конференций"
Closes #68
See merge request romanov73/ng-tracker!69
|
5 years ago |
|
T-Midnight
|
7853496048
|
#116 add style for delete icon
|
5 years ago |
|
T-Midnight
|
2bb5189fff
|
#116 update view
|
5 years ago |
|
T-Midnight
|
4fa0c14ae6
|
#116 add removeDeadline method
|
5 years ago |
|
T-Midnight
|
7c5a0826c5
|
#116 add new variable
|
5 years ago |
|
T-Midnight
|
8ced83ad2b
|
#116 delete annotation
|
5 years ago |
|
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
|
5 years ago |
|
Nightblade73
|
b77619777e
|
#68 added dashboard-card styles depending on the conference.ping count
|
5 years ago |
|
Nightblade73
|
70d260c34b
|
#68 ping but style
|
5 years ago |
|
Nightblade73
|
d4b514a9b0
|
#68 added ping in db
|
5 years ago |
|
Nightblade73
|
d921def09d
|
#68 added ping method
|
5 years ago |
|
Nightblade73
|
f556b969b4
|
#68 added demo version of charts, using highcharts lib
|
5 years ago |
|
Nightblade73
|
b16b3ed2e3
|
#68 added class structure
|
5 years ago |
|
Nightblade73
|
5bff419dbd
|
#68 added ping table
|
5 years ago |
|
Anton Romanov
|
4dd0a6c210
|
fix merge bug
|
5 years ago |
|
Anton Romanov
|
bb2518e5f4
|
Merge branch '76-students-tags-filter' into 'dev'
Resolve "Фильтр задач по типу (тегам)"
Closes #77, #75, and #76
See merge request romanov73/ng-tracker!61
|
5 years ago |
|
Anton Romanov
|
1e6fbdc1fa
|
Merge branch '64-add-article-conf' into 'dev'
Resolve "Добавить новую статью к конференции"
Closes #64
See merge request romanov73/ng-tracker!70
|
5 years ago |
|
Anton Romanov
|
54c6fe815d
|
Merge branch '113-delete-project' into 'dev'
Resolve "Реализовать удаление проекта"
Closes #113
See merge request romanov73/ng-tracker!71
|
5 years ago |
|
Nightblade73
|
d37c9bda57
|
#64 excluded adding articles with the same name
|
5 years ago |
|
Nightblade73
|
fe55890518
|
#64 more style fixes
|
5 years ago |
|
Nightblade73
|
7eb5dce94e
|
#64 style fixes
|
5 years ago |
|
ASH
|
7248a84c30
|
#76 adding sorting
|
5 years ago |
|
Васин Антон
|
02d643727e
|
#113 projects/projects edited
|
5 years ago |
|
Васин Антон
|
50a0f8aa78
|
#113 projects.js added
|
5 years ago |
|
Васин Антон
|
2418e953be
|
#113 line fragment edited
|
5 years ago |
|
Васин Антон
|
e32da7c7c2
|
#113 delete function
|
5 years ago |
|
Anton Romanov
|
8f2f6adc3b
|
#64 show global message
|
5 years ago |
|
T-Midnight
|
c18ecea13b
|
#115 move method to service
|
5 years ago |
|
T-Midnight
|
bf515a3fcb
|
Merge remote-tracking branch 'remotes/origin/107-attach-article' into 115-follow-up-from-resolve
|
5 years ago |
|
Васин Антон
|
2f3c1addbb
|
#114 unused imports removed
|
5 years ago |
|
Васин Антон
|
c78ea05255
|
#114 update edited
|
5 years ago |
|
T-Midnight
|
26969dba5b
|
#107 merge with dev
|
5 years ago |
|
T-Midnight
|
6df1a87367
|
#107 merge with dev
|
5 years ago |
|
T-Midnight
|
546b0dc323
|
#107 add styles
|
5 years ago |
|
Васин Антон
|
41bd00d645
|
project dashboard edited
|
5 years ago |
|
Nightblade73
|
6d6ea3136d
|
#64 dont show error message
|
5 years ago |
|
T-Midnight
|
d3b8be2cf1
|
#107 add view of the selected papers
|
5 years ago |
|
Васин Антон
|
019fe7c652
|
#97 adding deadlines
|
5 years ago |
|
ASH
|
3698d31bc8
|
#76 fixing conflicts
|
5 years ago |