17931 Commits

Author SHA1 Message Date
Jenkins
5f2211b417 Merge commit 'bc74a0700ed3340bf6edb684c8956792a639b17c' into HEAD release-265 2023-05-01 23:50:14 +02:00
nikos dimitrakas
bc74a0700e 3080 Uppgraderade hibernate 2023-04-28 12:23:38 +02:00
nikos dimitrakas
76756610ad 3080 Uppgraderade maven-dependencies förslf4j, log4j, wicket (implicit file-upload som hade vulnerability), mysql (fick bort protobuf som mysql hade uppgraderat), junit, mockito, jersey, jackson, surefire, maven-compiler. Lade till versions-plugin. 2023-04-28 12:13:28 +02:00
nikos dimitrakas
5a3e0f7dc8 3066 TR 2023-04-18 11:54:15 +02:00
0ab37f0b81 3066 Handle trying to edit non-existing activities 2023-04-17 13:44:24 +02:00
6df949fb0b 3068 Add back sorting by deadline 2023-04-17 11:57:13 +02:00
b41d0d5b56 3068 Support different sorting parameters in custom columns 2023-04-14 12:03:29 +02:00
2a7abcf82d 3068 Display the correct requested date 2023-04-14 11:31:09 +02:00
Jenkins
311e0dfcdc Merge commit '5f0a5204d74fbdcf9705d9c67e51df276c32722e' into HEAD release-264 2023-04-12 22:42:33 +02:00
5f0a5204d7 2996 Removed grading report snapshot from phase 2 review 2023-04-12 15:50:21 +02:00
80b359414c 2996 Simplified the rough draft approval page 2023-04-12 15:50:20 +02:00
b26296461c 2996 Remove old final seminar approval GUI 2023-04-12 15:50:14 +02:00
34dbf8a9cd 2996 Removed old grading process for reviewers with filling in the grading basis. 2023-04-12 15:50:08 +02:00
Filip Kantar
8d8c0f4340 2935: TR Adjusted approved/rejected texts. 2023-04-05 16:53:52 +02:00
Filip Kantar
f4ec2f6dae 3035: Improved the design of the grading report. Using swedish language for bachelor and english for master. Added fonts to use with the generated pdf report. 2023-04-05 15:20:35 +02:00
Filip Kantar
0948b02201 3035: Improved the design of the grading report. Using swedish language for bachelor and english for master. Added fonts to use with the generated pdf report. 2023-04-05 15:17:26 +02:00
Filip Kantar
85f29ee144 Merge remote-tracking branch 'origin/2935-post-phase-2-feedback-to-forum' into develop 2023-04-04 17:57:19 +02:00
478f16c713 3021 Fix editing keywords 2023-04-03 12:46:06 +02:00
Jenkins
e3437784a5 Merge commit 'e3563ddf0e6f546d3a1c869d5bcb526fb5e33832' into HEAD release-263 2023-03-28 22:52:13 +02:00
e3563ddf0e Remove old unused columns. 2023-03-28 14:36:35 +02:00
bf5c11e6c9 Better handling of changes in the Daisy API by getting compiler errors with mismatched XSD. 2023-03-28 10:11:14 +02:00
deff20cfc7 Only import Stockholm University usernames
Improve user search experience since it searches by username, so we don't want a bunch of usernames from other places to interfere.
2023-03-28 10:09:49 +02:00
0e9c5c2b89 Suppress security warning that's not relevant
The affected API is not used by SciPro nor any dependencies.
2023-03-23 12:52:29 +01:00
89264498ba 3050 Nicer labels 2023-03-23 09:40:54 +01:00
4aa512f4cf 3050 Styling improvements 2023-03-23 09:39:45 +01:00
8f675fda60 3050 Removed usages of deprecated class 2023-03-23 09:35:17 +01:00
f1d59d7d0e 3050 Test cleanup 2023-03-23 09:33:39 +01:00
c4b268a9ea 3050 Fix changing supervisors on projects with a reviewer assigned 2023-03-23 09:32:39 +01:00
f09ddd85b1 Upgrade Jackson 2023-03-02 12:55:54 +01:00
Jenkins
d4820a3157 Merge commit 'c4c7f592a78e345918d5bff20486a3fb1eccf45d' into HEAD release-262 2023-02-22 00:57:16 +01:00
c4c7f592a7 Sonar 2023-02-13 10:51:29 +01:00
239d26eb61 3019 Fix trying to upload non-PDF as seminar document
Can't throw exceptions in @Transactional methods or the EntityManager gets put in a weird state. Causes the involved entities (FinalSeminar) to be detached which leads to LazyInitializationExceptions.
2023-02-10 19:39:49 +01:00
f084d6d289 2943 Add english titles to the supervisors grading basis 2023-02-10 11:45:06 +01:00
b9245ac023 Sonar 2023-02-09 16:43:40 +01:00
dba133176a Midway point to allow upgrading Flyway to the newest version
See https://flywaydb.org/documentation/learnmore/releaseNotes#5.0.0 for why we must upgrade to 4.2.0 first
2023-02-09 16:40:06 +01:00
7868c05664 3015 Hide seminar documents for non-related authors 2023-02-08 11:44:02 +01:00
12a7e56ba1 2938 Switch to swedish collation all over to sort åäö correctly 2023-02-06 15:49:40 +01:00
4b880785fc Merge branch '2909-single-motivation-grading-basis' into develop 2023-02-06 15:18:33 +01:00
0e80f416d0 2909 Migrate all old supervisor grading basis to the new single motivation 2023-02-06 15:17:41 +01:00
d9d6f41662 Simplified file handling 2023-02-06 14:50:23 +01:00
43f8158ed9 2854 Updated consent level descriptions 2023-02-04 11:37:21 +01:00
a86b46523b Merge remote-tracking branch 'origin/2854-reflection-ux-improvement' into develop
# Conflicts:
#	view/src/main/java/se/su/dsv/scipro/finalthesis/FinalThesisUploadFormPanel.html
2023-02-03 14:20:55 +01:00
e9d9dd9dff 2854 Fix showing of survey after finishing the final steps 2023-01-24 12:03:45 +01:00
4d18f9af15 2983 Text improvements when supervisors send grade suggestion to the examiner 2023-01-23 13:47:04 +01:00
b69ce4e5b8 Replace existing files when copying the database
When copying the database the newly generated primary key for a new file may point to an already existing file from before the copying. Simply overwrite this existing file if necessary.
2023-01-17 14:44:17 +01:00
dbd0d65e65 Sonar 2023-01-12 16:46:08 +01:00
63f6881e08 2935 Reviewers feedback during phase 2 review is forwarded to students. 2023-01-12 12:13:35 +01:00
b3b4a25dcd Sonar fixes 2023-01-12 10:16:07 +01:00
8a941e3164 Removed double required indicators 2023-01-12 09:50:54 +01:00
ba684d457b HTML improvements (Sonar) 2023-01-12 09:28:15 +01:00