Leo
|
d3244541e0
|
added help needed for days filter
|
2013-11-06 11:10:41 +01:00 |
|
Emil Siverhall
|
6437e652a9
|
Merge remote-tracking branch 'origin/develop' into develop
|
2013-11-06 10:03:50 +01:00 |
|
Emil Siverhall
|
582fca0524
|
fixed getString warning for CreateForumThreadPanel
|
2013-11-06 09:58:35 +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 |
|
fred-fri
|
d636d85fb4
|
more info about sendfailed
|
2013-11-06 15:58:37 +09:00 |
|
fred-fri
|
a9bf3c49df
|
test commit to check log messages on thesis3
|
2013-11-06 15:24:51 +09:00 |
|
fred-fri
|
a4180467a6
|
workaround filter for a wicket bug
|
2013-11-06 15:06:38 +09: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 |
|
Leo
|
529f9d5836
|
Merge remote-tracking branch 'origin/develop' into develop
|
2013-11-05 15:15:09 +01:00 |
|
Leo
|
11cc94bd86
|
added mocktest to FinalThesisService
|
2013-11-05 15:14:08 +01:00 |
|
Emil Siverhall
|
d0dedb7fed
|
changed logging level when user is attempting to switch user. Only keep error logging if the user is trying to switch without sysadmin role
|
2013-11-05 14:34:20 +01:00 |
|
Emil Siverhall
|
5bda67d5cb
|
changed logging level when user is authenticated but not found through api
|
2013-11-05 13:52:17 +01:00 |
|
Emil Siverhall
|
5e9236f110
|
merge
|
2013-11-05 13:08:09 +01:00 |
|
Emil Siverhall
|
8ac35cefb6
|
Merge remote-tracking branch 'origin/develop' into develop
Conflicts:
view/src/main/java/se/su/dsv/scipro/admin/panels/AdminIdeaOverviewPanel.html
|
2013-11-05 11:53:55 +01:00 |
|
Emil Siverhall
|
034cfbe3c6
|
refactoring of admin idea panels to avoid duplication
|
2013-11-05 11:46:59 +01:00 |
|
Richard
|
1b542a6a7c
|
Minor css-changes on admin/ideas and edit keyword popup.
|
2013-11-05 11:40:45 +01:00 |
|
Richard
|
33d30dd6a6
|
Fixed checkbox not having correct padding on reviewing page.
|
2013-11-05 11:25:54 +01:00 |
|
Richard
|
70e253035d
|
Minor change in CSS regarding horizontal scrollbar in modal windows.
|
2013-11-05 11:16:24 +01:00 |
|
Emil Siverhall
|
84a13ea582
|
switch to use ProjectClassFilter on a few places
|
2013-11-05 09:05:15 +01:00 |
|
fred-fri
|
5a6f2cc09d
|
authorization fixes
|
2013-11-05 16:09:59 +09:00 |
|
Richard
|
c8814f3bb7
|
Fix that removes the horizontal scrollbar on pages and in the modal windows.
|
2013-11-04 17:55:12 +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 |
|
Emil Siverhall
|
16326736e3
|
made sure we show feedback when updating supervisor target numbers
|
2013-11-04 13:03:39 +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 |
|
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 |
|
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 |
|
