niklas3
|
c551cb0dcb
|
Clean up in aisle 1.
|
2013-11-01 16:10:33 +01:00 |
|
niklas3
|
def50cb062
|
Most @SpringBean, @Autowired and @Resource changed to @Inject.
|
2013-10-31 16:54:36 +01:00 |
|
|
|
0b1f9ad983
|
Merge branch 'develop' into wicketupdate
|
2013-10-15 10:54:33 +02: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
|
13607ed8ea
|
TurnItIn component. Initial checkin with incomplete tests
|
2013-10-14 15:40:54 +02:00 |
|
fred-fri
|
cd06e5fe83
|
Merge branch 'develop' of ssh://git.dsv.su.se/git/scipro/scipro into develop
|
2013-10-08 16:20:01 +09:00 |
|
fred-fri
|
4d68258fc6
|
removed file that should be removed
|
2013-10-08 16:19:27 +09:00 |
|
Dan Lagnöhed
|
e18da87dfb
|
.
|
2013-10-08 09:18:35 +02:00 |
|
fred-fri
|
c7632c277a
|
fixed conflict
|
2013-10-08 13:47:57 +09:00 |
|
fred-fri
|
e06cf46e8c
|
added program to admin overview
|
2013-10-08 12:59:23 +09: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
|
953140214b
|
Fitnesse test that actually tests something...
|
2013-10-07 11:45:58 +02:00 |
|
Dan Lagnöhed
|
e3395cb543
|
Trying to find bug...
|
2013-10-04 10:15:55 +02:00 |
|
Dan Lagnöhed
|
ccaf6016f5
|
Trying to find bug...
|
2013-10-04 10:12:24 +02:00 |
|
Dan Lagnöhed
|
a20f5be569
|
Trying to find bug...
|
2013-10-04 09:56:25 +02:00 |
|
Dan Lagnöhed
|
c4526d2f8b
|
Trying to find bug...
|
2013-10-03 14:39:58 +02:00 |
|
Dan Lagnöhed
|
65789076e2
|
Trying to find bug...
|
2013-10-03 14:10:23 +02:00 |
|
Dan Lagnöhed
|
4a4b86bdc1
|
Trying to find bug...
|
2013-10-03 11:14:38 +02:00 |
|
Dan Lagnöhed
|
a417d85fa9
|
Trying to find bug... Also changed to new junit package name in som places
|
2013-10-03 11:04:01 +02:00 |
|
Dan Lagnöhed
|
758072b47b
|
Trying to find bug...
|
2013-10-03 10:31:32 +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 |
|
