14672 Commits

Author SHA1 Message Date
Dan Lagnöhed
5b63d299d2 Fixed some sonar critical issues 2013-10-07 13:17:02 +02:00
Richard
c63b984946 Merge remote-tracking branch 'origin/develop' into develop 2013-10-07 12:48:27 +02:00
Richard
4e375dbb9c Fixed date-time fields. 2013-10-07 12:48:22 +02:00
Richard
905213eb3d Fixed date-time fields. 2013-10-07 12:34:42 +02:00
Dan Lagnöhed
5ea32f8c42 Merge remote-tracking branch 'origin/develop' into develop 2013-10-07 11:46:08 +02:00
Dan Lagnöhed
953140214b Fitnesse test that actually tests something... 2013-10-07 11:45:58 +02:00
Richard
3bf44cfbef Merge remote-tracking branch 'origin/develop' into develop 2013-10-07 11:33:46 +02:00
Richard
c9f4a15dc6 Fixed minor problems with some popups not displaying correctly after implementing bootstrap 3.
Fixed Header switching to mobile-view in desktop mode.
2013-10-07 11:33:36 +02:00
438a595f89 Fixed case problems. Go mac! 2013-10-07 10:25:39 +02:00
Dan Lagnöhed
b27cda4d90 Trying to find bug... 2013-10-07 09:43:15 +02:00
fred-fri
5a763feb39 merge 2013-10-07 12:01:43 +09:00
Richard
c1d688e7fc Merge remote-tracking branch 'origin/develop' into develop
Conflicts:
	view/src/main/java/se/su/dsv/scipro/peer/panels/PeerReviewListPanel.html
2013-10-04 16:50:04 +02:00
Richard
8379a22084 Continued work with upgrading to bootstrap 3. 2013-10-04 16:47:43 +02:00
Richard
4b60c9c399 Continued work with upgrading to bootstrap 3. 2013-10-04 15:29:54 +02:00
Dan Lagnöhed
6aeea1cd9e Trying to find bug... 2013-10-04 13:04:58 +02:00
Dan Lagnöhed
d07b14e3f8 Merge remote-tracking branch 'origin/develop' into develop 2013-10-04 11:58:41 +02:00
Dan Lagnöhed
8936a7d21a Trying to find bug... 2013-10-04 11:58:27 +02:00
Leo
b3a8cd63a9 fix 2013-10-04 11:25:07 +02:00
Leo
8a1870ebf6 Merge branch 'develop' of ssh://git.dsv.su.se/git/scipro/scipro into develop 2013-10-04 11:18:27 +02:00
Leo
cbef1079f8 tests for NewIdeaFacade 2013-10-04 11:18:16 +02:00
fred-fri
3627566858 Merge branch 'develop' of ssh://git.dsv.su.se/git/scipro/scipro into develop 2013-10-04 18:09:01 +09:00
fred-fri
4537111d2c edit 2013-10-04 18:08:24 +09:00
Leo
e842595ae6 Merge branch 'develop' of ssh://git.dsv.su.se/git/scipro/scipro into develop 2013-10-04 11:03:58 +02:00
Leo
97e6a08154 Removed circular dependencies between NewIdeaServiceImpl and TargetServiceImpl by creating NewIdeaFacade 2013-10-04 11:03:43 +02:00
Leo
f32ed71444 Removed some unused methods 2013-10-04 10:16:56 +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
928989e591 Merge remote-tracking branch 'origin/develop' into develop 2013-10-04 09:56:37 +02:00
Dan Lagnöhed
a20f5be569 Trying to find bug... 2013-10-04 09:56:25 +02:00
Emil Siverhall
8562ef59de Merge branch 'develop' of ssh://git.dsv.su.se/git/scipro/scipro into develop 2013-10-04 09:52:24 +02:00
Leo
0f6adadac1 Removed ImageIcon and replaced with ImageObject 2013-10-04 09:43:58 +02:00
Leo
46a8e24140 Merge branch 'develop' of ssh://git.dsv.su.se/git/scipro/scipro into develop 2013-10-04 09:19:56 +02:00
40d106034d Added Mysema maven plugin to execute QueryDSL processing. 2013-10-04 09:16:10 +02:00
Emil Siverhall
df2888456a target service refactoring 2013-10-04 08:48:53 +02:00
fred-fri
1fff47df68 removed redundant asserts 2013-10-04 15:26:45 +09:00
fred-fri
b76316b48e fixed test 2013-10-04 14:48:16 +09:00
fred-fri
90cbbc7836 only try to export projects with no export 2013-10-04 14:25:12 +09:00
fred-fri
4c4da09619 added hard coded date before which we dont want to try to export ideas 2013-10-04 14:24:01 +09:00
fred-fri
28fc70a1f6 made idea exportable on other days than application period course start day 2013-10-04 14:18:45 +09:00
fred-fri
68b3f3d491 improved error display 2013-10-04 14:17:36 +09:00
Richard
e33e9c47b8 Continued work with upgrading to bootstrap 3.
- Login page.
- Milestones icon.
- Minor design changes to the overview page.
2013-10-03 16:41:29 +02:00
Leo
b4f2564a58 refactoring on different places 2013-10-03 16:38:59 +02:00
Leo
40fcbf5af1 added tests to UserProfileService 2013-10-03 15:48:06 +02:00
Leo
067ce28dd9 added tests to TurnitinSettingsService 2013-10-03 15:23:40 +02:00
Leo
7bf3cc85ef added test to ProjectEventTemplateService 2013-10-03 15:14:36 +02:00
Leo
a36b58222a Merge branch 'develop' of ssh://git.dsv.su.se/git/scipro/scipro into develop 2013-10-03 14:54:41 +02:00
Leo
dc486198d7 *added tests to TargetService
*Removed BeansManager
2013-10-03 14:54:28 +02:00
Dan Lagnöhed
c4526d2f8b Trying to find bug... 2013-10-03 14:39:58 +02:00
Dan Lagnöhed
c906da589e Merge branch 'develop' of ssh://git.dsv.su.se/git/scipro/scipro into develop 2013-10-03 14:17:27 +02:00
Dan Lagnöhed
65789076e2 Trying to find bug... 2013-10-03 14:10:23 +02:00