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 |
|
Emil Siverhall
|
4b890a11f7
|
ProjectClassFilter to use instead of repeating filter form checbox panel choices() on all pages
|
2013-10-31 16:46:52 +01:00 |
|
|
|
129d14af9c
|
#339 Wrapped collection in a new TreeSet
|
2013-10-31 16:42:59 +01:00 |
|
|
|
ece5c1b3e3
|
Renamed everything NewIdea to Idea.
|
2013-10-31 16:36:04 +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 |
|
|
|
c62689013e
|
Renamed helper method in Idea to get rid of "new".
|
2013-10-31 14:27:46 +01:00 |
|
|
|
6b502b5d82
|
Renamed NewIdeaExport to IdeaExport.
|
2013-10-31 14:07:59 +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 |
|
|
|
f6511113a6
|
Renamed NewIdeaFacade to IdeaFacade.
|
2013-10-31 13:50:04 +01:00 |
|
|
|
fb0c15cdb4
|
Renamed NewIdeaParticipation to IdeaParticipation.
|
2013-10-31 13:46:08 +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 |
|
|
|
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 |
|
|
|
1ea759869c
|
Additional logging now includes user-agent (browser).
|
2013-10-31 12:55:51 +01:00 |
|
|
|
031da0e6cd
|
Added more logging when exceptions are thrown. Now includes current user, request url and all request parameters.
|
2013-10-31 11:19:58 +01:00 |
|
Emil Siverhall
|
cdd63eec9e
|
changed some confirmation messages that didn't look good
|
2013-10-31 10:25:23 +01:00 |
|
niklas3
|
bd198f3876
|
Merge remote-tracking branch 'origin/develop' into develop
|
2013-10-31 10:18:30 +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 |
|
Emil Siverhall
|
22e247cc04
|
milestone switch when thesis is being uploaded
|
2013-10-31 09:55:46 +01:00 |
|
Per Lundholm
|
239f07d0b2
|
Merge remote-tracking branch 'origin/develop' into develop
|
2013-10-30 22:55:09 +01:00 |
|
Per Lundholm
|
14f6e98c24
|
Removed illegal access to getString
|
2013-10-30 22:54:55 +01:00 |
|
Emil Siverhall
|
7d8e4ffc3d
|
Merge remote-tracking branch 'origin/develop' into develop
Conflicts:
view/src/main/java/se/su/dsv/scipro/seminar/panels/SeminarThesisPanel.java
|
2013-10-30 16:42:33 +01:00 |
|
Emil Siverhall
|
b323f2e739
|
some notification refactoring for milestone notifications.
|
2013-10-30 16:38:39 +01:00 |
|
Per Lundholm
|
7fbe040b92
|
Merge remote-tracking branch 'origin/develop' into develop
|
2013-10-30 16:32:45 +01:00 |
|
Per Lundholm
|
de8a20ca8e
|
Fixed access to properties access during construction. No longer using ModalWindowPlus as it overrides setTitle and breaks it.
|
2013-10-30 16:32:33 +01:00 |
|
|
|
481a60118e
|
Fixed some warnings and renamed some wicket ids.
|
2013-10-30 16:17:31 +01:00 |
|
|
|
39486276b2
|
Fixed adding students by wrapping return value in a tree set... and actually using the field instead of the final unmodifiable constructor parameter.
|
2013-10-30 16:08:44 +01:00 |
|
|
|
6be35f7134
|
Merge remote-tracking branch 'origin/develop' into develop
|
2013-10-30 15:33:37 +01:00 |
|
|
|
4a2406ab99
|
Fixed adding students by wrapping return value in a tree set.
|
2013-10-30 15:33:33 +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
|
72deb71fb5
|
milestone changes on create and delete final seminars
|
2013-10-30 15:11:04 +01:00 |
|
Emil Siverhall
|
a555d9bff6
|
fixed image errors on ListChecklistPanel where we tried to replace images that were never added
|
2013-10-30 14:54:14 +01:00 |
|
Emil Siverhall
|
16e5b86146
|
changed to use getString instead of StringResourceModel in CreateForumThreadPanel
|
2013-10-30 14:43:05 +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 |
|
Emil Siverhall
|
182a45a015
|
Made sure we can't use upload field on file panel without file attachment
|
2013-10-30 14:07:19 +01:00 |
|
|
|
03521d3413
|
Merge remote-tracking branch 'origin/develop' into develop
|
2013-10-30 13:54:32 +01:00 |
|
|
|
694a4b1f20
|
Optimized imports on the whole project.
|
2013-10-30 13:54:28 +01:00 |
|
Emil Siverhall
|
8df76b4523
|
Merge remote-tracking branch 'origin/develop' into develop
|
2013-10-30 13:48:46 +01:00 |
|
