|
|
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 |
|
fred-fri
|
e9bb12ee62
|
some refactoring
|
2014-08-15 17:20:41 +09:00 |
|
|
|
27337ae76d
|
Merge remote-tracking branch 'origin/develop' into develop
|
2014-08-15 10:17:27 +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 |
|
fred-fri
|
d44fb065da
|
some refactoring
|
2014-08-15 17:12:38 +09:00 |
|
fred-fri
|
1a82a12bdc
|
some refactoring
|
2014-08-15 16:53:39 +09:00 |
|
fred-fri
|
eba7f06ae0
|
some refactoring
|
2014-08-15 16:38:44 +09:00 |
|
fred-fri
|
949a6b7f8d
|
some refactoring
|
2014-08-15 11:13:28 +09:00 |
|
fred-fri
|
fb191f494c
|
some refactoring
|
2014-08-15 11:13:13 +09:00 |
|
fred-fri
|
5dbb9bd094
|
adding attachment to forum mail
|
2014-08-15 10:16:06 +09:00 |
|
|
|
c983c26d92
|
Merge remote-tracking branch 'origin/develop' into develop
|
2014-08-14 16:45:24 +02:00 |
|
|
|
def03f3f0a
|
Attachments are now included when reading forum mails.
|
2014-08-14 16:45:19 +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 |
|
|
|
310e78f9c2
|
Created OptionalMatchers to prevent warnings in tests working with Optionals.
|
2014-08-14 11:00:38 +02:00 |
|
|
|
3a4d0f3766
|
Added a createReply method to BasicForumService that works with FileDescriptions.
Redirected ForumMailWorker to use the new method instead of passing null into ProjectForumService.
|
2014-08-14 10:40:49 +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 |
|
Golrokh Moattar
|
74cef17beb
|
Merge remote-tracking branch 'origin/develop' into develop
|
2014-08-12 14:55:02 +02:00 |
|
Golrokh Moattar
|
4aaec0df6d
|
"Opposition & active participation" removed from the supervisor tabs and moved to the project overview page
|
2014-08-12 14:54:45 +02:00 |
|
