fred-fri
|
8629c3dd41
|
develop2
|
2014-01-16 13:12:12 +09:00 |
|
|
|
cd6936f9bb
|
Merge remote-tracking branch 'origin/develop' into develop
|
2014-01-15 17:17:05 +01:00 |
|
|
|
23cb64e982
|
Final refactoring.
|
2014-01-15 17:16:59 +01:00 |
|
|
|
776dc5f386
|
Moved check for no/only one project to page from panel.
|
2014-01-15 17:10:54 +01:00 |
|
Emil Siverhall
|
09c01a463a
|
checkbox filter on ideas without first meeting booked..
|
2014-01-15 17:06:45 +01:00 |
|
|
|
25f0ed36c9
|
Check for only one project now ignores inactive ones.
|
2014-01-15 16:57:03 +01:00 |
|
|
|
415881a8d1
|
Replaced filter with checkboxes to match the rest of the system. Removed inactive as a choice.
|
2014-01-15 16:31:44 +01:00 |
|
|
|
5be7880be1
|
Loosened requirements.
|
2014-01-15 16:02:47 +01:00 |
|
|
|
a7c3a8fa50
|
Refactored and tested retrieving projects and displaying "no projects" label.
|
2014-01-15 15:55:00 +01:00 |
|
Emil Siverhall
|
5dd7567604
|
Merge remote-tracking branch 'origin/develop' into develop
|
2014-01-15 15:32:32 +01:00 |
|
|
|
f09e8a18d9
|
Made the label for "no projects" not ugly.
|
2014-01-15 15:28:01 +01:00 |
|
Emil Siverhall
|
760bfee334
|
renamed FunctionalEditCheckListTemplatePanel. Great name..
|
2014-01-15 14:50:54 +01:00 |
|
Emil Siverhall
|
9e0458f4bd
|
moving some stuff around when editing checklist templates
|
2014-01-15 14:49:46 +01:00 |
|
|
|
559c3cdcbd
|
Merge remote-tracking branch 'origin/develop' into develop
|
2014-01-15 14:41:08 +01:00 |
|
|
|
3d11aabd6c
|
Changed labelString() return type from String to IModel<?> and replaced label component with setBody(IModel<?>)
|
2014-01-15 14:29:29 +01:00 |
|
|
|
61948ac2fd
|
Cleanup.
|
2014-01-15 14:18:53 +01:00 |
|
Emil Siverhall
|
71dbe4ec0f
|
changed to show all final seminars tab if student have a project on degreelevel first or second instead of hiding if a project on degreelevel none exists
|
2014-01-15 13:12:40 +01:00 |
|
Emil Siverhall
|
faac75a8c7
|
proper size on create project type dialog
|
2014-01-15 12:13:26 +01:00 |
|
|
|
815f2761fc
|
Merge remote-tracking branch 'origin/develop' into develop
|
2014-01-15 11:38:50 +01:00 |
|
|
|
084d8ae6c2
|
Fixed warnings.
|
2014-01-15 11:35:44 +01:00 |
|
|
|
58ab87cb5b
|
Phases are now hidden if there are no activities.
|
2014-01-15 11:35:23 +01:00 |
|
|
|
8271a9ba7e
|
Refactored a bit.
|
2014-01-15 11:21:39 +01:00 |
|
|
|
ebb58a5f3c
|
No need to use a StringResourceModel.
|
2014-01-15 11:17:58 +01:00 |
|
Richard
|
c9b1c1d521
|
Merge remote-tracking branch 'origin/develop' into develop
|
2014-01-15 11:08:54 +01:00 |
|
|
|
1cb5247bda
|
Changed default return value from mocked PreliminaryGradingReportService.
|
2014-01-15 10:40:40 +01:00 |
|
Richard
|
e4c98c9021
|
Merge remote-tracking branch 'origin/develop' into develop
|
2014-01-15 10:26:49 +01:00 |
|
Emil Siverhall
|
9d3e8c875a
|
Merge remote-tracking branch 'origin/develop' into develop
|
2014-01-15 10:22:35 +01:00 |
|
Emil Siverhall
|
691ae1ad69
|
same on Admin->Match->Ideas
|
2014-01-15 10:21:39 +01:00 |
|
Emil Siverhall
|
1eb5512de5
|
changed from OnChangeAjaxBehavior to AjaxFormComponentUpdatingBehavior on free text filter (project management)
|
2014-01-15 10:19:18 +01:00 |
|
Richard
|
4f1e485619
|
Merge remote-tracking branch 'origin/develop' into develop
|
2014-01-15 10:11:46 +01:00 |
|
|
|
d50224c224
|
Added generics.
|
2014-01-15 10:05:33 +01:00 |
|
|
|
355a3a09d7
|
Different text for report link if it is submitted or not.
|
2014-01-15 10:05:10 +01:00 |
|
|
|
d0350a4a88
|
Merge remote-tracking branch 'origin/develop' into develop
|
2014-01-15 10:00:34 +01:00 |
|
Emil Siverhall
|
0d6a66a147
|
disabled clearance of reviewer in project management since this produced null pointer in auto complete field
|
2014-01-15 09:51:18 +01:00 |
|
Emil Siverhall
|
92b198023c
|
feedback when submitting grading report
|
2014-01-15 08:55:37 +01:00 |
|
Richard
|
2238453417
|
Merge remote-tracking branch 'origin/develop' into develop
|
2014-01-14 17:30:38 +01:00 |
|
Richard
|
ec519c33cc
|
- Replaced details-box with well.
- Removed details-box.
- CSS-cleanup.
|
2014-01-14 17:30:17 +01:00 |
|
|
|
7e98514ada
|
Renamed panel since it is now generic.
|
2014-01-14 15:45:28 +01:00 |
|
|
|
b1cdebf219
|
Merged OppositionReport and PreliminaryGradingReport.
|
2014-01-14 15:42:06 +01:00 |
|
|
|
5bc10281b4
|
Fixed database schema.
|
2014-01-14 14:31:38 +01:00 |
|
|
|
9be491336d
|
Fixed FillOutPreliminaryGradingReportPanel so that the report gets submitted and saved correctly.
|
2014-01-14 14:04:12 +01:00 |
|
|
|
842e293338
|
Removed preliminary grading criterion and used opposition criterion everywhere.
|
2014-01-14 13:47:50 +01:00 |
|
|
|
21ff54fb23
|
Fixed tests. These tests are badly written and need to fetch their expected message from the .properties file to prevent future errors like these.
|
2014-01-14 13:01:01 +01:00 |
|
|
|
d4facd3f9e
|
Made methods private.
|
2014-01-14 11:38:48 +01:00 |
|
Richard
|
b4460771ee
|
- Removed ECTS-credits, added hp.
|
2014-01-14 11:02:26 +01:00 |
|
Richard
|
a887fd0912
|
- Removed parenthesis, added comma.
|
2014-01-14 11:01:12 +01:00 |
|
Richard
|
ee39582884
|
Merge remote-tracking branch 'origin/develop' into develop
|
2014-01-14 10:32:36 +01:00 |
|
Richard
|
b028f3e3b7
|
- Changes to text on the thesis link panels.
|
2014-01-14 10:32:29 +01:00 |
|
Emil Siverhall
|
0d312ccba4
|
Merge remote-tracking branch 'origin/develop' into develop
|
2014-01-14 10:22:52 +01:00 |
|
Emil Siverhall
|
85cd14c333
|
beta annotation on preliminary grading page and readded upload opposition form to use when new opposition report is in beta stage.
|
2014-01-14 10:21:50 +01:00 |
|
