|
|
94a79e3b9d
|
Renamed PhDFacade StudyPlanService
|
2014-02-27 16:07:47 +01:00 |
|
|
|
1139050618
|
Made PhDFacade an interface.
|
2014-02-27 16:07:08 +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
|
6c4e099e8a
|
forum test
|
2014-02-27 15:53:39 +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 |
|
Emil Siverhall
|
240097a59d
|
test
|
2014-02-27 15:06:11 +01:00 |
|
|
|
59d3091d94
|
Merge remote-tracking branch 'origin/develop' into develop
|
2014-02-27 15:02:07 +01:00 |
|
|
|
7ce32c18d0
|
Added tests to make sure no notifications are sent out when confirming milestones for projects that do not have them enabled.
|
2014-02-27 15:02:02 +01:00 |
|
Emil Siverhall
|
03ea9f09ae
|
woop
|
2014-02-27 15:00:41 +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 |
|
|
|
f6ca94e662
|
Can not confirm milestones if the project does not have the milestone module.
|
2014-02-27 14:54:00 +01:00 |
|
Emil Siverhall
|
da04d2edfd
|
activity plan related
|
2014-02-27 14:49:39 +01:00 |
|
|
|
4ef86124be
|
Refactoring
|
2014-02-27 14:39:44 +01:00 |
|
|
|
cff98165c1
|
Moved private method to the bottom.
|
2014-02-27 14:33:51 +01:00 |
|
|
|
ea0a7436b6
|
Changed returned type.
|
2014-02-27 14:33:21 +01:00 |
|
Emil Siverhall
|
c5c5632f24
|
Merge remote-tracking branch 'origin/develop' into develop
|
2014-02-27 14:32:01 +01:00 |
|
|
|
d4a8afa489
|
Removed milestone code related methods that were unused.
|
2014-02-27 14:31:52 +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 |
|
|
|
256839c2c9
|
Renamed impl to proper casing.
|
2014-02-27 14:25:55 +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 |
|
|
|
3a98d0e72b
|
Find project types with specified module activated.
|
2014-02-27 13:51:03 +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 |
|
fred-fri
|
42e099ee58
|
Merge branch 'develop' of ssh://git.dsv.su.se/git/scipro/scipro into develop
|
2014-02-27 19:22:20 +09:00 |
|
fred-fri
|
9f22d4c8cb
|
merging peer stuff
|
2014-02-27 19:21:43 +09:00 |
|
