11 Commits

Author SHA1 Message Date
fred-fri
6a176d1ff8 project state tests 2014-02-25 19:30:33 +09:00
fred-fri
e3a23c40dc fixing fitnesse+selenium 2014-02-19 19:52:37 +09:00
fred-fri
56a53cd1eb fixing fitnesse+selenium 2014-02-19 19:36:31 +09:00
fred-fri
2040479e73 fixing fitnesse+selenium 2014-02-19 18:42:43 +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
Dan Lagnöhed
e18da87dfb . 2013-10-08 09:18:35 +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
c4526d2f8b Trying to find bug... 2013-10-03 14:39:58 +02:00
Dan Lagnöhed
110a8e1f20 Fitnesse infrastructure finished 2013-10-01 13:20:49 +02:00
Dan Lagnöhed
3c9f7b0740 Fitnesse infrastructure continued 2013-09-24 15:05:14 +02:00
Dan Lagnöhed
a2829f8496 Fitnesse infrastructure in place 2013-09-24 11:05:29 +02:00