Leo
|
adecd427cf
|
added data to override equals()
|
2013-11-06 14:39:10 +01:00 |
|
Leo
|
8724866949
|
merge
|
2013-11-06 14:28:14 +01:00 |
|
Leo
|
4ac389a2a3
|
Merge remote-tracking branch 'origin/develop' into develop
Conflicts:
view/src/test/java/se/su/dsv/scipro/project/panels/FinalThesisPanelTest.java
|
2013-11-06 14:26:41 +01:00 |
|
Emil Siverhall
|
2283b4dfdb
|
Merge remote-tracking branch 'origin/develop' into develop
|
2013-11-06 13:51:15 +01:00 |
|
Emil Siverhall
|
84df6b7255
|
added notification when uploading final thesis
|
2013-11-06 13:50:27 +01:00 |
|
Leo
|
7a8a7d5e11
|
hides uploadForm if no final seminar has taken place
|
2013-11-06 13:48:50 +01:00 |
|
Leo
|
ed5d86920c
|
removed unused columns in FinalSeminar
|
2013-11-06 11:46:12 +01:00 |
|
Leo
|
d3244541e0
|
added help needed for days filter
|
2013-11-06 11:10:41 +01:00 |
|
Leo
|
ff06b03a2c
|
Merge remote-tracking branch 'origin/develop' into develop
|
2013-11-06 09:36:09 +01:00 |
|
Leo
|
2da377611e
|
fixed project follower bug
|
2013-11-06 09:35:49 +01:00 |
|
Emil Siverhall
|
420c526eab
|
added scipro base url to notifications created by idea export worker for proper url creation
|
2013-11-05 16:58:19 +01:00 |
|
Emil Siverhall
|
793536b496
|
Merge remote-tracking branch 'origin/develop' into develop
|
2013-11-05 15:32:35 +01:00 |
|
Emil Siverhall
|
1614f758bb
|
fixed NPE in ProjectScheduleFacadeImpl when trying to add predefined activity plan in our import job
|
2013-11-05 15:31:19 +01:00 |
|
Leo
|
11cc94bd86
|
added mocktest to FinalThesisService
|
2013-11-05 15:14:08 +01:00 |
|
Leo
|
72c0667c09
|
implementation and tests for getFinalThesisFileDescription
|
2013-11-05 12:51:33 +01:00 |
|
Leo
|
ec87a64ffc
|
implementation and tests for hasFinalThesis
|
2013-11-05 11:44:50 +01:00 |
|
fred-fri
|
5a6f2cc09d
|
authorization fixes
|
2013-11-05 16:09:59 +09:00 |
|
niklas3
|
215bfe1af0
|
Revert
|
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
|
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 |
|
|
|
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 |
|
|
|
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
|
c551cb0dcb
|
Clean up in aisle 1.
|
2013-11-01 16:10:33 +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
|
571cbca977
|
Removed unnecessary serializableUID fields.
|
2013-11-01 14:53:26 +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 |
|
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
|
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 |
|
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 |
|
|
|
ece5c1b3e3
|
Renamed everything NewIdea to Idea.
|
2013-10-31 16:36:04 +01:00 |
|
|
|
d04d039fd0
|
Renamed all newidea* tables.
|
2013-10-31 15:51:59 +01:00 |
|
Emil Siverhall
|
02d65018c0
|
first version of milestone statistics. does not include any filtering
|
2013-10-31 15:41:04 +01:00 |
|
|
|
c37b569611
|
Renamed NewIdeaBuilder to IdeaBuilder.
|
2013-10-31 15:32:31 +01:00 |
|
|
|
23548edaee
|
Removed commented out code.
|
2013-10-31 15:30:26 +01:00 |
|
|
|
550f182344
|
Renamed field to ideaService from newIdeaService.
|
2013-10-31 15:30:06 +01:00 |
|
