Семенова Мария
|
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 |
|
T-Midnight
|
2dae39a100
|
#119 create grants notification service
|
5 years ago |
ASH
|
65dea9bce2
|
#79 adding task planer generation
|
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 |
|
Nightblade73
|
53cc777734
|
#64 delete conference refactor
|
5 years ago |
|
Васин Антон
|
53cc947a17
|
#97 copy from DTO edited
|
5 years ago |
|
Васин Антон
|
ba565746f5
|
#97 dashboard added
|
5 years ago |
|
Васин Антон
|
519dd51446
|
#97 dashboard added
|
5 years ago |
|
Васин Антон
|
349e7373ff
|
#97 save function
|
5 years ago |
|
Nightblade73
|
2767403128
|
#64 added saving in db
|
5 years ago |
|
Nightblade73
|
5bfeaff054
|
#64 added method addPaper
|
5 years ago |
|
Anton Romanov
|
b6ced3ce1a
|
Merge branch '60-sort-conf' into 'dev'
Resolve "Сортировка списка конференций"
Closes #60
See merge request romanov73/ng-tracker!66
|
5 years ago |
|
ASH
|
6876d09557
|
#76 adding style to filters
|
5 years ago |
|
Nightblade73
|
ddd21dab1c
|
#60 added dashboard
|
5 years ago |
|
ASH
|
8400c5d40d
|
Merge remote-tracking branch 'remotes/origin/dev' into 76-students-tags-filter
# Conflicts:
# src/main/resources/templates/students/dashboard.html
|
5 years ago |
|
Nightblade73
|
a4ae42f072
|
#60 added sorting
|
5 years ago |
|
Семенова Мария
|
a3d1834ab8
|
#110 add paper type
|
5 years ago |
|
Nightblade73
|
a9f4a326c5
|
#59 fixed styles
|
5 years ago |
|
Nightblade73
|
338d7c2e09
|
#59 added begin-end dates in conferenceRow
|
5 years ago |
|
T-Midnight
|
eec739a49f
|
#41 create simple attach of articles
|
5 years ago |
|
T-Midnight
|
f29d31b840
|
#41 create changelog
|
5 years ago |
|
Nightblade73
|
34033fac5f
|
#59 added filtration
|
5 years ago |
|
Nightblade73
|
e2b49689d5
|
#59 changed filterDto
|
5 years ago |
|
Nightblade73
|
9f664b2618
|
#59 add front thymeleaf
|
5 years ago |
|
Anton Romanov
|
21ba06170a
|
Merge branch '106-papers-bug' into 'dev'
Resolve "Bug: не отображается список статей"
Closes #106
See merge request romanov73/ng-tracker!62
|
5 years ago |
|
Anton Romanov
|
9e31bfa7d7
|
#106 add checkstyle rules
|
5 years ago |
|
Anton Romanov
|
2d0f2aeecd
|
Merge branch '69-take-part-conf' into 'dev'
Resolve "Принять участие в конференции пользователю"
Closes #69
See merge request romanov73/ng-tracker!56
|
5 years ago |
|
Nightblade73
|
b623402aa8
|
#69 changed method getConference in controller
|
5 years ago |
|
Nightblade73
|
9edcebb2f5
|
#69 changed isCurrentUserParticipant
|
5 years ago |
|
Nightblade73
|
713e50043e
|
Merge remote-tracking branch 'remotes/origin/dev' into 69-take-part-conf
# Conflicts:
# src/main/resources/db/changelog-master.xml
|
5 years ago |
|
T-Midnight
|
f387b4eb52
|
#41 add link to the grant page
|
5 years ago |
|
Семенова Мария
|
6c8554a0b8
|
#106 change boolean to nullable
|
5 years ago |
|
ASH
|
7bec7b4e44
|
#76 filters added
|
5 years ago |
|
Anton Romanov
|
5a55e3cfc8
|
Merge branch '42--2' into 'dev'
Resolve "Форма добавления и фильтра участников гранта"
Closes #42
See merge request romanov73/ng-tracker!44
|
5 years ago |
|
T-Midnight
|
958a0d461b
|
#42 merge with dev
|
5 years ago |
|
T-Midnight
|
416ad7eeda
|
#42 merge with dev
|
5 years ago |
|
ASH
|
59887e5141
|
#76 delete function added
|
5 years ago |
|
ASH
|
9da227ab34
|
#76 fixing dashboard
|
5 years ago |
|
Семенова Мария
|
6c6a748978
|
#105 danger message type
|
5 years ago |
|
Семенова Мария
|
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
|
5 years ago |
|
Васин Антон
|
f1f7c1f0f6
|
#97 cancel button edited
|
5 years ago |
|
Nightblade73
|
96431701df
|
#69 added button disabling take part, if cur user already taken part
|
5 years ago |
|
Nightblade73
|
8fd352aaa4
|
#69 added styles
|
5 years ago |
|
Anton Romanov
|
8474fb492f
|
Merge branch '96-edit-project-page' into 'dev'
Resolve "Страница редактирования проекта"
Closes #96
See merge request romanov73/ng-tracker!57
|
5 years ago |
|
Васин Антон
|
d015b02862
|
#96 removed wildcards from imports
|
5 years ago |
|
Васин Антон
|
ced3b0a978
|
#96 database edited
|
5 years ago |
|
T-Midnight
|
e284298200
|
#42 rename variables
|
5 years ago |
|
Васин Антон
|
b722687050
|
#96 edit project page
|
5 years ago |
|
Nightblade73
|
918079ac89
|
#69 fixed not working code, now user can take part in conference and choose participation and deposit
|
5 years ago |
|
Семенова Мария
|
789fda9c98
|
remove nonstopmode from bibtex
|
5 years ago |
|
Anton Romanov
|
5b89ed7284
|
#102 fix code style
|
5 years ago |
|
Anton Romanov
|
cfbe36197b
|
#102 add auto tests
|
5 years ago |
|
Васин Антон
|
e85c814f70
|
#96 project comment added
|
5 years ago |
|
Васин Антон
|
255692d6ea
|
#96 project status added
|
5 years ago |
|
Васин Антон
|
f079e34a57
|
#96 project title added
|
5 years ago |
|
Васин Антон
|
4ea40931eb
|
#96 project status fragment added
|
5 years ago |
|
Васин Антон
|
a89d93a9b0
|
#96 project line fragment added
|
5 years ago |
|
Nightblade73
|
7e4d8d4918
|
#69 added method take part in conference
|
5 years ago |
|
Васин Антон
|
ca3e87a8c5
|
#96 edit project blank page
|
5 years ago |
|
T-Midnight
|
506fa01fab
|
Revert: #42 merge with dev
|
5 years ago |
|
T-Midnight
|
97d7d00098
|
#42 merge with dev
|
5 years ago |
|
T-Midnight
|
1e6b3cba3a
|
#42 delete blank lines, fix js, fix leaderId validation
|
5 years ago |
|
Nightblade73
|
8564f2cf34
|
#69 managed to create a connection through a new entity
|
5 years ago |
|
Anton Romanov
|
487aa578a7
|
Merge branch '86-projects-main-page' into 'dev'
Resolve "Создать страницу списка проектов"
Closes #86
See merge request romanov73/ng-tracker!53
|
5 years ago |
|
Васин Антон
|
f5c1bb940c
|
#86 projects main page
|
5 years ago |
|
Nightblade73
|
14c28050c7
|
#65 changed interface
|
5 years ago |
|
Nightblade73
|
81d07645c2
|
#65 added delete method of article, fixed copyFromDto method
|
5 years ago |
|
Anton Romanov
|
3facc0c26e
|
Merge branch '74-students-add-new-task' into 'dev'
Resolve "Добавление новой задачи"
Closes #78 and #74
See merge request romanov73/ng-tracker!47
|
5 years ago |
|
Anton Romanov
|
d81d1cf72c
|
#74 some code fixes
|
5 years ago |
|
Nightblade73
|
d4b38d314f
|
#66 fixed bug, when attach-article lose what needed to attach after add or remove deadline
|
5 years ago |
anastasia shulga
|
95f70f425a
|
Update2 TagService.java
|
5 years ago |
|
anastasia shulga
|
dbd61ce80c
|
Update TagService.java
|
5 years ago |