218 Commits

Author SHA1 Message Date
9602903eb9 Updated Cobertura plugin to a Java 7 compatible version. 2014-01-13 17:22:10 +01:00
9f8f65f49b Java 7. 2014-01-13 16:52:12 +01:00
4612bd5c1a Fixed current profile string for TEST profile. 2014-01-09 14:31:34 +01:00
818e392e62 Fixed TEST profile to be more PROD like. 2014-01-09 13:11:15 +01:00
301ea0c744 Went down in MySQL version to get rid of the memory leak caused by the abandoned connection cleanup thread. 2013-11-14 16:24:36 +01:00
85cb365956 Added worker to send grading reports as PDFs to daisy. 2013-11-13 16:52:29 +01:00
fred-fri
6f442ff84d removed ehcache 2013-11-08 13:49:01 +09:00
c9e45b0f38 Default settings for the project is now DEV.
Added back the TEST profile to re-enable logging on thesis3.
2013-10-28 17:08:11 +01:00
Emil Siverhall
93f36492c6 resolved merge conflicts 2013-10-15 11:42:42 +02:00
Emil Siverhall
714aa7a371 switched out the autocomplete component to use select2choice instead of our old broken component 2013-10-15 11:28:09 +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
316a291262 Removed -verbose from javac 2013-10-14 10:48:49 +02:00
fred-fri
a721778af8 removed profiles 2013-10-14 14:01:28 +09:00
6806cfc6b0 Knasbollar 2013-10-11 09:39:39 +02:00
fred-fri
d9a24ec9d6 removed plugin, turned off generateddl in dev profile and added new dev generate ddl profile specifically for generating ddl 2013-10-10 18:33:03 +09:00
fred-fri
17261a54f7 added flyway 2013-10-10 16:56:39 +09:00
Emil Siverhall
460d999fa7 finishing touches of wicket update 2013-10-09 16:38:24 +02:00
Leo
0bcd5a7047 updatestuffs 2013-10-08 15:13:00 +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
953140214b Fitnesse test that actually tests something... 2013-10-07 11:45:58 +02:00
Dan Lagnöhed
b27cda4d90 Trying to find bug... 2013-10-07 09:43:15 +02:00
Dan Lagnöhed
6aeea1cd9e Trying to find bug... 2013-10-04 13:04:58 +02:00
Dan Lagnöhed
110a8e1f20 Fitnesse infrastructure finished 2013-10-01 13:20:49 +02:00
22fcf5753d Added separate log files for every worker. 2013-09-30 15:00:33 +02:00
b2f7808866 Provided is correct since it is only required for compilation and should not be included as a dependency in the packaged version. 2013-09-30 11:36:54 +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
Leo
fae4115b4b updated spring framework 2013-09-26 11:19:37 +02:00
Leo
02dd25c3ab updated QueryDSL and spring data 2013-09-26 11:00:53 +02:00
Leo
e23c82e39a updated hibernate 2013-09-26 10:36:59 +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
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
47ce3f6753 Whole import rewritten.
Still not importing project participants/authors.
2013-09-20 08:50:31 +02:00
5ec3c88c79 Split SciPro into modules separating view from logic. 2013-09-18 16:13:08 +02:00
3300063294 Updated API code to use the standard jax-rs API instead of the no longer maintained com.sun.jersey.* 2013-09-17 16:50:25 +02:00
55c2782f86 Minor pom cleaning. 2013-09-17 09:41:51 +02:00
Emil Siverhall
648b706777 removed visural dependency from pom.xml 2013-09-17 08:06:40 +02:00
fred-fri
505629fe58 changed pom name 2013-08-21 14:16:11 +09:00
fred-fri
5f96a9541b reset visural in pom to how it was before updates etc 2013-06-28 15:50:44 +09:00
fred-fri
0a06bbbc62 added back visural common to pom, fixes the bug with notifications 2013-06-27 12:10:40 +09:00
fred-fri
72e8a07afb removed unused rome 2013-06-19 15:26:35 +09:00
fred-fri
637d342038 updated jersey 2013-06-19 14:54:58 +09:00
fred-fri
eb7537795b updated visural wicket, removed unused visural common 2013-06-19 13:18:17 +09:00
fred-fri
8a88918948 commented out unused jsoup 2013-06-19 13:02:31 +09:00
fred-fri
3d6154f2f9 updated google guava 2013-06-19 12:49:22 +09:00
fred-fri
620c20112d updated biz base64coder 2013-06-19 12:44:58 +09:00