scipro

DMC/scipro

Fork 0

Commit Graph

Select branches

Hide Pull Requests

develop

master

opponent-completion

remove-forum-post

spring-boot-managed-versions

test-coverage

test-data-improvements

#10

#101

#102

#105

#106

#107

#111

#112

#113

#114

#115

#116

#117

#118

#12

#121

#13

#14

#15

#16

#17

#18

#19

#20

#21

#23

#24

#25

#26

#27

#3

#44

#47

#5

#52

#54

#55

#57

#58

#59

#6

#61

#65

#70

#71

#72

#74

#76

#78

#8

#9

#91

#96

#98

201

2011-07-18

2011-07-21

2011-08-22

2011-08-24

2011-09-09

2011-09-21

2011-10-25

2011-10-27

2011-11-07

2011-11-10

2011-11-14

2011-12-07

2011-12-08

2011-12-21

2012-05-07

2012-09-15

2012-09-19

2012-10-15

20120102

20120109

20120113

20120123

20120126

20120129b

20120130

20120203

20120208

20120213

20120215

20120224

20120224b

20120227

20120229

20120306

20120308

20120320

20120323

20120326

20120401

20120420

20120430

20120501

20120511

20120515

20120520

20120521

20120525

20120601

20120605

20120607

20120614

20120625

20120720

20120731

20120810

20120813

20120814

20120815

20120817

20120819

20120819b

20120819c

20120819d

20120821

20120821b

20120827

20120827b

20120827c

20120911

20120917

20120928

20121003

20121005

20121009

20121010

20121010b

20121010c

20121010d

20121019

20121024

20121026

20121102

20121102b

20121102c

20121102d

20121112

20121119

20121123

20121204

20121221

20130114

20130114b

20130116

20130117

20130118

20130118b

20130121

20130125

20130201

20130204

20130204-2

20130215

20130220

20130301

20130308

20130315

20130319

20130322

20130405

20130412

20130412b

20130419

20130426

20130503

20130510

20130517

20130520b

20130524

20130524b

20130531

20130607

20130809

20130816

20130823

20130906

20130913

20131010

20131015

20131015b

20131023

20131024

20131024b

20131024c

20131025

20131025b

20131029

20131029b

20131029c

20131031

20131104

20131106

fix20130520

release-100

release-101

release-102

release-103

release-104

release-105

release-106

release-107

release-108

release-109

release-110

release-111

release-112

release-113

release-114

release-115

release-116

release-117

release-118

release-119

release-120

release-124

release-125

release-126

release-127

release-128

release-129

release-130

release-131

release-132

release-133

release-134

release-135

release-136

release-137

release-138

release-139

release-140

release-141

release-142

release-143

release-144

release-145

release-146

release-147

release-148

release-149

release-150

release-151

release-152

release-154

release-155

release-156

release-157

release-158

release-159

release-160

release-161

release-162

release-163

release-164

release-165

release-166

release-167

release-168

release-169

release-170

release-171

release-172

release-173

release-174

release-175

release-177

release-178

release-179

release-180

release-181

release-182

release-183

release-184

release-185

release-186

release-187

release-188

release-189

release-190

release-191

release-192

release-193

release-194

release-195

release-196

release-197

release-198

release-199

release-200

release-201

release-2014-02-11_09-10-21

release-2014-02-18_12-56-20

release-2014-02-18_14-07-18

release-2014-02-18_17-39-07

release-2014-02-18_18-52-52

release-2014-02-20_10-05-22

release-2014-03-05_15-17-07

release-2014-03-05_16-11-47

release-2014-03-06_14-40-27

release-2014-03-06_17-04-04

release-2014-03-13_13-44-31

release-2014-03-13_16-21-44

release-2014-03-14_16-51-04

release-2014-03-26_16-03-09

release-2014-03-27_13-53-50

release-2014-03-27_17-09-01

release-2014-04-01_15-20-30

release-2014-04-04_12-51-51

release-2014-04-08_09-18-21

release-2014-04-08_17-09-06

release-2014-04-10_10-24-17

