Nightblade73
|
8b52518c4a
|
#125 check method
|
2019-05-21 15:53:42 +04:00 |
|
Artem.Arefev
|
d7c4e6b222
|
#91 base users dashboard
|
2019-05-21 02:09:07 +04:00 |
|
T-Midnight
|
bb9f412480
|
#120 check unique grant name
|
2019-05-20 20:49:03 +04:00 |
|
T-Midnight
|
c0e66e81a2
|
#120 drop unnecessary table column
|
2019-05-20 20:47:10 +04:00 |
|
Artem.Arefev
|
e468646cd6
|
89 removed getCurrentUser
|
2019-05-19 00:47:49 +04:00 |
|
Artem.Arefev
|
90799356ab
|
89 password reset
|
2019-05-19 00:42:24 +04:00 |
|
Anton Romanov
|
d076f35ff7
|
fix user timetable url
|
2019-05-18 13:00:02 +04:00 |
|
Artem.Arefev
|
532e007b0b
|
87 merged with dev
|
2019-05-17 14:31:08 +04:00 |
|
Anton Romanov
|
3dbf635fb6
|
Merge branch '88-change-password' into 'dev'
Resolve "Смена пароля"
Closes #88
See merge request romanov73/ng-tracker!96
|
2019-05-17 10:23:24 +00:00 |
|
Artem.Arefev
|
3da374326b
|
88 replacing all alerts in users.js
|
2019-05-17 14:16:41 +04:00 |
|
Васин Антон
|
f960d4de1b
|
#98 deadline model edited
|
2019-05-17 11:30:26 +03:00 |
|
Artem.Arefev
|
740adc5318
|
88 js using showFeedbackMessage
|
2019-05-17 12:23:45 +04:00 |
|
Artem.Arefev
|
b8281c527a
|
87 removed unused imports
|
2019-05-17 12:20:55 +04:00 |
|
Artem.Arefev
|
7163937a53
|
87 using showFeedBackMessage
|
2019-05-17 12:20:08 +04:00 |
|
Васин Антон
|
097f7827b0
|
#98 db edited
|
2019-05-17 10:30:34 +03:00 |
|
Anton Romanov
|
83aba158b6
|
Merge branch '104-module-test-conf' into 'dev'
Resolve "Реализовать модульные тесты"
See merge request romanov73/ng-tracker!92
|
2019-05-17 07:27:21 +00:00 |
|
Artem.Arefev
|
76d3adb464
|
87 small fix whitespace
|
2019-05-17 08:58:27 +04:00 |
|
Artem.Arefev
|
64357c2508
|
88 fixed changePassword request data
|
2019-05-17 04:35:33 +04:00 |
|
Artem.Arefev
|
6a62e61caf
|
87 error handling + ajax + rest
|
2019-05-17 04:34:03 +04:00 |
|
Artem.Arefev
|
fbd618a6d0
|
88 changed error text to russian
|
2019-05-17 03:59:09 +04:00 |
|
Artem.Arefev
|
052e4a1aef
|
88 rest changePassword + ajax
|
2019-05-17 03:55:22 +04:00 |
|
Artem.Arefev
|
4fc8bc3717
|
Merge branch '87-inviting-user' into 88-change-password
|
2019-05-17 02:01:56 +04:00 |
|
Artem.Arefev
|
728fa42972
|
87 error handling
|
2019-05-17 02:01:26 +04:00 |
|
Nightblade73
|
dc34c7bfb7
|
#104 fixed conference-row style
|
2019-05-16 18:07:18 +04:00 |
|
Nightblade73
|
5263393379
|
#104 remove chart example from dashboard
|
2019-05-16 17:55:34 +04:00 |
|
Nightblade73
|
80de18d3ee
|
#104 create fixed, remove update
|
2019-05-16 16:31:10 +04:00 |
|
Nightblade73
|
bde9cb51fb
|
#104 some methods fixed
|
2019-05-16 15:55:29 +04:00 |
|
Nightblade73
|
c0937d721a
|
#104 removePaper, addPaper, takePart fixed
|
2019-05-16 15:35:32 +04:00 |
|
Nightblade73
|
ce7b4c9c7a
|
#104 addDeadline, removeDeadline fixed
|
2019-05-16 13:33:26 +04:00 |
|
Artem.Arefev
|
c47d4f8a05
|
#88 removed unused imports
|
2019-05-16 01:17:04 +04:00 |
|
Artem.Arefev
|
33f62c04e7
|
Merge branch '87-inviting-user' into 88-change-password
|
2019-05-16 01:03:14 +04:00 |
|
Artem.Arefev
|
d50673f5fa
|
87-inviting-user small fix in mail template, and changed default user name
|
2019-05-16 01:01:31 +04:00 |
|
Artem.Arefev
|
f8f501b8ff
|
88-change-password base
|
2019-05-16 00:38:53 +04:00 |
|
ASH
|
cd1caa559e
|
Merge branch 'dev' into 79-students-tags-generation
# Conflicts:
# src/main/java/ru/ulstu/students/service/TaskService.java
|
2019-05-16 00:14:05 +04:00 |
|
ASH
|
bc9cca62d6
|
#79 refactoring
|
2019-05-15 23:47:05 +04:00 |
|
Artem.Arefev
|
3226cc3971
|
87 fixed UserControllerV2 logger
|
2019-05-15 22:27:06 +04:00 |
|
Artem.Arefev
|
48a18a3a57
|
87 fixed imports
|
2019-05-15 22:24:19 +04:00 |
|
Artem.Arefev
|
d88f67ce00
|
87 transactional inviting
|
2019-05-15 03:08:21 +04:00 |
|
Artem.Arefev
|
11ef644e5e
|
88 inviting user base
|
2019-05-15 02:48:44 +04:00 |
|
Nightblade73
|
1e06edfcc0
|
Merge remote-tracking branch 'remotes/origin/dev' into 104-module-test-conf
# Conflicts:
# src/main/java/ru/ulstu/conference/service/ConferenceService.java
|
2019-05-15 01:28:08 +04:00 |
|
Nightblade73
|
7952787229
|
#104 add new tests, fixes
|
2019-05-15 01:14:02 +04:00 |
|
Nightblade73
|
00c5d5f755
|
#104 test refactoring
|
2019-05-15 00:54:30 +04:00 |
|
Artem.Arefev
|
95fc9da47d
|
lk base, created from dev
|
2019-05-15 00:49:54 +04:00 |
|
Nightblade73
|
11cab955b4
|
#104 test create
|
2019-05-14 18:51:03 +04:00 |
|
Nightblade73
|
c88c77cd7d
|
#104 test find one dto
|
2019-05-14 18:20:01 +04:00 |
|
Nightblade73
|
a8d987b01f
|
#104 test copy from dto method
|
2019-05-14 17:49:22 +04:00 |
|
Nightblade73
|
9da5fd8a7a
|
#104 shock, the first unit test works
|
2019-05-14 00:02:30 +04:00 |
|
Anton Romanov
|
51851baa48
|
Merge branch '103-autotest-conf' into 'dev'
Resolve "Реализовать интеграционные автотесты для проверки модулей"
See merge request romanov73/ng-tracker!90
|
2019-05-13 19:46:29 +00:00 |
|
Anton Romanov
|
10a9bd7a28
|
Merge branch '111-unique-name-control-conf' into 'dev'
Resolve "Контроль уникальности названия"
See merge request romanov73/ng-tracker!86
|
2019-05-13 19:20:44 +00:00 |
|
Nightblade73
|
58a8495835
|
Merge remote-tracking branch 'remotes/origin/dev' into 103-autotest-conf
# Conflicts:
# src/main/java/ru/ulstu/timeline/service/EventService.java
|
2019-05-13 20:27:52 +04:00 |
|
Nightblade73
|
ab59cb524e
|
#103 fix code style
|
2019-05-13 20:26:13 +04:00 |
|
Nightblade73
|
6044d6f8e3
|
#111 save method refactor
|
2019-05-13 19:08:21 +04:00 |
|
Anton Romanov
|
a3afdeb988
|
Merge branch '123-student-task-timeline' into 'dev'
Resolve "Добавление таймлайна для дедлайнов задач"
Closes #123
See merge request romanov73/ng-tracker!91
|
2019-05-13 07:15:57 +00:00 |
|
T-Midnight
|
f6830d499b
|
#121 update view
|
2019-05-12 15:31:50 +04:00 |
|
T-Midnight
|
99ec7af319
|
#121 reduce paper title
|
2019-05-12 15:30:09 +04:00 |
|
T-Midnight
|
e1907d3169
|
#121 change Paper to PaperDto in attaching papers
|
2019-05-12 15:28:47 +04:00 |
|
ASH
|
5b4180e685
|
#123 fixing layout
|
2019-05-12 11:04:43 +04:00 |
|
ASH
|
a11e10dec4
|
#123 adding task timeline
|
2019-05-12 01:00:26 +04:00 |
|
Nightblade73
|
d846192046
|
#111 fixes
|
2019-05-12 00:28:03 +04:00 |
|
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
|
2019-05-11 23:26:21 +04:00 |
|
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 |
|
Nightblade73
|
4e4e7ae194
|
#103 add paper transition
|
2019-05-10 20:54:43 +04:00 |
|
Nightblade73
|
cad8682088
|
#103 add adding article
|
2019-05-10 20:07:55 +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
|
4262446aef
|
#119 create all mail templates
|
2019-05-09 01:21:56 +04:00 |
|
T-Midnight
|
b640dea99a
|
#119 create scheduler
|
2019-05-09 00:45:54 +04:00 |
|
T-Midnight
|
2d9fd05060
|
#119 create grantCreateNotification mail template
|
2019-05-08 23:32:37 +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 |
|
Anton Romanov
|
09aa3d0084
|
Merge branch '122-bug-leader-grants' into 'dev'
Resolve "Bug: не отображается cписок грантов"
Closes #122
See merge request romanov73/ng-tracker!88
|
2019-05-08 09:25:37 +00:00 |
|
Семенова Мария
|
2fba252df0
|
#109 show other paper attachs
|
2019-05-07 23:53:10 +04:00 |
|
T-Midnight
|
7ffe04f1db
|
#122 move to right directory
|
2019-05-07 22:47:27 +04:00 |
|
T-Midnight
|
d244437858
|
#122 fix bug
|
2019-05-07 22:35:44 +04:00 |
|
T-Midnight
|
934d194df1
|
#119 gelete unnecessary column
|
2019-05-07 22:15:49 +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 |
|
Васин Антон
|
b1e101c940
|
#101 db event edited
|
2019-05-07 13:34:00 +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
|
114f6769ac
|
#32 create changelog
|
2019-05-05 23:54:02 +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
|
0955388f27
|
#117 fix port
|
2019-05-02 22:00:53 +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
|
c8cfde67a9
|
Merge remote-tracking branch 'remotes/origin/dev' into 38-attach-file-grants
|
2019-05-01 00:21:56 +04:00 |
|
T-Midnight
|
1f6d15b74b
|
#38 create changelogs
|
2019-04-30 23:55:31 +04:00 |
|
T-Midnight
|
a69a257f09
|
#38 add styles
|
2019-04-30 23:43:47 +04:00 |
|
T-Midnight
|
6442a67ff1
|
#38 update view
|
2019-04-30 23:41:51 +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 |
|
Васин Антон
|
5c677a975c
|
#114 changelog edited
|
2019-04-30 01:01:30 +03: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 |
|
Семенова Мария
|
a8fbf98d85
|
#118 check if next deadline present
|
2019-04-26 10:37:50 +04:00 |
|
Anton Romanov
|
4d2d7fa113
|
fix lambda
|
2019-04-26 09:47:41 +04:00 |
|
Anton Romanov
|
9393fbe326
|
fix deprecated imports
|
2019-04-26 09:46:38 +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
|
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
|
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 |
|
T-Midnight
|
546b0dc323
|
#107 add styles
|
2019-04-23 14:51:51 +04:00 |
|
Васин Антон
|
41bd00d645
|
project dashboard edited
|
2019-04-23 13:40:11 +03:00 |
|
Anton Romanov
|
955bdaa438
|
fix repository method
|
2019-04-23 13:55:59 +04:00 |
|
Anton Romanov
|
60dfad5d76
|
Merge branch 'dev' into move-to-jdk11
# Conflicts:
# src/main/resources/db/changelog-master.xml
|
2019-04-23 13:51:21 +04: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 |
|
Anton Romanov
|
7684bac74d
|
Merge branch 'dev' into move-to-jdk11
# Conflicts:
# build.gradle
# src/main/java/ru/ulstu/grant/model/GrantDto.java
# src/main/java/ru/ulstu/grant/service/GrantService.java
# src/main/java/ru/ulstu/paper/model/PaperDto.java
# src/main/java/ru/ulstu/project/model/Project.java
|
2019-04-23 11:35:41 +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 |
|
Васин Антон
|
519dd51446
|
#97 dashboard added
|
2019-04-22 14:31:46 +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 |
|
T-Midnight
|
f29d31b840
|
#41 create changelog
|
2019-04-19 17:45:22 +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 |
|
Nightblade73
|
9f664b2618
|
#59 add front thymeleaf
|
2019-04-19 17:30: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 |
|
Anton Romanov
|
2d0f2aeecd
|
Merge branch '69-take-part-conf' into 'dev'
Resolve "Принять участие в конференции пользователю"
Closes #69
See merge request romanov73/ng-tracker!56
|
2019-04-19 13:05:07 +00: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 |
|
T-Midnight
|
f387b4eb52
|
#41 add link to the grant page
|
2019-04-19 11:36:27 +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
|
958a0d461b
|
#42 merge with dev
|
2019-04-18 22:35:07 +04: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 |
|
ASH
|
9da227ab34
|
#76 fixing dashboard
|
2019-04-18 21:38:55 +04:00 |
|