6916 Commits

Author SHA1 Message Date
be2eb4911f Fixed NPE when idea has no supervisor. 2014-03-18 10:52:31 +01:00
Golrokh Moattar
5df71a8b7c Continuing merging the four tabs on the peer. 2014-03-18 10:44:08 +01:00
75e541dc53 Probably working workers. 2014-03-18 09:42:15 +01:00
14197625da Workers now run. 2014-03-17 21:06:47 +01:00
de50b465f2 No need to have it as an eager singleton, let it get garbage collected once we are done with it. 2014-03-17 19:45:18 +01:00
3718954da8 Do not create and add the injector twice. 2014-03-17 19:44:50 +01:00
Golrokh Moattar
2940e40c36 Merge remote-tracking branch 'origin/develop' into develop
Conflicts:
	core/src/main/java/modules/RepositoryModule.java
2014-03-17 17:25:54 +01:00
Golrokh Moattar
a19f1b24d8 Merging the four tabs on the peer. 2014-03-17 17:20:23 +01:00
9e8fe4dd4e Removed unused repository. 2014-03-17 17:03:00 +01:00
90fb5f00ac Fixed service implementation. 2014-03-17 16:56:03 +01:00
60fb46db5b Spring gone for good. No backsies. 2014-03-17 16:40:10 +01:00
c16e982169 Hooked up DataInitializer. 2014-03-17 14:29:43 +01:00
d1a365b10f Added profile and milestone service impl. 2014-03-17 14:13:53 +01:00
7630be3c42 Mocked file handling during tests. 2014-03-17 11:27:18 +01:00
87ee548431 Merge remote-tracking branch 'origin/develop' into guice
Conflicts:
	core/src/main/java/se/su/dsv/scipro/match/IdeaRepo.java
2014-03-17 11:03:35 +01:00
fred-fri
0cb31c4d11 sonar issues 2014-03-17 15:34:20 +09:00
fred-fri
4b7fcf8669 sonar issues 2014-03-17 14:55:52 +09:00
fred-fri
5e35fa11ef sonar issues 2014-03-17 14:42:49 +09:00
fred-fri
55ab43f84a sonar issues 2014-03-17 14:20:13 +09:00
fred-fri
0dc4dcabc8 sonar issues 2014-03-17 13:24:32 +09:00
fred-fri
3bc466dcb5 sonar issues 2014-03-17 13:12:05 +09:00
fred-fri
5203f36c9f sonar issues 2014-03-17 12:44:58 +09:00
fred-fri
5e1b4aea39 sonar issues 2014-03-17 12:44:43 +09:00
06a6249189 No comment. 2014-03-16 21:34:26 +01:00
e55b4bf967 Added DaisyIntegrationModule. 2014-03-16 20:21:21 +01:00
2edbc7e0c8 More tests. 2014-03-16 16:45:48 +01:00
138e2fa461 Fixed all view tests.
Added a module containing all mocks to the test injector.
Removed double mocks since the Guice injector cant handle it.
2014-03-16 10:56:47 +01:00
5b5196d4d5 Moved modules to its own package. 2014-03-15 23:24:12 +01:00
d05d1bef61 Removed Spring data jpa dependency. 2014-03-15 12:17:31 +01:00
3129d43e03 Added core module and bound the first few services to enable logging in. 2014-03-15 10:11:27 +01:00
b952264c4b Hooked up database with automatic migrations. 2014-03-15 09:51:31 +01:00
04ec4e9e0b Switched DI framework to Guice from Spring. 2014-03-15 09:46:14 +01:00
leosu
6334eda395 extra test 2014-03-14 16:14:07 +01:00
leosu
835b59f81b supervisor final grading submit button disabled after submit 2014-03-14 16:10:47 +01:00
Emil Siverhall
e103ecdf8e updateCoSupervisors should give role ASSISTANT_SUPERVISOR instead of EXAMINER 2014-03-14 15:07:44 +01:00
Emil Siverhall
eca95db3f4 repaint calculated grade on save. 2014-03-14 14:14:23 +01:00
Emil Siverhall
9b9956dda3 Merge remote-tracking branch 'origin/develop' into develop 2014-03-14 13:03:00 +01:00
Emil Siverhall
fad5c695e9 updated test 2014-03-14 13:01:20 +01:00
Richard
25b55961b9 Minor changes to the text on FillOutGradingReportPanel. 2014-03-14 12:46:05 +01:00
Richard
a8bc136396 Replaced Swedish text on the master grading schemas with english text. 2014-03-14 12:36:01 +01:00
leosu
b2fa8de8a5 removed examiner-if 2014-03-14 11:49:28 +01:00
leosu
88a20ecbca FillOutReportPanel always has enabled submit button 2014-03-14 11:47:54 +01:00
leosu
6873c4743a Merge remote-tracking branch 'origin/develop' into develop 2014-03-14 11:41:04 +01:00
leosu
1704fb8f05 RFGRP always has enabled submit button 2014-03-14 11:21:46 +01:00
Emil Siverhall
8918751ce8 test fix 2014-03-14 11:01:14 +01:00
fred-fri
3c71d26ad0 properties bug 2014-03-14 16:59:52 +09:00
fred-fri
9f5caed93e lazy bug 2014-03-14 16:53:23 +09:00
Emil Siverhall
febc96f3be removed old upload features for preliminary grading reports and oppositions 2014-03-13 17:13:13 +01:00
Emil Siverhall
5e043cb7cc more beta 2014-03-13 16:46:50 +01:00
Emil Siverhall
7a304a2538 removed beta-annotations 2014-03-13 16:40:26 +01:00