|
|
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 |
|
|
|
e60db5f7b1
|
Removed references to NewIdea.
|
2013-10-31 15:28:40 +01:00 |
|
|
|
c62689013e
|
Renamed helper method in Idea to get rid of "new".
|
2013-10-31 14:27:46 +01:00 |
|
|
|
a9faa7d7e2
|
Lombok'd Idea.
|
2013-10-31 14:27:19 +01:00 |
|
|
|
2a3807f488
|
Renamed TestNewIdea to TestIdea.
|
2013-10-31 14:14:25 +01:00 |
|
|
|
1988684166
|
Lombok'd IdeaExport.
|
2013-10-31 14:09:46 +01:00 |
|
|
|
6b502b5d82
|
Renamed NewIdeaExport to IdeaExport.
|
2013-10-31 14:07:59 +01:00 |
|
|
|
2213750eaa
|
Removed unused private field.
|
2013-10-31 14:02:21 +01:00 |
|
|
|
e29e5ba373
|
Renamed NewFirstMeetingService and NewFirstMeetingRepo.
|
2013-10-31 14:00:39 +01:00 |
|
|
|
661769e29f
|
Renamed NewFirstMeeting to FirstMeeting.
|
2013-10-31 13:59:03 +01:00 |
|
|
|
8b5c3a23e7
|
Removed any reference to new idea.
|
2013-10-31 13:54:58 +01:00 |
|
|
|
f6511113a6
|
Renamed NewIdeaFacade to IdeaFacade.
|
2013-10-31 13:50:04 +01:00 |
|
|
|
5ebdeec291
|
Renamed helper methods.
|
2013-10-31 13:48:54 +01:00 |
|
|
|
fb0c15cdb4
|
Renamed NewIdeaParticipation to IdeaParticipation.
|
2013-10-31 13:46:08 +01:00 |
|
|
|
8eba733140
|
Replaced deprecated numbered parameters with named parameters.
|
2013-10-31 13:32:50 +01:00 |
|
|
|
464b71345f
|
Removed comments.
|
2013-10-31 13:32:16 +01:00 |
|
|
|
b13320628d
|
Renamed NewMatchService and NewMatchRepo.
|
2013-10-31 13:31:47 +01:00 |
|
|
|
33ab65a6f2
|
Renamed NewMatch Match
|
2013-10-31 13:29:43 +01:00 |
|
|
|
b96baf7d07
|
Replaced deprecated numbered parameters with named parameters.
|
2013-10-31 13:22:30 +01:00 |
|
|
|
2c1d2a14a4
|
Removed commented out code.
|
2013-10-31 13:17:59 +01:00 |
|
|
|
90534c0f75
|
Renamed NewIdeaService and NewIdeaRepo
|
2013-10-31 13:15:34 +01:00 |
|
|
|
bfbc215018
|
Renamed NewIdea to Idea.
|
2013-10-31 13:13:39 +01:00 |
|
niklas3
|
a6ce067c51
|
1. Changed jetty to mortbay.
2. Changed table name in migration script to pascal casing.
|
2013-10-31 10:18:27 +01:00 |
|
|
|
2c47c279dd
|
Updated test to the new notification logic for individual milestones.
|
2013-10-30 17:22:45 +01:00 |
|
|
|
df5ee10eec
|
No details about the milestone in the mail until PO decide what should be there.
|
2013-10-30 16:49:28 +01:00 |
|
Emil Siverhall
|
b323f2e739
|
some notification refactoring for milestone notifications.
|
2013-10-30 16:38:39 +01:00 |
|
Emil Siverhall
|
6f655e7a4c
|
catch exception when attempting to switch to users that does not exist
|
2013-10-30 15:31:48 +01:00 |
|
Emil Siverhall
|
a4eada1c27
|
made sure we can't reach project pages without a correct project
|
2013-10-30 14:18:13 +01:00 |
|
|
|
694a4b1f20
|
Optimized imports on the whole project.
|
2013-10-30 13:54:28 +01:00 |
|
Emil Siverhall
|
566ed6de90
|
Merge remote-tracking branch 'origin/develop' into develop
|
2013-10-30 13:07:57 +01:00 |
|
Emil Siverhall
|
7500484a5c
|
Added automatic craetion of activity plan on new projects
|
2013-10-30 13:06:27 +01:00 |
|
