4611 Commits

Author SHA1 Message Date
torgny
464578e38d Författare kan inte spara Activity Plan template. 2014-08-19 13:37:45 +02:00
8e0e4ea042 Re-ordered the settings a bit. 2014-08-19 11:23:39 +02:00
897f23dad7 Separated reply e-mail and account name. 2014-08-19 11:21:17 +02:00
e43f2d20d6 Fixed label markup. 2014-08-19 11:15:06 +02:00
09a370fce1 Renamed some forum mail settings. 2014-08-19 11:13:56 +02:00
b8179745ab Fixed warning. 2014-08-19 10:52:40 +02:00
fred-fri
7079762c2d removed import 2014-08-19 15:39:35 +09:00
fred-fri
3614e6694f admin can now cancel final seminars 2014-08-19 15:27:17 +09:00
fred-fri
85a939c7aa final seminar now has activity in activity plan 2014-08-19 12:34:33 +09:00
82f2ee2fa5 Merge remote-tracking branch 'origin/develop' into develop 2014-08-18 17:26:34 +02:00
e2f2865284 Export av edit targets till excel 2014-08-18 17:25:54 +02:00
ec1c279751 I hate whoever invented null.
I hate JPA for enforcing default constructors.
I hate Java for not having Option.
2014-08-18 16:48:20 +02:00
f4f9e908ab Tests now use a properly populated user with an e-mail address. 2014-08-18 16:10:48 +02:00
e2644f1be7 Tests now use a properly populated user with an e-mail address. 2014-08-18 16:09:30 +02:00
847f20b484 User link panel now uses gravatar images instead of default anonymous icon. 2014-08-18 15:55:57 +02:00
9ab5bdc1eb Removed hard-coded normal font-weight for label and made the font-weight fix run after ajax completions in addition to page load. 2014-08-18 15:46:22 +02:00
f412558654 Fixed proper Bootstrap markup. 2014-08-18 15:45:18 +02:00
514c8708e6 Users can now choose to hide their Gravatar image. 2014-08-18 15:36:21 +02:00
491a3a916e Moved the md5 utility function out of TurnItInComponent.
Added Gravatar images to user profiles.
2014-08-18 15:23:13 +02:00
8666f0594f Rewrote the md5 function so you can actually understand what is going on.
There is a test verifying with 1000 random 4096 byte arrays that the results are still the same.
2014-08-18 14:53:23 +02:00
384f2356da Merge remote-tracking branch 'origin/develop' into develop 2014-08-18 14:25:51 +02:00
e871b0b393 Public page that lists the next 20 upcoming final seminars. 2014-08-18 14:25:46 +02:00
0464d6f7e8 Merge remote-tracking branch 'origin/develop' into develop 2014-08-18 13:55:13 +02:00
c3a90bb264 GRU replaced with Match 2014-08-18 13:54:43 +02:00
ce153311a2 Merge remote-tracking branch 'origin/develop' into develop 2014-08-18 13:10:00 +02:00
2024bd5ac2 Removed ignored test. 2014-08-18 13:07:32 +02:00
12b0b3a141 Removed commented out code. 2014-08-18 13:01:58 +02:00
e98f92ed8a Un-ajaxified the student idea submission page. It was not used for anything except complicating re-rendering of feedback panels. 2014-08-18 13:01:38 +02:00
5baeb2e71f Ideas can now have multiple languages selected. 2014-08-18 11:35:56 +02:00
torgny
64a8743ecd Ändrat ordningen mellan flikarna Reviewing och Examining. 2014-08-18 11:13:27 +02:00
97aa07b32d Fixed unchecked warning. 2014-08-18 10:04:36 +02:00
ab75916dd6 Fix 2014-08-15 10:31:36 +02:00
55ed8300f3 Minor refactorings. 2014-08-15 10:26:02 +02:00
293b09cbc2 Make the test class name match the class under test. 2014-08-15 10:17:22 +02:00
d0c425165b Removed stupid SSO redirect. 2014-08-15 10:16:55 +02:00
c983c26d92 Merge remote-tracking branch 'origin/develop' into develop 2014-08-14 16:45:24 +02:00
52140b8809 Changed FileUpload to work with InputStream using the loaner pattern rather than in-memory byte arrays.
Why does so much stuff depend on uploading files? It should really only be FileDescriptionService.
2014-08-14 13:24:44 +02:00
b689dd23db Tiny refactor 2014-08-14 11:50:55 +02:00
196004d43e Refactored some file uploads. 2014-08-14 11:42:57 +02:00
Golrokh Moattar
da838d66f9 Merge remote-tracking branch 'origin/develop' into develop 2014-08-13 16:18:53 +02:00
Golrokh Moattar
4120dc40f0 styling 2014-08-13 16:18:46 +02:00
0ac564076d Fixed some Sonar problems. 2014-08-13 15:08:44 +02:00
665852cc74 Removed "some" unused code. 2014-08-13 11:12:01 +02:00
49d87b3f4c Merge remote-tracking branch 'origin/develop' into develop
Conflicts:
	view/src/test/java/se/su/dsv/scipro/match/SupervisorMyIdeasPanelTest.java
2014-08-13 08:20:47 +02:00
fred-fri
9f69b5b67d shortened some texts 2014-08-13 15:13:55 +09:00
fred-fri
ef0b24af56 individual milestone graphics added 2014-08-13 15:03:51 +09:00
fred-fri
5f4a1ba2e3 added new link to download report without input 2014-08-13 11:26:27 +09:00
fred-fri
d34f4a27bc gradingreport pdf no longer says null at grade if grade is null, it says that grade will be calculated when all critera have been assessed 2014-08-13 10:03:17 +09:00
Golrokh Moattar
28edfb76b0 opposition and active participation parts separated in the supervisor project overview 2014-08-12 16:34:34 +02:00
Golrokh Moattar
6131126cdb adding "s" to "review" 2014-08-12 15:03:02 +02:00