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 |
|
|
|
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 |
|
|
|
eb14c58aff
|
Renamed dependency.
|
2014-02-27 17:31:05 +01:00 |
|
|
|
d5b0f2c557
|
Post project created events when projects are created.
|
2014-02-27 17:30:47 +01:00 |
|
|
|
8fb1795297
|
Reduced visibility of constructor.
|
2014-02-27 17:19:46 +01:00 |
|
|
|
97753e5941
|
Made test class @Transactional to automatically roll back any database changes afterwards.
|
2014-02-27 17:02:52 +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 |
|
|
|
ed07db56aa
|
Renamed PhDRepo to StudyPlanRepository.
|
2014-02-27 16:14:28 +01:00 |
|
|
|
430cb27dd5
|
Annual reviews are cascaded from the StudyPlan, no need to persist those manually.
|
2014-02-27 16:12:30 +01:00 |
|
|
|
201a5235aa
|
Switched to constructor injection to simplify testing.
|
2014-02-27 16:10:25 +01:00 |
|
|
|
b8fe1957f9
|
Removed @Transactional from interface, moved it to class level in impl.
|
2014-02-27 16:09:33 +01:00 |
|
|
|
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
|
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 |
|
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 |
|
|
|
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 |
|
|
|
d4a8afa489
|
Removed milestone code related methods that were unused.
|
2014-02-27 14:31:52 +01:00 |
|
|
|
256839c2c9
|
Renamed impl to proper casing.
|
2014-02-27 14:25:55 +01:00 |
|
|
|
3a98d0e72b
|
Find project types with specified module activated.
|
2014-02-27 13:51:03 +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 |
|
Emil Siverhall
|
e1b781b64d
|
Merge remote-tracking branch 'origin/develop' into develop
|
2014-02-27 10:38:59 +01:00 |
|
Emil Siverhall
|
9f5cb2a113
|
authorization strategy refactoring
|
2014-02-27 10:37:12 +01:00 |
|
fred-fri
|
1ff010c5f5
|
moving peer stuff
|
2014-02-27 18:33:20 +09:00 |
|
|
|
a64ebfd00b
|
Removed unnecessary call to MessageFormat#format
|
2014-02-27 10:31:20 +01:00 |
|
|
|
084b144efb
|
Changed from Data to Getter/Setter to inherit equals/hashCode properly.
|
2014-02-27 10:11:16 +01:00 |
|
|
|
ded00d2da1
|
Changed from deprecated DateMidnight to DateTime#withTimeAtStartOfDay
|
2014-02-27 10:10:56 +01:00 |
|
|
|
d470105720
|
Changed order of plugins to prevent errors when compiling.
|
2014-02-27 10:10:23 +01:00 |
|
fred-fri
|
e6dde8d917
|
Merge branch 'develop' of ssh://git.dsv.su.se/git/scipro/scipro into develop
|
2014-02-27 17:47:02 +09:00 |
|
fred-fri
|
bcb39b6dcf
|
moved finalthesisreview stuff
|
2014-02-27 17:46:15 +09:00 |
|
Emil Siverhall
|
b1da5e534a
|
Merge remote-tracking branch 'origin/develop' into develop
|
2014-02-27 09:23:58 +01:00 |
|
fred-fri
|
9345b5b3c0
|
moving target stuff
|
2014-02-27 17:23:35 +09:00 |
|
|
|
9128b8c329
|
Merge remote-tracking branch 'origin/develop' into develop
Conflicts:
core/src/main/java/se/su/dsv/scipro/comment/CommentThread.java
core/src/main/java/se/su/dsv/scipro/file/FileDescription.java
core/src/main/java/se/su/dsv/scipro/finalseminar/FinalSeminar.java
core/src/main/java/se/su/dsv/scipro/project/Project.java
view/src/main/java/se/su/dsv/scipro/workerthreads/TurnItInCheckWorker.java
|
2014-02-27 09:16:29 +01:00 |
|
|
|
cdcd72470b
|
Merge remote-tracking branch 'origin/develop' into develop
Conflicts:
core/src/main/java/se/su/dsv/scipro/comment/CommentThread.java
core/src/main/java/se/su/dsv/scipro/file/FileDescription.java
core/src/main/java/se/su/dsv/scipro/finalseminar/FinalSeminar.java
core/src/main/java/se/su/dsv/scipro/project/Project.java
view/src/main/java/se/su/dsv/scipro/workerthreads/TurnItInCheckWorker.java
|
2014-02-27 09:06:18 +01:00 |
|
