fred-fri
|
db871764a3
|
moving idea stuff
|
2014-02-28 12:58:57 +09:00 |
|
fred-fri
|
09be79b317
|
moving projectpartner stuff
|
2014-02-28 12:49:42 +09:00 |
|
fred-fri
|
8224ec1901
|
moving finalseminarrespondent to finalseminar
|
2014-02-28 12:40:57 +09:00 |
|
fred-fri
|
6c214459fe
|
removing commentable from project and finalseminar
|
2014-02-28 12:38:09 +09:00 |
|
fred-fri
|
062be5fd22
|
moving and merging match stuff
|
2014-02-28 12:23:37 +09:00 |
|
fred-fri
|
b0d1db64f3
|
fixed type error
|
2014-02-28 12:01:09 +09:00 |
|
|
|
ba99cf8f7d
|
Merge remote-tracking branch 'origin/develop' into develop
Conflicts:
view/src/main/java/se/su/dsv/scipro/project/pages/ProjectDetailsPage.java
view/src/main/java/se/su/dsv/scipro/supervisor/pages/SupervisorProjectDetailsPage.java
|
2014-02-27 17:45:04 +01:00 |
|
|
|
9df5b01de0
|
StudyPlan is now created when a project is created with the STUDY_PLAN module activated via the event bus.
|
2014-02-27 17:42:44 +01:00 |
|
Golrokh Moattar
|
8a5271aed8
|
Fix phd link panel in SupervisorProjectDetailsPage
|
2014-02-27 17:39:04 +01:00 |
|
Golrokh Moattar
|
25d73524a1
|
Fix phd link panel
|
2014-02-27 17:18:50 +01:00 |
|
|
|
6dccdfdafb
|
Renamed PhDPanel to StudyPlanPanel and hooked it up to the STUDY_PLAN module.
Fixed some cascade issues.
|
2014-02-27 16:58:41 +01:00 |
|
Emil Siverhall
|
5f05aecd22
|
updated tests
|
2014-02-27 16:47:03 +01:00 |
|
Emil Siverhall
|
09e8e53060
|
seminar-annotations
|
2014-02-27 16:24:09 +01:00 |
|
Emil Siverhall
|
98f63bd104
|
seminar panel on overview should go by the strategy as well
|
2014-02-27 16:12:44 +01:00 |
|
Emil Siverhall
|
ec3b09ce86
|
opposition pages to module FinalSeminar. remove first or second cycle checks when adding tab menu items, use module based strategy instead.
|
2014-02-27 16:11:01 +01:00 |
|
|
|
94a79e3b9d
|
Renamed PhDFacade StudyPlanService
|
2014-02-27 16:07:47 +01:00 |
|
|
|
fcd26b43cc
|
Tightened up the domain model a bit.
|
2014-02-27 16:05:23 +01:00 |
|
|
|
28f8f24d82
|
Renamed PhD to StudyPlan.
|
2014-02-27 15:57:48 +01:00 |
|
Emil Siverhall
|
14f3f25466
|
Merge remote-tracking branch 'origin/develop' into develop
|
2014-02-27 15:54:08 +01:00 |
|
Emil Siverhall
|
02fee9c3d7
|
forum modules
|
2014-02-27 15:44:09 +01:00 |
|
|
|
58adc184b7
|
Added new module; Study plan.
|
2014-02-27 15:40:27 +01:00 |
|
|
|
6d191248c9
|
Merge remote-tracking branch 'origin/develop' into develop
|
2014-02-27 15:37:01 +01:00 |
|
|
|
225a253c24
|
Sort of hooked up final seminars to the module system.
|
2014-02-27 15:36:55 +01:00 |
|
|
|
74bae16412
|
Nobody has delete privileges.
|
2014-02-27 15:35:17 +01:00 |
|
Golrokh Moattar
|
7dd68bf82d
|
Merge remote-tracking branch 'origin/develop' into develop
|
2014-02-27 15:24:56 +01:00 |
|
Golrokh Moattar
|
a4fe4a1de1
|
better code
|
2014-02-27 15:24:51 +01:00 |
|
Richard
|
36c88597c7
|
Merge remote-tracking branch 'origin/develop' into develop
|
2014-02-27 15:13:21 +01:00 |
|
|
|
e9ea63ceb8
|
Merge remote-tracking branch 'origin/develop' into develop
|
2014-02-27 15:12:38 +01:00 |
|
|
|
2178f09164
|
Added css class to make button more visible
|
2014-02-27 15:12:33 +01:00 |
|
|
|
d2e2faada0
|
Hooked up files to module settings.
|
2014-02-27 15:11:59 +01:00 |
|
Emil Siverhall
|
5ddbcac3b9
|
Merge remote-tracking branch 'origin/develop' into develop
Conflicts:
core/src/main/java/se/su/dsv/scipro/milestones/service/impl/MilestoneServiceImpl.java
|
2014-02-27 15:06:28 +01:00 |
|
|
|
59d3091d94
|
Merge remote-tracking branch 'origin/develop' into develop
|
2014-02-27 15:02:07 +01:00 |
|
Emil Siverhall
|
aa3381c062
|
project state module settings
|
2014-02-27 14:58:39 +01:00 |
|
Golrokh Moattar
|
35e6c6faaf
|
Merge remote-tracking branch 'origin/develop' into develop
|
2014-02-27 14:54:42 +01:00 |
|
Golrokh Moattar
|
326ab181f7
|
better code
|
2014-02-27 14:54:30 +01:00 |
|
Emil Siverhall
|
c5c5632f24
|
Merge remote-tracking branch 'origin/develop' into develop
|
2014-02-27 14:32:01 +01:00 |
|
Emil Siverhall
|
391f9bc564
|
activity plan and some missing peer hookups
|
2014-02-27 14:30:07 +01:00 |
|
Richard
|
cfebeb7b19
|
Inputs and textareas on the different grading reports now shown correctly.
|
2014-02-27 14:28:59 +01:00 |
|
|
|
bd03217c4f
|
Hooked up milestone panels and pages to the module system.
|
2014-02-27 14:25:14 +01:00 |
|
Emil Siverhall
|
0b6c5c3184
|
test fix
|
2014-02-27 14:16:32 +01:00 |
|
|
|
e2b4072ea6
|
Removed left-over if check that made checklist in-accessible by students.
|
2014-02-27 14:15:16 +01:00 |
|
|
|
1dab46900c
|
Hooked up checklist module. Checklist templates can only be created for project types that currently have the checklist module activated.
|
2014-02-27 14:11:35 +01:00 |
|
Emil Siverhall
|
a23dc7643b
|
Merge remote-tracking branch 'origin/develop' into develop
|
2014-02-27 13:52:02 +01:00 |
|
Emil Siverhall
|
37138f7ba2
|
modules for tests
|
2014-02-27 13:51:48 +01:00 |
|
Emil Siverhall
|
83f9e5dac1
|
peer module hookups to new authorization strategy
|
2014-02-27 13:39:11 +01:00 |
|
|
|
3d5c3955bd
|
Such a neat little exporter and Wicket fails :(
|
2014-02-27 13:18:01 +01:00 |
|
|
|
3b1a35f0a1
|
Simplified DateColumn.
|
2014-02-27 13:11:13 +01:00 |
|
Emil Siverhall
|
a536cb6adf
|
removed abstract authorization strategy since it's only being used in the role based strategy for now
|
2014-02-27 12:55:58 +01:00 |
|
Emil Siverhall
|
23936f8afe
|
Merge remote-tracking branch 'origin/develop' into develop
|
2014-02-27 11:47:21 +01:00 |
|
Emil Siverhall
|
791995fd8d
|
admin interface for editing module settings
|
2014-02-27 11:47:08 +01:00 |
|
