Commit Graph

927 Commits (23797bae9eb1fcc4942776e485078324b1cb56c9)
 

Author SHA1 Message Date
Anton Romanov 10a99d42cf add delete papers button 4 years ago
Anton Romanov 90c11c6946 show details 4 years ago
Anton Romanov 134f75666c Merge remote-tracking branch 'origin/jsf' into jsf 4 years ago
Anton Romanov b8d492724c image 4 years ago
Anton Romanov bc48a486ee quick add paper 4 years ago
Anton Romanov c36876f7e7 style 4 years ago
Anton Romanov a136acb0b4 show users 5 years ago
Anton Romanov 7d1f5e9059 fix codestyle 5 years ago
Anton Romanov 4c4c1b2015 fix template 5 years ago
Anton Romanov 6b90d7b0c0 fix messages 5 years ago
Anton Romanov fa03edf32d fix messages 5 years ago
Anton Romanov 4e1d99392a fix dependency 5 years ago
Anton Romanov ac55481bc6 add oauth2 google 5 years ago
Anton Romanov 71448364d7 fix login / logout 5 years ago
Anton Romanov c57914db7c auth 5 years ago
Anton Romanov ab20b3843f fix font size 5 years ago
Anton Romanov 268a311a87 add filter 5 years ago
Anton Romanov a67eb23714 send all developer letters to romanov73 5 years ago
Anton Romanov 5ee1f33de1 add papers dashboard 5 years ago
Anton Romanov 107ddb90ac add side commands 5 years ago
Anton Romanov ac6bd13c6c show label for paper status 5 years ago
Anton Romanov e7061f4545 fix columns 5 years ago
Anton Romanov d741bd019a display authors 5 years ago
Anton Romanov 846d94bb46 display paper comment 5 years ago
Anton Romanov 5755cf2f92 save paper 5 years ago
Anton Romanov 7587ff7a51 show paper type 5 years ago
Anton Romanov 6c220355ee display some of paper 5 years ago
Anton Romanov 779f286988 add some menu 5 years ago
Anton Romanov 7753dd104c show paper page 5 years ago
Anton Romanov 48955b9cfd show paper statuses 5 years ago
Anton Romanov 9665653234 show paper list 5 years ago
Anton Romanov 04f545db1c show paper list 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 a17dac55e2 fix jdk 5 years ago
Anton Romanov 9e6993f136 Merge branch 'move-to-jdk11' into 'dev'
update versions

Closes #73

See merge request romanov73/ng-tracker!34
5 years ago
Anton Romanov 0647438bfb #73 fix jdk 5 years ago
Anton Romanov 41c4ee7997 fix htmlunit js errors 5 years ago
Anton Romanov 9d3ee273f6 fix spring boot version 5 years ago
Anton Romanov 3267138524 fix warnings 5 years ago
Anton Romanov df1bf873ff fix warnings 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 529db0442c fix grant dashboard indicators 5 years ago
Anton Romanov db97892af2 fix grant indicators 5 years ago
Anton Romanov ff19001f1f fix grant doubling cause date comparison 5 years ago
Anton Romanov 2012a58fc2 show active grants 5 years ago
Anton Romanov 9ba4476f80 restore dependencies 5 years ago
Anton Romanov 098f70ede6 Merge remote-tracking branch 'origin/dev' into dev 5 years ago