niklas3
|
215bfe1af0
|
Revert
20131104
|
2013-11-04 16:09:53 +01:00 |
|
niklas3
|
d8104b7155
|
Re-added public empty constructor to FPRSI.
|
2013-11-04 15:53:05 +01:00 |
|
niklas3
|
294431a103
|
Merge remote-tracking branch 'origin/develop' into develop
|
2013-11-04 15:51:21 +01:00 |
|
Emil Siverhall
|
63817b3206
|
some constants for testing
|
2013-11-04 15:15:25 +01:00 |
|
Emil Siverhall
|
541ee78f71
|
milestone completed before date filter added to milestone statistics
|
2013-11-04 15:13:56 +01:00 |
|
niklas3
|
a452fefa13
|
Added @Data on ForumPostReadStateId.
|
2013-11-04 14:46:52 +01:00 |
|
Emil Siverhall
|
16326736e3
|
made sure we show feedback when updating supervisor target numbers
|
2013-11-04 13:03:39 +01:00 |
|
|
|
f18fdad285
|
Changed thesis type id for bachelor to 56 from 3. If you do not know what 56 is well, time to read up!
|
2013-11-04 10:28:45 +01:00 |
|
Emil Siverhall
|
98d5905ac4
|
Removed unnecessary exception logging when authentication fails.
|
2013-11-04 10:23:10 +01:00 |
|
Emil Siverhall
|
212d6e574b
|
Since old supervisor ideas is still available for student selection, we can't specify a certain date where ideas needs to be created after when checking if they are exportable
|
2013-11-04 10:18:09 +01:00 |
|
Per Lundholm
|
8e51c8074e
|
Set logging from ehcache to "error".
|
2013-11-01 17:00:27 +01:00 |
|
Per Lundholm
|
72ae3d5b0d
|
Block warnings from hibernate
|
2013-11-01 16:57:14 +01:00 |
|
|
|
25f0804cbf
|
Merge remote-tracking branch 'origin/develop' into develop
|
2013-11-01 16:49:36 +01:00 |
|
|
|
4d74866eae
|
Start of FinalThesisService implementation.
|
2013-11-01 16:49:32 +01:00 |
|
niklas3
|
b2ebfed3cc
|
Clean up in aisle 2.
|
2013-11-01 16:29:53 +01:00 |
|
niklas3
|
44358328d0
|
Merge remote-tracking branch 'origin/develop' into develop
|
2013-11-01 16:10:37 +01:00 |
|
niklas3
|
c551cb0dcb
|
Clean up in aisle 1.
|
2013-11-01 16:10:33 +01:00 |
|
|
|
ac9889365e
|
Handle invalid page parameters by sending the user to the project idea start page.
|
2013-11-01 16:09:27 +01:00 |
|
|
|
6433d70048
|
Readded deleted constructor.
|
2013-11-01 15:44:58 +01:00 |
|
|
|
9976c164ab
|
Readded deleted constructor.
|
2013-11-01 15:44:12 +01:00 |
|
|
|
bee5c43cc4
|
Readded deleted constructor.
|
2013-11-01 15:43:57 +01:00 |
|
|
|
b01bcc4da3
|
Merge remote-tracking branch 'origin/develop' into develop
|
2013-11-01 15:37:07 +01:00 |
|
|
|
a82b48525e
|
Panel to upload and download final theses.
|
2013-11-01 15:37:02 +01:00 |
|
niklas3
|
5e0d70492b
|
Merge remote-tracking branch 'origin/develop' into develop
|
2013-11-01 14:53:29 +01:00 |
|
niklas3
|
571cbca977
|
Removed unnecessary serializableUID fields.
|
2013-11-01 14:53:26 +01:00 |
|
|
|
1d146c850b
|
Merge remote-tracking branch 'origin/develop' into develop
|
2013-11-01 14:38:57 +01:00 |
|
|
|
b8198fb210
|
WARN logging statements generate mails. Enjoy
|
2013-11-01 14:38:50 +01:00 |
|
Per Lundholm
|
c67e594b9c
|
Merge remote-tracking branch 'origin/develop' into develop
|
2013-11-01 14:25:38 +01:00 |
|
Per Lundholm
|
598f366fa0
|
Changed the log level to warning. Added test.
|
2013-11-01 14:25:27 +01:00 |
|
Per Lundholm
|
e8b3d2007e
|
Merge
|
2013-11-01 14:02:10 +01:00 |
|
Leo
|
bd551dc3ae
|
Merge remote-tracking branch 'origin/develop' into develop
Conflicts:
view/src/main/java/se/su/dsv/scipro/datatables/target/EditTargetPanel.java
|
2013-11-01 13:58:49 +01:00 |
|
Leo
|
a9469d728f
|
fixed error with saving new targets
|
2013-11-01 13:57:19 +01:00 |
|
niklas3
|
1c43feda98
|
Merge remote-tracking branch 'origin/develop' into develop
|
2013-11-01 13:41:54 +01:00 |
|
niklas3
|
d52421a4e0
|
Added braces to all if/else/for/while/do statements which had none.
|
2013-11-01 13:41:50 +01:00 |
|
Per Lundholm
|
a6e19495ed
|
Merge remote-tracking branch 'origin/develop' into develop
Conflicts:
view/src/main/java/se/su/dsv/scipro/workerthreads/MailEventWorker.java
|
2013-11-01 13:41:23 +01:00 |
|
Emil Siverhall
|
067a156530
|
merge conflicts
|
2013-11-01 12:34:56 +01:00 |
|
Emil Siverhall
|
fd909f0766
|
project class filter now works fine on milestone statistics page
|
2013-11-01 12:32:35 +01:00 |
|
|
|
a1229ae909
|
Merge remote-tracking branch 'origin/develop' into develop
|
2013-11-01 12:31:26 +01:00 |
|
|
|
96d2f2efd3
|
Added FinalThesis entity.
|
2013-11-01 12:31:21 +01:00 |
|
niklas3
|
bac18b8fe7
|
Merge remote-tracking branch 'origin/develop' into develop
Conflicts:
core/src/main/java/se/su/dsv/scipro/data/facade/IdeaFacade.java
core/src/main/java/se/su/dsv/scipro/data/facade/MailFacade.java
core/src/main/java/se/su/dsv/scipro/match/facade/ApplicationPeriodFacadeImpl.java
core/src/main/java/se/su/dsv/scipro/springdata/serviceimpls/IdeaServiceImpl.java
core/src/main/java/se/su/dsv/scipro/springdata/serviceimpls/MatchServiceImpl.java
core/src/main/java/se/su/dsv/scipro/springdata/serviceimpls/NewFirstMeetingServiceImpl.java
core/src/main/java/se/su/dsv/scipro/springdata/serviceimpls/TargetServiceImpl.java
core/src/test/java/se/su/dsv/scipro/springdata/TestIdea.java
core/src/test/java/se/su/dsv/scipro/springdata/serviceimpls/IdeaServiceImplTest.java
view/src/main/java/se/su/dsv/scipro/admin/pages/SystemMaintenancePage.java
view/src/main/java/se/su/dsv/scipro/admin/panels/AdminApplicationPeriodStatisticsPanel.java
view/src/main/java/se/su/dsv/scipro/admin/panels/AdminIdeaDetailsCrudPanel.java
view/src/main/java/se/su/dsv/scipro/admin/panels/AdminIdeaOverviewPanel.java
view/src/main/java/se/su/dsv/scipro/admin/panels/AdminIdeaPopupPanel.java
view/src/main/java/se/su/dsv/scipro/admin/panels/AdminIdeaStatusStatisticsPanel.java
view/src/main/java/se/su/dsv/scipro/admin/panels/match/AdminIdeaHistoryPanel.java
view/src/main/java/se/su/dsv/scipro/admin/panels/match/ManageTargetsPanel.java
view/src/main/java/se/su/dsv/scipro/admin/panels/statistics/AdminIdeaStatisticsPanel.java
view/src/main/java/se/su/dsv/scipro/admin/panels/statistics/AdminUnitStatisticsPanel.java
view/src/main/java/se/su/dsv/scipro/admin/panels/statistics/SupervisorIdeaStatisticsPanel.java
view/src/main/java/se/su/dsv/scipro/datatables/finalseminar/OpposeColumnPanel.java
view/src/main/java/se/su/dsv/scipro/datatables/finalseminar/ParticipateColumnPanel.java
view/src/main/java/se/su/dsv/scipro/datatables/idea/StudentIdeaStatusColumnPanel.java
view/src/main/java/se/su/dsv/scipro/datatables/idea/SupervisorIdeaStatusColumnPanel.java
view/src/main/java/se/su/dsv/scipro/landingpages/IdeaLandingPage.java
view/src/main/java/se/su/dsv/scipro/match/panel/ApplicationPeriodInfoPanel.java
view/src/main/java/se/su/dsv/scipro/match/panel/ApplicationPeriodSupervisorPanel.java
view/src/main/java/se/su/dsv/scipro/project/pages/AbstractNewProjectIdeaPage.java
view/src/main/java/se/su/dsv/scipro/project/pages/ProjectIdeaStartPage.java
view/src/main/java/se/su/dsv/scipro/project/pages/ProjectIdeaSubmissionPage.java
view/src/main/java/se/su/dsv/scipro/project/panels/CompleteIdeaDialogPanel.java
view/src/main/java/se/su/dsv/scipro/project/panels/IdeaAuthorInfoPanel.java
view/src/main/java/se/su/dsv/scipro/project/panels/IdeaWatsonCompletionPanel.java
view/src/main/java/se/su/dsv/scipro/project/panels/NewAcceptIdeaDialogPanel.java
view/src/main/java/se/su/dsv/scipro/project/panels/ProjectIdeaSubmissionPanel.java
view/src/main/java/se/su/dsv/scipro/project/panels/ProjectMyIdeasPanel.java
view/src/main/java/se/su/dsv/scipro/project/panels/ProjectNewAllSupervisorIdeasPanel.java
view/src/main/java/se/su/dsv/scipro/supervisor/pages/SupervisorIdeaStartPage.java
view/src/main/java/se/su/dsv/scipro/supervisor/pages/SupervisorIdeaSubmissionPage.java
view/src/main/java/se/su/dsv/scipro/supervisor/panels/SubmitNewFirstMeetingPanel.java
view/src/main/java/se/su/dsv/scipro/supervisor/panels/SupervisorAcceptIdeaDialogPanel.java
view/src/main/java/se/su/dsv/scipro/supervisor/panels/SupervisorAllSupervisorIdeasPanel.java
view/src/main/java/se/su/dsv/scipro/supervisor/panels/SupervisorMyIdeasPanel.java
view/src/main/java/se/su/dsv/scipro/supervisor/panels/SupervisorNewAllStudentIdeasPanel.java
view/src/main/java/se/su/dsv/scipro/supervisor/panels/SupervisorNewEditIdeaPanel.java
view/src/main/java/se/su/dsv/scipro/supervisor/panels/SupervisorNewIdeaDetailsPanel.java
view/src/main/java/se/su/dsv/scipro/workerthreads/IdeaExportWorker.java
|
2013-11-01 12:05:16 +01:00 |
|
niklas3
|
98e5e83792
|
Merge remote-tracking branch 'origin/develop' into develop
Conflicts:
core/src/test/java/se/su/dsv/scipro/milestones/service/impl/MileStoneServiceImplTest.java
|
2013-11-01 11:39:42 +01:00 |
|
niklas3
|
66ac495517
|
Merge remote-tracking branch 'origin/develop' into develop
Conflicts:
core/src/main/java/se/su/dsv/scipro/data/facade/IdeaFacade.java
core/src/main/java/se/su/dsv/scipro/data/facade/MailFacade.java
core/src/main/java/se/su/dsv/scipro/match/facade/ApplicationPeriodFacadeImpl.java
core/src/main/java/se/su/dsv/scipro/springdata/serviceimpls/IdeaServiceImpl.java
core/src/main/java/se/su/dsv/scipro/springdata/serviceimpls/MatchServiceImpl.java
core/src/main/java/se/su/dsv/scipro/springdata/serviceimpls/NewFirstMeetingServiceImpl.java
core/src/main/java/se/su/dsv/scipro/springdata/serviceimpls/TargetServiceImpl.java
core/src/test/java/se/su/dsv/scipro/springdata/TestIdea.java
core/src/test/java/se/su/dsv/scipro/springdata/serviceimpls/IdeaServiceImplTest.java
view/src/main/java/se/su/dsv/scipro/admin/pages/SystemMaintenancePage.java
view/src/main/java/se/su/dsv/scipro/admin/panels/AdminApplicationPeriodStatisticsPanel.java
view/src/main/java/se/su/dsv/scipro/admin/panels/AdminIdeaDetailsCrudPanel.java
view/src/main/java/se/su/dsv/scipro/admin/panels/AdminIdeaOverviewPanel.java
view/src/main/java/se/su/dsv/scipro/admin/panels/AdminIdeaPopupPanel.java
view/src/main/java/se/su/dsv/scipro/admin/panels/AdminIdeaStatusStatisticsPanel.java
view/src/main/java/se/su/dsv/scipro/admin/panels/match/AdminIdeaHistoryPanel.java
view/src/main/java/se/su/dsv/scipro/admin/panels/match/ManageTargetsPanel.java
view/src/main/java/se/su/dsv/scipro/admin/panels/statistics/AdminIdeaStatisticsPanel.java
view/src/main/java/se/su/dsv/scipro/admin/panels/statistics/AdminUnitStatisticsPanel.java
view/src/main/java/se/su/dsv/scipro/admin/panels/statistics/SupervisorIdeaStatisticsPanel.java
view/src/main/java/se/su/dsv/scipro/datatables/finalseminar/OpposeColumnPanel.java
view/src/main/java/se/su/dsv/scipro/datatables/finalseminar/ParticipateColumnPanel.java
view/src/main/java/se/su/dsv/scipro/datatables/idea/StudentIdeaStatusColumnPanel.java
view/src/main/java/se/su/dsv/scipro/datatables/idea/SupervisorIdeaStatusColumnPanel.java
view/src/main/java/se/su/dsv/scipro/landingpages/IdeaLandingPage.java
view/src/main/java/se/su/dsv/scipro/match/panel/ApplicationPeriodInfoPanel.java
view/src/main/java/se/su/dsv/scipro/match/panel/ApplicationPeriodSupervisorPanel.java
view/src/main/java/se/su/dsv/scipro/project/pages/AbstractNewProjectIdeaPage.java
view/src/main/java/se/su/dsv/scipro/project/pages/ProjectIdeaStartPage.java
view/src/main/java/se/su/dsv/scipro/project/pages/ProjectIdeaSubmissionPage.java
view/src/main/java/se/su/dsv/scipro/project/panels/CompleteIdeaDialogPanel.java
view/src/main/java/se/su/dsv/scipro/project/panels/IdeaAuthorInfoPanel.java
view/src/main/java/se/su/dsv/scipro/project/panels/IdeaWatsonCompletionPanel.java
view/src/main/java/se/su/dsv/scipro/project/panels/NewAcceptIdeaDialogPanel.java
view/src/main/java/se/su/dsv/scipro/project/panels/ProjectIdeaSubmissionPanel.java
view/src/main/java/se/su/dsv/scipro/project/panels/ProjectMyIdeasPanel.java
view/src/main/java/se/su/dsv/scipro/project/panels/ProjectNewAllSupervisorIdeasPanel.java
view/src/main/java/se/su/dsv/scipro/supervisor/pages/SupervisorIdeaStartPage.java
view/src/main/java/se/su/dsv/scipro/supervisor/pages/SupervisorIdeaSubmissionPage.java
view/src/main/java/se/su/dsv/scipro/supervisor/panels/SubmitNewFirstMeetingPanel.java
view/src/main/java/se/su/dsv/scipro/supervisor/panels/SupervisorAcceptIdeaDialogPanel.java
view/src/main/java/se/su/dsv/scipro/supervisor/panels/SupervisorAllSupervisorIdeasPanel.java
view/src/main/java/se/su/dsv/scipro/supervisor/panels/SupervisorMyIdeasPanel.java
view/src/main/java/se/su/dsv/scipro/supervisor/panels/SupervisorNewAllStudentIdeasPanel.java
view/src/main/java/se/su/dsv/scipro/supervisor/panels/SupervisorNewEditIdeaPanel.java
view/src/main/java/se/su/dsv/scipro/supervisor/panels/SupervisorNewIdeaDetailsPanel.java
view/src/main/java/se/su/dsv/scipro/workerthreads/IdeaExportWorker.java
|
2013-11-01 11:38:59 +01:00 |
|
Emil Siverhall
|
15610e41c8
|
Merge branch 'develop' of ssh://git.dsv.su.se/git/scipro/scipro into develop
|
2013-11-01 09:15:34 +01:00 |
|
Emil Siverhall
|
95999ac7a5
|
mounted page
|
2013-11-01 09:11:21 +01:00 |
|
Per Lundholm
|
7f8a9a14d5
|
Test logic for catching SendFailException
|
2013-11-01 08:57:07 +01:00 |
|
Per Lundholm
|
4bfdc95db2
|
Merge remote-tracking branch 'origin/develop' into develop
|
2013-11-01 08:40:07 +01:00 |
|
Per Lundholm
|
20af89e30a
|
Put the mail worker under test
|
2013-11-01 00:43:43 +01:00 |
|
|
|
0595b649d5
|
Removed unused collection which caused problems due to trying to modify an unmodifiable collection.
|
2013-10-31 16:55:59 +01:00 |
|
niklas3
|
def50cb062
|
Most @SpringBean, @Autowired and @Resource changed to @Inject.
|
2013-10-31 16:54:36 +01:00 |
|
Emil Siverhall
|
d3a89153d5
|
Merge branch 'develop' of ssh://git.dsv.su.se/git/scipro/scipro into develop
|
2013-10-31 16:47:38 +01:00 |
|
