Anton Romanov
|
36c4e52e37
|
Merge branch 'dev' into move-to-jdk11
# Conflicts:
# src/main/java/ru/ulstu/conference/service/ConferenceService.java
# src/main/java/ru/ulstu/grant/model/Grant.java
# src/main/java/ru/ulstu/grant/service/GrantService.java
# src/main/java/ru/ulstu/paper/model/Paper.java
# src/main/java/ru/ulstu/paper/service/PaperService.java
# src/main/java/ru/ulstu/project/model/Project.java
# src/main/java/ru/ulstu/project/model/ProjectDto.java
# src/main/java/ru/ulstu/students/model/Task.java
# src/main/java/ru/ulstu/students/service/TaskService.java
# src/main/java/ru/ulstu/timeline/model/Event.java
# src/main/java/ru/ulstu/timeline/model/EventDto.java
# src/main/java/ru/ulstu/timeline/service/EventService.java
# src/main/java/ru/ulstu/user/service/UserService.java
# src/main/resources/application.properties
# src/main/resources/db/changelog-master.xml
# src/main/resources/public/css/conference.css
# src/main/resources/public/js/conference.js
# src/main/resources/public/js/tasks.js
# src/main/resources/templates/conferences/conference.html
# src/main/resources/templates/grants/grant.html
# src/main/resources/templates/papers/paper.html
|
5 years ago |
|
Anton Romanov
|
529db0442c
|
fix grant dashboard indicators
|
5 years ago |
|
Anton Romanov
|
db97892af2
|
fix grant indicators
|
5 years ago |
|
Anton Romanov
|
ff19001f1f
|
fix grant doubling cause date comparison
|
5 years ago |
|
Anton Romanov
|
2012a58fc2
|
show active grants
|
5 years ago |
|
Anton Romanov
|
098f70ede6
|
Merge remote-tracking branch 'origin/dev' into dev
|
5 years ago |
|
Anton Romanov
|
d84b1fcbdc
|
use HtmlUnit instead of selenium webdriver for grants loading
|
5 years ago |
|
Anton Romanov
|
b44bbaec75
|
Merge branch '95-block-user' into 'dev'
Resolve "Блокировка пользователя"
Closes #95
See merge request romanov73/ng-tracker!110
|
5 years ago |
T-Midnight
|
e4f5bede2a
|
#104 add 3 more tests
|
5 years ago |
|
T-Midnight
|
888fecf687
|
#104 add unit tests
|
5 years ago |
|
T-Midnight
|
51ed732ae8
|
#104 fix web element in integration test
|
5 years ago |
|
Anton Romanov
|
18bb0b85ac
|
sout driver path
|
5 years ago |
|
Anton Romanov
|
615c70d12a
|
sout driver path
|
5 years ago |
Artem.Arefev
|
96d166d031
|
#95 block user html
|
5 years ago |
|
Artem.Arefev
|
fb23f182de
|
#95 merged with dev
|
5 years ago |
|
Anton Romanov
|
f8c1e52ca4
|
add kias loader to rest
|
5 years ago |
|
Anton Romanov
|
59e52aaf4a
|
different drivers
|
5 years ago |
|
Artem.Arefev
|
019ac6e0ad
|
#112 fix ping authors in grant
|
5 years ago |
|
Artem.Arefev
|
4104844b1e
|
#95 merged with dev
|
5 years ago |
|
Artem.Arefev
|
c0afabc37c
|
#112 merged with dev
|
5 years ago |
|
T-Midnight
|
fddc15af5a
|
#103 add tests for authors and description
|
5 years ago |
|
Artem.Arefev
|
bdb8fd8ce4
|
Merge remote-tracking branch 'origin/dev' into 112-ping-stats
|
5 years ago |
|
T-Midnight
|
acd58005de
|
#103 merge with 44
|
5 years ago |
|
T-Midnight
|
1ff38fc80e
|
#103 merge with dev
|
5 years ago |
|
T-Midnight
|
c77702704f
|
#103 merge with dev
|
5 years ago |
|
Anton Romanov
|
44824e53b2
|
Merge branch '103-paper-integr-tests' into 'dev'
Resolve "Реализовать интеграционные автотесты для проверки модулей"
See merge request romanov73/ng-tracker!111
|
5 years ago |
|
T-Midnight
|
0cd8003dd7
|
#103 add tests for deadline
|
5 years ago |
Васин Антон
|
bdff81d25e
|
#101 tests edited
|
5 years ago |
|
Васин Антон
|
482964fe53
|
#101 EventService edited
|
5 years ago |
|
Artem.Arefev
|
22abf6a27d
|
#95 blocking user
|
5 years ago |
|
Artem.Arefev
|
abea3c7dad
|
#112 ping model changed
|
5 years ago |
Семенова Мария
|
23d4e5602f
|
#103 integration auto tests
|
5 years ago |
a.vasin
|
bde4ac5f1c
|
#101 event service edited
|
5 years ago |
|
Artem.Arefev
|
3898dcf1c1
|
#112 changed mapping
|
5 years ago |
|
Artem.Arefev
|
2d230afa35
|
#112changed mapping
|
5 years ago |
|
a.vasin
|
db3252d822
|
#101 event service edited
|
5 years ago |
|
a.vasin
|
e6dc2abdd9
|
#101 event service edited
|
5 years ago |
|
a.vasin
|
ae8dc58a9d
|
#101 event service edited
|
5 years ago |
|
a.vasin
|
38478835fb
|
#101 event service edited
|
5 years ago |
|
a.vasin
|
7edb9d2aa3
|
#101 event service edited
|
5 years ago |
|
a.vasin
|
961a6a318e
|
#101 event service edited
|
5 years ago |
|
a.vasin
|
267bd5b0f3
|
#101 event service edited
|
5 years ago |
|
a.vasin
|
a5ac2bcbc2
|
Merge branch 'dev' of gitlab.com:romanov73/ng-tracker into 101-projecgt-timeline
|
5 years ago |
|
a.vasin
|
291f4e1e33
|
#101 db edited
|
5 years ago |
|
Artem.Arefev
|
53307c6add
|
#95 init
|
5 years ago |
|
Artem.Arefev
|
a405267092
|
merged with dev
|
5 years ago |
|
Anton Romanov
|
a878f8c22c
|
fix remove older events
|
5 years ago |
|
Anton Romanov
|
d2ce6d604e
|
fix merging collection
|
5 years ago |
|
Anton Romanov
|
b4b7b9087e
|
fix npe
|
5 years ago |
|
a.vasin
|
a7b48e1534
|
#101 project tests
|
5 years ago |