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
|
3aea19088d
|
Merge branch '115-follow-up-from-resolve' into 'dev'
Resolve "Follow-up from "Resolve "Прикрепление статей к гранту"""
Closes #115
See merge request romanov73/ng-tracker!73
|
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 |
|
Васин Антон
|
2d6de6b535
|
Merge branch 'dev' of https://gitlab.com/romanov73/ng-tracker into dev
|
5 years ago |
|
Anton Romanov
|
39f44403c1
|
Merge branch '114-bug-projects-list' into 'dev'
Resolve "Bug: не отображается список проектов"
Closes #114
See merge request romanov73/ng-tracker!72
|
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 |
|
Васин Антон
|
70920cc612
|
Merge branch 'dev' of https://gitlab.com/romanov73/ng-tracker into dev
|
5 years ago |
|
T-Midnight
|
d3b8be2cf1
|
#107 add view of the selected papers
|
5 years ago |
|
Anton Romanov
|
5e86952cb6
|
Merge branch '97-edit-project' into 'dev'
Resolve "Редактирование проекта"
Closes #97
See merge request romanov73/ng-tracker!59
|
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 |
|
Anton Romanov
|
7fac92b52f
|
Merge branch '110-paper-type' into 'dev'
Resolve "Тип статьи"
Closes #110
See merge request romanov73/ng-tracker!67
|
5 years ago |
|
ASH
|
6876d09557
|
#76 adding style to filters
|
5 years ago |
|
Nightblade73
|
ddd21dab1c
|
#60 added dashboard
|
5 years ago |