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
|
a4cbb3e3df
|
#show paper list
|
2019-04-30 17:36:25 +04:00 |
|
Anton Romanov
|
2cf3e52596
|
#73 merge dev into jdk11
|
2019-04-05 14:11:13 +04:00 |
|
Anton Romanov
|
c2dc080d23
|
Merge branch '71-add-task-layout' into 'dev'
Resolve "Верстка страницы добавления новой задачи, ПУ и списка задач"
Closes #71
See merge request romanov73/ng-tracker!29
|
2019-04-01 05:17:39 +00:00 |
|
Anton Romanov
|
539095c89e
|
partially restored commits page
|
2019-03-28 14:59:35 +04:00 |
|
Anton Romanov
|
1487affb8e
|
#73 fix deprecated annotations and classes
|
2019-03-20 19:20:28 +04:00 |
|
ASH
|
bd975c53f3
|
#71 adding pages and layout
|
2019-03-11 22:46:51 +04:00 |
|
Nightblade73
|
c21a65a075
|
#54 add transitions
|
2019-03-06 16:48:51 +04:00 |
|
Anton Romanov
|
e3b248778c
|
add route
|
2018-11-10 21:43:52 +04:00 |
|
Anton Romanov
|
550cc4cdf3
|
some refactor
|
2018-09-27 10:35:22 +04:00 |
|
Anton Romanov
|
671cfdd486
|
add java code
|
2018-05-04 17:08:20 +04:00 |
|