Commit Graph

30 Commits (70c2ab3f8c401b73359894759a8a9c4808dac9a8)

Author SHA1 Message Date
Anton Romanov 41b5d42330 #247 -- Add failed test 2 months ago
Anton Romanov 6a04b5e037 #247 -- Add test class 2 months ago
Anton Romanov a9c617075f #247 -- Fix jenkins file 2 months ago
Anton Romanov a9e8336986 #247 -- Fix jpa mapping, update springdoc 2 months ago
Anton Romanov 23797bae9e #247 -- Update spring version, gradle version 2 months ago
Anton Romanov 55a76daa5a #247 -- Restore mvc 3 months ago
Anton Romanov 5371df1f50 #247 Remove primefaces dependency 3 months ago
Anton Romanov 5520f19357 show grants 4 years ago
Anton Romanov c36876f7e7 style 4 years ago
Anton Romanov 4e1d99392a fix dependency 5 years ago
Anton Romanov ac55481bc6 add oauth2 google 5 years ago
Anton Romanov 746f443931 fix primefaces repo 5 years ago
Anton Romanov 1be74769bf fix ports and dependencies 5 years ago
Anton Romanov 2cdec4bcda jsf initial 5 years ago
Anton Romanov 9d3ee273f6 fix spring boot version 5 years ago
Anton Romanov 24f447aed7 fix tests 5 years ago
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 9ba4476f80 restore dependencies 5 years ago
Anton Romanov d84b1fcbdc use HtmlUnit instead of selenium webdriver for grants loading 5 years ago
Семенова Мария 23d4e5602f #103 integration auto tests 5 years ago
Anton Romanov c303d65c8d #120 move to services 5 years ago
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
5 years ago
Anton Romanov 32c7261c2e #102 restore old swagger 5 years ago
Anton Romanov cfbe36197b #102 add auto tests 5 years ago
Anton Romanov c7cdbe9044 #83 add tasks, modify build script for passing application properties 5 years ago
Anton Romanov e74261184f #73 first fixes by update versions 5 years ago
Anton Romanov 35a08ab451 save authors 6 years ago
Anton Romanov c774820d95 fix build script for netbeans 6 years ago
Aleksey Filippov 885c553153 delete orphaned files, migrate to webjars, some fixes and refactoring 6 years ago
Anton Romanov 671cfdd486 add java code 6 years ago