release-2014-04-11_07-44-26

release-2014-04-11_09-43-06

release-2014-04-25_06-47-30

release-2014-05-09_06-12-15

release-2014-05-16_17-09-30

release-2014-05-19_20-32-59

release-2014-05-27_02-23-47

release-2014-05-27_05-28-36

release-2014-06-03_05-58-50

release-2014-06-27_02-59-33

release-2014-07-17_15-40-18

release-2014-07-30_10-58-12

release-2014-08-19_14-03-31

release-2014-08-19_16-58-15

release-2014-08-20_13-28-07

release-2014-08-28_05-21-30

release-2014-08-28_16-01-59

release-2014-09-12_04-32-23

release-2014-10-13_08-42-56

release-2014-10-13_23-32-12

release-2014-10-18_01-41-15

release-2014-10-20_05-31-21

release-2014-10-29_03-09-05

release-2014-11-07_00-19-08

release-2014-11-25_02-38-44

release-2014-12-01_03-52-02

release-2014-12-01_22-46-42

release-2014-12-09_12-38-01

release-2014-12-14_20-43-16

release-2015-01-05_14-42-00

release-2015-01-12_19-19-12

release-2015-01-14_23-29-05

release-2015-01-16_13-58-21

release-2015-01-21_01-43-10

release-202

release-203

release-204

release-205

release-206

release-207

release-208

release-209

release-210

release-211

release-212

release-213

release-214

release-215

release-216

release-217

release-218

release-219

release-220

release-221

release-222

release-223

release-224

release-225

release-226

release-227

release-228

release-229

release-230

release-231

release-232

release-233

release-234

release-235

release-236

release-237

release-238

release-239

release-240

release-241

release-242

release-243

release-244

release-245

release-246

release-247

release-248

release-249

release-250

release-251

release-252

release-253

release-254

release-255

release-256

release-257

release-258

release-259

release-260

release-261

release-262

release-263

release-264

release-265

release-266

release-267

release-268

release-269

release-270

release-271

release-273

release-274

release-275

release-276

release-277

release-278

release-279

release-280

release-281

release-282

release-283

release-284

release-287

release-288

release-289

release-290

release-291

release-292

release-293

release-294

release-295

release-296

release-297

release-298

release-73

release-74

release-75

release-77

release-78

release-79

release-80

release-81

release-82

release-83

release-84

release-85

release-86

release-87

release-88

release-89

release-90

release-91

release-92

release-93

release-94

release-95

release-96

release-97

release-98

release-99

release20140411

second20120215

