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
|
59e52aaf4a
|
different drivers
|
2019-06-06 17:07:25 +04:00 |
|
|
6e97bf67d6
|
try-vue: add pgsql runner
|
2019-05-28 22:27:35 +04:00 |
|
Anton Romanov
|
59bc0dbd34
|
disable dev mode on demo
|
2019-05-18 13:13:09 +04:00 |
|
Anton Romanov
|
1211b0db29
|
add styles in email templates
|
2018-11-09 14:53:24 +04:00 |
|
Anton Romanov
|
def4f97784
|
fix ci
|
2018-11-06 14:10:00 +04:00 |
|
Anton Romanov
|
818c418565
|
add variable
|
2018-09-06 23:01:39 +04:00 |
|
Anton Romanov
|
cbcc006b13
|
deploy on vps
|
2018-09-06 22:50:34 +04:00 |
|