Anton Romanov
|
8e89ec08a7
|
start conference controller
|
2019-07-08 13:35:03 +04:00 |
|
Anton Romanov
|
6cf627bf02
|
partially implements api
|
2019-07-07 22:47:43 +04:00 |
|
Anton Romanov
|
119f5a52ab
|
create api for activities
|
2019-07-07 17:22:42 +04:00 |
|
Anton Romanov
|
7c0a8be51b
|
fix saving paper
|
2019-07-01 23:34:29 +04:00 |
|
Anton Romanov
|
c966a100da
|
fix update paper
|
2019-07-01 23:27:35 +04:00 |
|
Anton Romanov
|
1fbee8f0f2
|
-- fixes for dashboard
|
2019-07-01 00:51:24 +04:00 |
|
Anton Romanov
|
56d8098a01
|
-- reduce code to more clarity (some features where disabled)
-- some refactor
-- add pagination for entities
|
2019-07-01 00:26:23 +04:00 |
|
Anton Romanov
|
a9fb97bd2e
|
fix saving paper
|
2019-06-30 00:21:59 +04:00 |
|
Anton Romanov
|
b99a5e9f06
|
paper model optimize
|
2019-06-27 16:31:48 +04:00 |
|
Anton Romanov
|
f89928ce3d
|
fix paper id on load
|
2019-06-27 12:08:15 +04:00 |
|
Anton Romanov
|
e7b84b766f
|
Merge branch 'move-to-jdk11' into try-vue
# Conflicts:
# src/main/java/ru/ulstu/configuration/MvcConfiguration.java
# src/main/java/ru/ulstu/core/controller/AdviceController.java
# src/main/java/ru/ulstu/paper/controller/PaperRestController.java
# src/main/resources/static/papers/paper-status.vue
# src/main/resources/templates/activate.html
# src/main/resources/templates/admin/commits.html
# src/main/resources/templates/admin/userList.html
# src/main/resources/templates/admin/userSessions.html
# src/main/resources/templates/conferences/conference.html
# src/main/resources/templates/conferences/conferences.html
# src/main/resources/templates/conferences/dashboard.html
# src/main/resources/templates/default.html
# src/main/resources/templates/error/403.html
# src/main/resources/templates/error/404.html
# src/main/resources/templates/error/500.html
# src/main/resources/templates/grants/dashboard.html
# src/main/resources/templates/grants/fragments/grantDashboardFragment.html
# src/main/resources/templates/grants/fragments/grantLineFragment.html
# src/main/resources/templates/grants/fragments/grantStatusFragment.html
# src/main/resources/templates/grants/grant.html
# src/main/resources/templates/grants/grants.html
# src/main/resources/templates/index.html
# src/main/resources/templates/load.html
# src/main/resources/templates/login.html
# src/main/resources/templates/papers/dashboard.html
# src/main/resources/templates/papers/fragments/paperDashboardFragment.html
# src/main/resources/templates/papers/fragments/paperLineFragment.html
# src/main/resources/templates/papers/paper.html
# src/main/resources/templates/papers/papers.html
# src/main/resources/templates/projects/dashboard.html
# src/main/resources/templates/projects/fragments/projectStatusFragment.html
# src/main/resources/templates/projects/project.html
# src/main/resources/templates/projects/projects.html
# src/main/resources/templates/reset.html
# src/main/resources/templates/resetRequest.html
# src/main/resources/templates/timeline.html
|
2019-06-24 15:12:56 +04:00 |
|
Anton Romanov
|
9d3ee273f6
|
fix spring boot version
|
2019-06-24 14:53:55 +04:00 |
|
Anton Romanov
|
3267138524
|
fix warnings
|
2019-06-22 13:50:15 +04:00 |
|
Anton Romanov
|
df1bf873ff
|
fix warnings
|
2019-06-22 13:31:53 +04:00 |
|
Anton Romanov
|
24f447aed7
|
fix tests
|
2019-06-22 11:58:01 +04:00 |
|
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
|
2019-06-21 04:22:06 +04:00 |
|
Anton Romanov
|
529db0442c
|
fix grant dashboard indicators
|
2019-06-13 14:50:21 +04:00 |
|
Anton Romanov
|
db97892af2
|
fix grant indicators
|
2019-06-13 14:48:02 +04:00 |
|
Anton Romanov
|
ff19001f1f
|
fix grant doubling cause date comparison
|
2019-06-11 22:09:30 +04:00 |
|
Anton Romanov
|
2012a58fc2
|
show active grants
|
2019-06-10 12:15:01 +04:00 |
|
Anton Romanov
|
9ba4476f80
|
restore dependencies
|
2019-06-08 14:43:08 +04:00 |
|
Anton Romanov
|
098f70ede6
|
Merge remote-tracking branch 'origin/dev' into dev
|
2019-06-08 14:37:07 +04:00 |
|
Anton Romanov
|
d84b1fcbdc
|
use HtmlUnit instead of selenium webdriver for grants loading
|
2019-06-08 14:36:12 +04:00 |
|
Anton Romanov
|
b44bbaec75
|
Merge branch '95-block-user' into 'dev'
Resolve "Блокировка пользователя"
Closes #95
See merge request romanov73/ng-tracker!110
|
2019-06-08 08:29:44 +00:00 |
|
Anton Romanov
|
436c15e727
|
Merge branch '104-module-tests-grant' into 'dev'
Resolve "Реализовать модульные тесты"
See merge request romanov73/ng-tracker!115
|
2019-06-08 06:02:09 +00:00 |
|
T-Midnight
|
e4f5bede2a
|
#104 add 3 more tests
|
2019-06-07 22:39:20 +04:00 |
|
T-Midnight
|
888fecf687
|
#104 add unit tests
|
2019-06-07 20:55:59 +04:00 |
|
T-Midnight
|
51ed732ae8
|
#104 fix web element in integration test
|
2019-06-07 20:54:38 +04:00 |
|
Anton Romanov
|
18bb0b85ac
|
sout driver path
|
2019-06-07 15:53:09 +04:00 |
|
Anton Romanov
|
615c70d12a
|
sout driver path
|
2019-06-07 15:35:15 +04:00 |
|
Artem.Arefev
|
96d166d031
|
#95 block user html
|
2019-06-07 12:23:03 +04:00 |
|
Artem.Arefev
|
fb23f182de
|
#95 merged with dev
|
2019-06-07 11:39:44 +04:00 |
|
Anton Romanov
|
f8c1e52ca4
|
add kias loader to rest
|
2019-06-07 09:48:07 +04:00 |
|
Anton Romanov
|
59e52aaf4a
|
different drivers
|
2019-06-06 17:07:25 +04:00 |
|
Anton Romanov
|
dc467ec72c
|
Merge branch '112-ping-stats' into 'dev'
#112 fix ping authors in grant
Closes #112
See merge request romanov73/ng-tracker!114
|
2019-06-05 20:28:47 +00:00 |
|
Artem.Arefev
|
019ac6e0ad
|
#112 fix ping authors in grant
|
2019-06-06 00:21:19 +04:00 |
|
Anton Romanov
|
1ccec83390
|
Merge branch '112-ping-stats' into 'dev'
Resolve "Сводка по ping активностей"
Closes #112
See merge request romanov73/ng-tracker!109
|
2019-06-05 20:04:44 +00:00 |
|
Artem.Arefev
|
4104844b1e
|
#95 merged with dev
|
2019-06-06 00:01:03 +04:00 |
|
Artem.Arefev
|
c0afabc37c
|
#112 merged with dev
|
2019-06-05 23:57:33 +04:00 |
|
Anton Romanov
|
624573a47a
|
Merge branch '103-integr-tests-grant' into 'dev'
Resolve "Реализовать интеграционные автотесты для проверки модулей"
See merge request romanov73/ng-tracker!106
|
2019-06-05 19:46:59 +00:00 |
|
T-Midnight
|
fddc15af5a
|
#103 add tests for authors and description
|
2019-06-05 23:14:52 +04:00 |
|
Artem.Arefev
|
bdb8fd8ce4
|
Merge remote-tracking branch 'origin/dev' into 112-ping-stats
|
2019-06-05 18:12:38 +04:00 |
|
T-Midnight
|
acd58005de
|
#103 merge with 44
|
2019-06-05 15:52:29 +04:00 |
|
T-Midnight
|
1ff38fc80e
|
#103 merge with dev
|
2019-06-05 09:36:29 +04:00 |
|
T-Midnight
|
c77702704f
|
#103 merge with dev
|
2019-06-05 09:34:51 +04:00 |
|
Anton Romanov
|
44824e53b2
|
Merge branch '103-paper-integr-tests' into 'dev'
Resolve "Реализовать интеграционные автотесты для проверки модулей"
See merge request romanov73/ng-tracker!111
|
2019-06-05 04:57:33 +00:00 |
|
Anton Romanov
|
bacd3827e3
|
Merge branch '101-projecgt-timeline' into 'dev'
Resolve "Генерация таймлайна для проекта"
Closes #101
See merge request romanov73/ng-tracker!85
|
2019-06-05 04:55:15 +00:00 |
|
T-Midnight
|
0cd8003dd7
|
#103 add tests for deadline
|
2019-06-04 16:26:42 +04:00 |
|
Васин Антон
|
bdff81d25e
|
#101 tests edited
|
2019-06-03 20:42:49 +03:00 |
|
Васин Антон
|
482964fe53
|
#101 EventService edited
|
2019-06-03 20:21:46 +03:00 |
|