88d811c465 Merge branch 'develop' into test-data-improvements test-data-improvements Nico Athanassiadis 2025-03-03 08:00:52 +01:00
7f9e72484a Remove unused javax.inject and jersey-hk2 dependencies (#118) develop Andreas Svanberg 2025-03-03 07:59:14 +01:00
3d9898a392 Merge branch 'develop' into remove-unused-dependencies Nico Athanassiadis 2025-03-03 07:49:15 +01:00
a71eeb5e2c Fix crash when editing an application period (#117) Andreas Svanberg 2025-03-03 07:48:46 +01:00
e75263c209 Merge branch 'develop' into edit-application-period Nico Athanassiadis 2025-03-03 07:38:44 +01:00
ec70ea5596 Make session serializable (#121) Andreas Svanberg 2025-03-03 07:32:25 +01:00
f3eacbfda4 Make session serializable Andreas Svanberg 2025-02-27 12:29:29 +01:00
9c5a6b2c63 Merge commit 'e71aa8120ca5a525d42f417ce5f16d3a61db2971' into HEAD release-298 master Jenkins 2025-02-26 23:13:09 +01:00
dd82a46fe1 Add Maven output of new test-data module to .gitignore Andreas Svanberg 2025-02-25 12:49:49 +01:00
cff6fdafac Add new Maven module to the Docker build Andreas Svanberg 2025-02-25 12:49:16 +01:00
167a73fb01 Add documentation to test data Factory methods Andreas Svanberg 2025-02-25 11:48:17 +01:00
e7d6698c11 Document how to add new test data populators Andreas Svanberg 2025-02-17 15:52:54 +01:00
7a59844cb7 Execute TestDataPopulators Andreas Svanberg 2025-02-17 15:51:52 +01:00
4276dc15b1 Infrastructure for creating individual populators for specific test cases. Andreas Svanberg 2025-02-17 15:32:38 +01:00
2af932291c Move DataInitializer to separate Maven module Andreas Svanberg 2025-02-17 15:06:20 +01:00
696e15a3c5 Remove unused jersey-hk2 dependency Andreas Svanberg 2025-02-24 15:44:12 +01:00
858117b1e7 Remove old javax.inject dependency Andreas Svanberg 2025-02-24 15:24:14 +01:00
d0fb2e721c Merge branch 'develop' into opponent-completion opponent-completion Andreas Svanberg 2025-02-21 14:14:21 +01:00
e71aa8120c Grading boundaries are wrong in supervisor view (#98) Tom Zhao 2025-02-21 14:06:29 +01:00
fabcbe0aa4 Merge branch 'develop' into 97-grading-boundaries-wrong-in-suervisor-view Andreas Svanberg 2025-02-21 13:39:04 +01:00
eb567401c6 The item itself is added by the ListView Andreas Svanberg 2025-02-21 11:36:34 +01:00
14e38bdbb9 Merge commit '03570fc6db9bfbf82c256ffa33785d309718a836' into HEAD release-297 Jenkins 2025-02-21 00:27:41 +01:00
03570fc6db Improve supervisor change integration (#114) Nico Athanassiadis 2025-02-21 00:27:22 +01:00
a1c3895767 97: reformat code Tom Zhao 2025-02-20 16:21:58 +01:00
2d5ae2129b 97: Replace with single import Tom Zhao 2025-02-20 16:14:14 +01:00
989a3d9bdc 97: Add test data to test points-to-grade conversion panel Tom Zhao 2025-02-20 16:05:45 +01:00
53fb3e983a 97: Reformat code Tom Zhao 2025-02-20 16:04:28 +01:00
9475937177 97: Move getMaxPoints method to correct location Tom Zhao 2025-02-20 16:02:29 +01:00
1e109e2de8 Fix editing application periods Andreas Svanberg 2025-02-20 16:01:19 +01:00
0d5bdd69ed Remove unused method Andreas Svanberg 2025-02-20 15:56:52 +01:00
0f4427ce4f Let Spring Boot manage dependency versions spring-boot-managed-versions Andreas Svanberg 2025-02-20 15:54:04 +01:00
b7cf87d6d3 Fix CVE-2024-57699 by override transitive dependency version (#116) Andreas Svanberg 2025-02-20 14:31:59 +01:00
f4d2fdaadd Fix CVE-2024-57699 by override transitive dependency version Andreas Svanberg 2025-02-20 14:10:22 +01:00
a0fd84343c Show error message when trying to add duplicate exemptions (#115) Andreas Svanberg 2025-02-20 13:56:13 +01:00
e0b5f0e86a 97: Using LoadableDetachableModel to cache GradingReportTemplate Tom Zhao 2025-02-20 13:27:47 +01:00
3912ba7f32 97: Using LoadableDetachableModel to cache GradingReportTemplate Tom Zhao 2025-02-20 13:27:00 +01:00
b12d3670a5 Remove references to setProjectTypes that are not used Andreas Svanberg 2025-02-20 12:59:26 +01:00
be29e38e97 97: Using record and improve GradingReportTemplateService Tom Zhao 2025-02-20 12:53:43 +01:00
9bdd22d91d Refactoring and new test Nico Athanassiadis 2025-02-20 11:22:13 +01:00
cee39cbf78 Use detachable IModels to prevent stale data Andreas Svanberg 2025-02-20 10:48:47 +01:00
7e79e0c5d0 Simplified gathering of grading boundries Andreas Svanberg 2025-02-20 10:47:48 +01:00
82c5a7a85a reformatted code with prettier tooling Nico Athanassiadis 2025-02-20 08:45:04 +01:00
ff2ba01690 Replace head supervisor Nico Athanassiadis 2025-02-20 08:36:40 +01:00
411908fb72 Merge branch 'develop' into 97-grading-boundaries-wrong-in-suervisor-view Tom Zhao 2025-02-19 14:08:28 +01:00
b1d8ad7a2e 97: Fix UI-test Tom Zhao 2025-02-19 13:38:10 +01:00
3b201f6de2 Merge branch '97-grading-boundaries-wrong-in-suervisor-view' of gitea.dsv.su.se:DMC/scipro into 97-grading-boundaries-wrong-in-suervisor-view Tom Zhao 2025-02-19 12:26:09 +01:00
655e6a3420 97: Get grade with limits from database instead of hardcoding in UI-layer Tom Zhao 2025-02-19 12:25:54 +01:00
130ab46284 Updated daisy api xsd Nico Athanassiadis 2025-02-19 10:31:19 +01:00
a27141ed92 Show error message when trying to add duplicate exemptions Andreas Svanberg 2025-02-19 10:27:14 +01:00
9b26843570 Bug resubmissions of final thesis shows old date (#113) Nico Athanassiadis 2025-02-19 09:37:33 +01:00
5820a87fd6 Resubmission of final thesis should show correct date Nico Athanassiadis 2025-02-19 08:45:49 +01:00
d292ecc34d Remove useless PhD project type Andreas Svanberg 2025-02-18 15:13:51 +01:00
1b36ad7987 Disable ability to grade opponents after requesting improvements Andreas Svanberg 2025-02-18 15:12:21 +01:00
ad91a9b961 Remove unused dependencies Andreas Svanberg 2025-02-18 14:54:47 +01:00
cbd426be07 Show the time that opponents submitted their report Andreas Svanberg 2025-02-18 14:53:28 +01:00
093dd11c29 Send notifications to opponents when they're approved Andreas Svanberg 2025-02-18 14:37:10 +01:00
cfef02b98c Enable *all* notifications during development and on test servers Andreas Svanberg 2025-02-18 14:17:45 +01:00
970f6ee61b Merge branch 'develop' into opponent-completion Andreas Svanberg 2025-02-18 10:02:32 +01:00
399d8f5275 Assign supervisor to student ideas no matter if target (goal) is reached (#96) Tom Zhao 2025-02-18 09:59:23 +01:00
e3c5cea2a2 Merge branch 'develop' into remove-forum-post remove-forum-post Andreas Svanberg 2025-02-17 14:39:32 +01:00
fd8c7a620a Added tests for deletion logic Andreas Svanberg 2025-02-17 14:17:39 +01:00
a9871eb470 Fix mock test Andreas Svanberg 2025-02-17 14:02:12 +01:00
3933cfa2be Allow deletion of forum posts Andreas Svanberg 2025-02-11 14:53:10 +01:00
a6de7a9ab0 Merge branch 'develop' into 97-grading-boundaries-wrong-in-suervisor-view Tom Zhao 2025-02-17 10:04:21 +01:00
3dc5fa6fa7 Merge commit 'b9f7dd5a49aeebd64a5f44b66ac0775901550476' into HEAD release-296 Jenkins 2025-02-15 22:43:10 +01:00
46173d5da3 67: Merge from develop Tom Zhao 2025-02-13 15:25:19 +01:00
b9f7dd5a49 Update supervisor's idea table immediately upon scheduling a first meeting (#105) Andreas Svanberg 2025-02-13 09:59:33 +01:00
aa801d0ae5 67: Remove unnessary null check Tom Zhao 2025-02-13 09:26:21 +01:00
973a41a563 Merge branch 'develop' into first-meeting-feedback Andreas Svanberg 2025-02-12 15:03:59 +01:00
8892bf4780 Merge branch 'develop' into opponent-completion Andreas Svanberg 2025-02-12 13:45:51 +01:00
1b692f87fb 67: merge from develop Tom Zhao 2025-02-12 13:35:21 +01:00
08e1b785ca Fix Docker build due to missing json-smart version (#107) Co-authored-by: Andreas Svanberg <andreass@dsv.su.se> Co-committed-by: Andreas Svanberg <andreass@dsv.su.se> Andreas Svanberg 2025-02-12 13:28:14 +01:00
f2aef34f5a Fix Docker build due to missing json-smart version Andreas Svanberg 2025-02-12 13:09:06 +01:00
6410710679 Merge branch 'develop' into opponent-completion Andreas Svanberg 2025-02-12 11:18:06 +01:00
304d0431c1 Deadline visible in "Rough draft approval" page (#106) Nico Athanassiadis 2025-02-12 11:07:53 +01:00
32c066a1c5 67: Create student idea to test setting supervisor target Tom Zhao 2025-02-12 10:06:47 +01:00
87e60578c0 Styling improvements Andreas Svanberg 2025-02-11 15:43:06 +01:00
3be41635b1 Alert the opponent that they need to an improved report on the final seminar page Andreas Svanberg 2025-02-11 15:36:45 +01:00
236f6a0ad3 Better UX for notification about opposition report needing improvements Andreas Svanberg 2025-02-11 15:22:21 +01:00
02b60c2bd3 Make reviewer pages testable on test servers. Nico Athanassiadis 2025-02-11 14:34:47 +01:00
54bd0eea9e Make reviewer pages testable on test servers. Nico Athanassiadis 2025-02-11 14:15:45 +01:00
1dd4471f68 Make reviewer pages testable on test servers. Nico Athanassiadis 2025-02-11 13:35:08 +01:00
5490750d83 Make reviewer pages testable on test servers. Nico Athanassiadis 2025-02-11 13:26:50 +01:00
e05fbb54c9 Make reviewer pages testable on test servers. Nico Athanassiadis 2025-02-11 13:20:25 +01:00
1139797735 Added test data for the deadline in rough draft approval Nico Athanassiadis 2025-02-11 13:07:37 +01:00
6ca6c63743 Deadline visible in "Rough draft approval" page Nico Athanassiadis 2025-02-11 11:31:24 +01:00
cb4de36f2c Refactor so everyone goes through BasicForumService to get forum related data Andreas Svanberg 2025-02-11 11:04:08 +01:00
37b4e76ad2 67: Add languages to supervisors and add new student for submitting student idea. Tom Zhao 2025-02-10 14:50:23 +01:00
a20455df97 Merge branch 'develop' into opponent-completion Andreas Svanberg 2025-02-10 14:35:40 +01:00
f5c88c7b8e 67: Enable JPA save for employee. Tom Zhao 2025-02-10 13:33:32 +01:00
12badef08b Fix idea table being updated with first meeting information after scheduling Andreas Svanberg 2025-02-10 13:31:54 +01:00
8900909191 Add test-data Andreas Svanberg 2025-02-10 12:46:13 +01:00
d90a373a00 Simplify to get rid of unreachable state Andreas Svanberg 2025-02-10 12:31:15 +01:00
6f82d5fdc4 67: Employee needs to set up as active supervisor. Tom Zhao 2025-02-10 12:29:53 +01:00
06c1e81978 Send out notification when an opponent submits a report Andreas Svanberg 2025-02-10 10:48:20 +01:00
1299af5b00 Remove the AttachmentReport abstraction on the panel to fill out opposition report Andreas Svanberg 2025-02-10 10:27:29 +01:00
ed59368920 Merge commit '219c312441eeeba79df4b7295d9fd63542b65cd1' into HEAD release-295 Jenkins 2025-02-07 22:43:10 +01:00
791ec65633 Show information to the supervisor that they've requested improvements Andreas Svanberg 2025-02-07 14:48:03 +01:00
305142a862 Do not remind supervisors to grade opponents if they've requested improvements Andreas Svanberg 2025-02-07 12:40:23 +01:00
5e0d285272 Extract common functionality for both branches Andreas Svanberg 2025-02-07 12:34:54 +01:00