9543 Commits

Author SHA1 Message Date
Richard
2ddb807be4 Continued work with upgrading to bootstrap 3.
Fixes - Some inputs.
2013-10-01 17:03:47 +02:00
Leo
8145fe9f12 Merge branch 'develop' of ssh://git.dsv.su.se/git/scipro/scipro into develop 2013-10-01 16:50:35 +02:00
Leo
b0c4bf3371 More tests to NewIdeaService
Refactored ProjectNewIdeaSubmissionPage
2013-10-01 16:50:22 +02:00
Leo
882cb85cd6 tests for validateSupervisorIdeaSubmission 2013-10-01 16:08:00 +02:00
Richard
db4f662725 Continued work with upgrading to bootstrap 3.
Fixes - Milestones.
Fixes - Project state panel.
Fixes - Different form objects.
2013-10-01 16:00:30 +02:00
Leo
a76d10582f Removed some circular dependencies and added test to NewIdeaService 2013-10-01 15:35:39 +02:00
Richard
b604a04885 Continued work with upgrading to bootstrap 3.
Different layout fixes.
2013-10-01 14:26:31 +02:00
Dan Lagnöhed
72da0964f4 Merge remote-tracking branch 'origin/develop' into develop 2013-10-01 14:14:53 +02:00
Dan Lagnöhed
3afa55c630 Removed sprint tag for test 2013-10-01 14:14:45 +02:00
Leo
08b5fa49c4 Merge branch 'develop' of ssh://git.dsv.su.se/git/scipro/scipro into develop
Conflicts:
	core/src/test/java/se/su/dsv/scipro/springdata/serviceimpls/ProjectServiceImplTest.java
2013-10-01 13:45:30 +02:00
Leo
eee64015b6 Merge branch 'develop' of ssh://git.dsv.su.se/git/scipro/scipro into develop
Conflicts:
	core/src/test/java/se/su/dsv/scipro/springdata/serviceimpls/ProjectServiceImplTest.java
2013-10-01 13:44:54 +02:00
Leo
64db042920 merge 2013-10-01 13:40:06 +02:00
Dan Lagnöhed
c17c765d8c Fix for failing test 2013-10-01 13:38:22 +02:00
Leo
4ceaf3fb9d Merge branch 'develop' of ssh://git.dsv.su.se/git/scipro/scipro into develop 2013-10-01 13:29:18 +02:00
Leo
b8f8598720 added tests for TurnItInCheckService and removed PasswordService 2013-10-01 13:29:04 +02:00
Dan Lagnöhed
110a8e1f20 Fitnesse infrastructure finished 2013-10-01 13:20:49 +02:00
Leo
4759d77312 added test for BooleanBuilders in ProjectService 2013-10-01 13:15:15 +02:00
Richard
d1266c81bb Continued work with upgrading to bootstrap 3.
Forum fixes.
2013-10-01 11:35:56 +02:00
Leo
0a37699aed minor refactoring and tests added to ProjectServiceImpl 2013-10-01 11:31:06 +02:00
Leo
84eaa82b7a Merge branch 'develop' of ssh://git.dsv.su.se/git/scipro/scipro into develop 2013-10-01 09:57:14 +02:00
Leo
c233c15af0 added tests to sendNotification 2013-10-01 09:56:55 +02:00
Richard
292c1bee4e Continued work with upgrading to bootstrap 3.
First button update.
2013-10-01 09:56:24 +02:00
Richard
bb8995419e Continued work with upgrading to bootstrap 3.
Fixed padding-problems.
HTML cleanup.
2013-10-01 09:49:29 +02:00
Emil Siverhall
f04f15dd48 keyword service integration test 2013-10-01 09:08:25 +02:00
Richard
2df19187ae Merge remote-tracking branch 'origin/develop' into develop
Conflicts:
	view/src/main/java/se/su/dsv/scipro/project/pages/ProjectDetailsPage.html
	view/src/main/java/se/su/dsv/scipro/supervisor/pages/SupervisorProjectDetailsPage.html
2013-10-01 08:40:10 +02:00
fred-fri
23d5debcda markup improvement 2013-10-01 14:04:46 +09:00
fred-fri
66d14643c1 removed old panel 2013-10-01 13:55:17 +09:00
fred-fri
65900ce67b removed old panel and markup improvements 2013-10-01 13:53:23 +09:00
fred-fri
7a6890384a removed old panel 2013-10-01 13:49:29 +09:00
fred-fri
2c3a0dcf88 markup improvements 2013-10-01 13:45:50 +09:00
fred-fri
0f64fe865f added tests 2013-10-01 13:26:00 +09:00
fred-fri
0d9268186c added tests 2013-10-01 13:19:18 +09:00
fred-fri
3391b44de7 added test file 2013-10-01 13:15:33 +09:00
fred-fri
222f951554 added properties file 2013-10-01 13:09:43 +09:00
fred-fri
85c67957c1 cleanup 2013-10-01 13:08:02 +09:00
fred-fri
ae3a3054bf added no activities label 2013-10-01 13:06:23 +09:00
fred-fri
a4adf0f701 sort order correct 2013-10-01 13:01:11 +09:00
fred-fri
8632fa67ed added stuff to list, made panel abstract 2013-10-01 12:15:56 +09:00
fred-fri
fd6ac15216 added list 2013-10-01 12:11:38 +09:00
fred-fri
7d80b77c58 added new panel to page 2013-10-01 12:06:26 +09:00
fred-fri
1cfb69ec37 added new panel 2013-10-01 12:03:55 +09:00
fred-fri
5f40922d98 reorganized projectstartpage 2013-10-01 11:00:15 +09:00
df9aec4e29 Fixed typo 2013-09-30 19:52:31 +02:00
Emil Siverhall
7e83a7a9fe removed some service dependencies from final seminar service 2013-09-30 17:42:02 +02:00
Leo
7f12f4f224 Merge branch 'develop' of ssh://git.dsv.su.se/git/scipro/scipro into develop 2013-09-30 16:57:37 +02:00
Leo
c5deba563e more tests for FinalSeminarServiceImpl 2013-09-30 16:57:20 +02:00
Leo
e24a8ad9bd more tests for FinalSeminarServiceImpl 2013-09-30 15:51:22 +02:00
db272cd089 Merge remote-tracking branch 'origin/develop' into develop 2013-09-30 15:31:24 +02:00
ff946f2c0e Only 2 weeks of logs are saved. 2013-09-30 15:31:16 +02:00
22fcf5753d Added separate log files for every worker. 2013-09-30 15:00:33 +02:00