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 |
|
|
|
ca3da5826b
|
Fixed test
|
2014-08-12 09:41:18 +02:00 |
|
|
|
43ac32e263
|
"Matched, has project" is now not selected by default on the supervisor ideas page.
|
2014-08-12 09:38:43 +02:00 |
|
|
|
90e6e85b16
|
Removed the old "Published" column, it is now included in the new selection column.
|
2014-08-12 09:32:54 +02:00 |
|
|
|
22a11437b0
|
Removed redundant local variable.
|
2014-08-12 09:31:52 +02:00 |
|
|
|
8bd97b7b97
|
Fixed some non-detachable models.
|
2014-08-12 09:31:36 +02:00 |
|
|
|
def64c9802
|
Made title column exportable.
|
2014-08-12 09:25:48 +02:00 |
|
|
|
95f750081b
|
Show every ideas selection state in the supervisors list of ideas.
|
2014-08-12 09:21:47 +02:00 |
|
fred-fri
|
80c3d0e5e9
|
removed all traces of final version (changed to final thesis, which it should be)
|
2014-08-12 14:07:50 +09:00 |
|
fred-fri
|
e5f7c15870
|
grading report can now be downloaded even though nothing has been filled in
|
2014-08-12 10:32:58 +09:00 |
|
fred-fri
|
fbc81445b0
|
supervisor now always has access to grading
|
2014-08-12 09:36:09 +09:00 |
|
Golrokh Moattar
|
9125f6f8d3
|
Grading template changed so that we have project type in the pdf file as well
|
2014-08-11 16:23:45 +02:00 |
|
|
|
8356e44405
|
Removed "Matched, has project" as default filter selection from supervisor my ideas page.
|
2014-08-11 16:20:00 +02:00 |
|
|
|
f51ab0d9ee
|
No tests left.
|
2014-08-11 15:46:31 +02:00 |
|
|
|
eae65c23d0
|
Removed unnecessary service method.
|
2014-08-11 15:46:11 +02:00 |
|
|
|
7c37377d36
|
Merge remote-tracking branch 'origin/develop' into develop
|
2014-08-11 15:24:04 +02:00 |
|
Golrokh Moattar
|
6a48d6d82f
|
Reset removed from login page, Forgot password moved down
|
2014-08-11 15:10:58 +02:00 |
|
|
|
8aead9551a
|
Constructors go at the top.
|
2014-08-11 14:58:52 +02:00 |
|
|
|
6897adca29
|
Removed final warning.
|
2014-08-11 14:57:15 +02:00 |
|
|
|
69c95f3bb4
|
More cleaning.
|
2014-08-11 14:56:05 +02:00 |
|
|
|
8af4d98b14
|
General cleaning
|
2014-08-11 14:53:05 +02:00 |
|
