Commit Graph

25 Commits

Author SHA1 Message Date
55a76daa5a #247 -- Restore mvc 2024-03-27 10:14:42 +04:00
5371df1f50 #247 Remove primefaces dependency 2024-03-26 15:08:14 +04:00
Anton Romanov
5520f19357 show grants 2020-04-25 20:34:35 +04:00
Anton Romanov
c36876f7e7 style 2020-02-10 10:45:43 +04:00
Anton Romanov
4e1d99392a fix dependency 2019-11-27 21:48:53 +04:00
Anton Romanov
ac55481bc6 add oauth2 google 2019-11-27 19:41:10 +04:00
Anton Romanov
746f443931 fix primefaces repo 2019-11-21 09:37:09 +04:00
Anton Romanov
1be74769bf fix ports and dependencies 2019-11-21 09:35:50 +04:00
Anton Romanov
2cdec4bcda jsf initial 2019-11-21 08:37:37 +04:00
Anton Romanov
9d3ee273f6 fix spring boot version 2019-06-24 14:53:55 +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
9ba4476f80 restore dependencies 2019-06-08 14:43:08 +04:00
Anton Romanov
d84b1fcbdc use HtmlUnit instead of selenium webdriver for grants loading 2019-06-08 14:36:12 +04:00
Семенова Мария
23d4e5602f #103 integration auto tests 2019-06-01 23:16:39 +04:00
Anton Romanov
c303d65c8d #120 move to services 2019-05-23 16:02:44 +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
Anton Romanov
32c7261c2e #102 restore old swagger 2019-04-17 18:13:21 +04:00
Anton Romanov
cfbe36197b #102 add auto tests 2019-04-17 17:20:20 +04:00
Anton Romanov
c7cdbe9044 #83 add tasks, modify build script for passing application properties 2019-04-05 17:35:17 +04:00
Anton Romanov
e74261184f #73 first fixes by update versions 2019-03-20 14:37:57 +04:00
Anton Romanov
35a08ab451 save authors 2018-12-05 18:08:47 +04:00
Anton Romanov
c774820d95 fix build script for netbeans 2018-11-14 17:14:56 +04:00
885c553153 delete orphaned files, migrate to webjars, some fixes and refactoring 2018-05-20 08:05:21 +02:00
Anton Romanov
671cfdd486 add java code 2018-05-04 17:08:20 +04:00