66 Commits

Author SHA1 Message Date
fred-fri
e9349dccf2 made view dev profile active by default 2013-10-15 17:27:16 +09:00
71de5a26f4 Merge branch 'develop' into wicketupdate
Conflicts:
	view/pom.xml
	view/src/main/java/se/su/dsv/scipro/activityplan/panels/ActivityPlanPanel.html
	view/src/main/java/se/su/dsv/scipro/admin/panels/AdminNewIdeaDetailsCrudPanel.java
	view/src/main/java/se/su/dsv/scipro/admin/panels/AdminNewIdeaOverviewPanel.html
	view/src/main/java/se/su/dsv/scipro/admin/panels/AdminNewIdeaOverviewPanel.java
	view/src/main/java/se/su/dsv/scipro/admin/panels/AdminNewIdeaPopupPanel.html
	view/src/main/java/se/su/dsv/scipro/admin/panels/AdminNewIdeaPopupPanel.java
	view/src/main/java/se/su/dsv/scipro/admin/panels/AdminRolesPanel.html
	view/src/main/java/se/su/dsv/scipro/basepages/BasePage.html
	view/src/main/java/se/su/dsv/scipro/checklists/panels/AnswerDialogPanel.html
	view/src/main/java/se/su/dsv/scipro/components/StylableDateTimeField.html
	view/src/main/java/se/su/dsv/scipro/datatables/project/ProjectDataPanel.html
	view/src/main/java/se/su/dsv/scipro/landingpages/NewIdeaLandingPage.java
	view/src/main/java/se/su/dsv/scipro/project/pages/ProjectOppositionPage.html
	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/project/panels/ProjectNewIdeaSubmissionPanel.html
	view/src/main/java/se/su/dsv/scipro/project/panels/ProjectNewIdeaSubmissionPanel.java
	view/src/main/java/se/su/dsv/scipro/repository/pages/RepositoryDownloadPage.java
	view/src/main/java/se/su/dsv/scipro/reusable/AbstractRoleAutoCompleteComponent.java
	view/src/main/java/se/su/dsv/scipro/security/auth/ExternalAuthenticationRequestHelper.java
	view/src/main/java/se/su/dsv/scipro/seminar/panels/SeminarThesisPanel.java
	view/src/main/java/se/su/dsv/scipro/supervisor/panels/SupervisorAllSupervisorIdeasPanel.java
	view/src/main/java/se/su/dsv/scipro/supervisor/panels/SupervisorNewAllStudentIdeasPanel.java
	view/src/main/java/se/su/dsv/scipro/supervisor/panels/SupervisorNewEditIdeaPanel.html
	view/src/test/java/se/su/dsv/scipro/panels/ChecklistAnswerCommentPanelTest.java
	view/src/test/java/se/su/dsv/scipro/panels/CommentThreadPanelTest.java
2013-10-15 10:09:28 +02:00
d3738a4044 Error mails now include hostname in subject line. 2013-10-14 15:19:53 +02:00
Emil Siverhall
b8bc695f39 changes to make wicket 6 work 2013-10-10 13:23:56 +02:00
Emil Siverhall
460d999fa7 finishing touches of wicket update 2013-10-09 16:38:24 +02:00
f4ac702f5c DEV profile now includes test-log4j.xml so that all logging is done to the console instead. 2013-10-08 15:21:30 +02:00
Leo
0bcd5a7047 updatestuffs 2013-10-08 15:13:00 +02:00
Leo
0bcc98dafe updatestuffs 2013-10-08 13:05:55 +02:00
Emil Siverhall
566b3b37c9 started upgrade from wicket 1.4 to 6.10.0 2013-10-07 16:53:21 +02:00
Dan Lagnöhed
110a8e1f20 Fitnesse infrastructure finished 2013-10-01 13:20:49 +02:00
e2745d5530 Updated logging to LOG4J version 2 and split up the logging so there is one each for Spring, Wicket and Hibernate at warning level and one for everything else at info that also includes the aforementioned frameworks so following the flow is easy. 2013-09-30 11:36:14 +02:00
fred-fri
9fc705790c made it possible to run jetty locally 2013-09-24 15:23:36 +09:00
Dan Lagnöhed
be6f4f8c9b Clean up of pom-files. Ignored some non unit-tests 2013-09-23 08:22:44 +02:00
Dan Lagnöhed
00eb651585 Introduced dependency management in pom-files 2013-09-22 19:36:54 +02:00
99f45b0f0e Moved finalName parameter to where it matters. 2013-09-20 15:42:39 +02:00
5ec3c88c79 Split SciPro into modules separating view from logic. 2013-09-18 16:13:08 +02:00