15029 Commits

Author SHA1 Message Date
e7b0ebc53b Changed unknown content type to foo/bar since multipart/* is not unknown in the test case. release-2014-08-19_14-03-31 2014-08-19 13:48:12 +02:00
torgny
464578e38d Författare kan inte spara Activity Plan template. 2014-08-19 13:37:45 +02:00
4f4597019d Changed content parser to handle any multipart content correctly instead of only multipart/alternative 2014-08-19 13:23: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
f2707baa6c Now that firstName, lastName and emailAddress are non-null (or should be... JPA...) the compareTo method can be simplified. 2014-08-19 10:58:13 +02:00
b8179745ab Fixed warning. 2014-08-19 10:52:40 +02:00
9dfca93a4c Name conflict. 2014-08-19 10:46:35 +02:00
72568b9a76 Made firstName, lastName, emailAddress not null in User.
I hate whoever invented null.
I hate JPA for enforcing default constructors.
I hate Wicket for promoting the use of standard java beans from persistence to presentation.
2014-08-19 10:46:01 +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
05d2ce4d2d Fucking mutable state. 2014-08-18 13:24:17 +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
0fddf90a33 Merge remote-tracking branch 'origin/develop' into develop 2014-08-18 10:36:10 +02:00
fred-fri
dee40a62fb removed commented out line 2014-08-18 17:12:10 +09:00
fred-fri
8d85e04dd9 lol if statement 2014-08-18 17:06:28 +09:00
a43019c360 Merge remote-tracking branch 'origin/develop' into develop 2014-08-18 10:04:41 +02:00
97aa07b32d Fixed unchecked warning. 2014-08-18 10:04:36 +02:00
fred-fri
069897495d some refactoring 2014-08-18 11:25:30 +09:00
fred-fri
a970dac969 some refactoring 2014-08-18 10:11:22 +09:00
fred-fri
93d488628e some refactoring 2014-08-18 09:45:34 +09:00
fred-fri
bdf0fdca26 Merge remote-tracking branch 'origin/develop' into develop 2014-08-15 17:52:00 +09:00
fred-fri
16f7dc14a9 some refactoring 2014-08-15 17:47:47 +09:00
ab75916dd6 Fix 2014-08-15 10:31:36 +02:00
42420deab6 Merge remote-tracking branch 'origin/develop' into develop 2014-08-15 10:26:06 +02:00
55ed8300f3 Minor refactorings. 2014-08-15 10:26:02 +02:00
fred-fri
31eb44f149 Merge remote-tracking branch 'origin/develop' into develop 2014-08-15 17:20:56 +09:00