Anton Romanov
|
7695e93cb7
|
fix logo url
|
2019-05-06 14:20:19 +04:00 |
|
Anton Romanov
|
8906214f52
|
fix dashboard
|
2019-05-06 14:06:51 +04:00 |
|
Anton Romanov
|
4d7777831f
|
Merge remote-tracking branch 'origin/try-vue' into try-vue
|
2019-05-02 23:15:07 +04:00 |
|
Anton Romanov
|
e3b6c02f56
|
#partilly add paper dashboard
|
2019-05-02 23:06:57 +04:00 |
|
Anton Romanov
|
0c81689fd3
|
align authors line
|
2019-04-30 22:12:16 +04:00 |
|
Anton Romanov
|
0d5f15614e
|
#add paper navigation
|
2019-04-30 19:12:32 +04:00 |
|
Anton Romanov
|
181b14d2e7
|
#fix paper status
|
2019-04-30 19:04:37 +04:00 |
|
Anton Romanov
|
9c5c107c58
|
#fix controllers
|
2019-04-30 17:54:07 +04:00 |
|
Anton Romanov
|
a4cbb3e3df
|
#show paper list
|
2019-04-30 17:36:25 +04:00 |
|
Anton Romanov
|
ac88ef2704
|
add dependencies, fix html
|
2019-04-26 14:42:44 +04:00 |
|
Anton Romanov
|
ae102d6466
|
#fix styles
|
2019-04-26 13:37:24 +04:00 |
|
Anton Romanov
|
a7ceebb7c5
|
#first try to show index page
|
2019-04-26 13:02:59 +04:00 |
|
Anton Romanov
|
a352f561fa
|
Merge branch '118-bug-create-paper-notification' into 'dev'
Resolve "Bug: не отправляется сообщение о создании новой статьи"
Closes #118
See merge request romanov73/ng-tracker!79
|
2019-04-26 07:57:36 +00:00 |
|
Семенова Мария
|
a8fbf98d85
|
#118 check if next deadline present
|
2019-04-26 10:37:50 +04:00 |
|
Anton Romanov
|
1fe2f5469b
|
Merge branch '108-references-formatting' into 'dev'
Resolve "Форматирование списка литературы"
Closes #108
See merge request romanov73/ng-tracker!78
|
2019-04-26 04:24:09 +00: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 |
|
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 |
|
Anton Romanov
|
fc94ea1f26
|
Merge branch '116-delete-deadline' into 'dev'
Resolve "Удаление дедлайна"
Closes #116
See merge request romanov73/ng-tracker!75
|
2019-04-25 09:48:38 +00:00 |
|
T-Midnight
|
7853496048
|
#116 add style for delete icon
|
2019-04-25 13:26:40 +04:00 |
|
T-Midnight
|
2bb5189fff
|
#116 update view
|
2019-04-25 13:25:56 +04: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
|
b77619777e
|
#68 added dashboard-card styles depending on the conference.ping count
|
2019-04-24 22:34:56 +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 |
|
Nightblade73
|
5bff419dbd
|
#68 added ping table
|
2019-04-24 16:44:17 +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
|
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
|
3aea19088d
|
Merge branch '115-follow-up-from-resolve' into 'dev'
Resolve "Follow-up from "Resolve "Прикрепление статей к гранту"""
Closes #115
See merge request romanov73/ng-tracker!73
|
2019-04-23 19:17:17 +00: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 |
|
Anton Romanov
|
39f44403c1
|
Merge branch '114-bug-projects-list' into 'dev'
Resolve "Bug: не отображается список проектов"
Closes #114
See merge request romanov73/ng-tracker!72
|
2019-04-23 12:14:22 +00:00 |
|
Васин Антон
|
2f3c1addbb
|
#114 unused imports removed
|
2019-04-23 14:20:17 +03:00 |
|