fred-fri
|
c7632c277a
|
fixed conflict
|
2013-10-08 13:47:57 +09:00 |
|
fred-fri
|
7eeed0c5dd
|
added program info to student my ideas page
|
2013-10-08 13:16:48 +09:00 |
|
fred-fri
|
976f5d1aa2
|
added program info to select student ideas page
|
2013-10-08 13:13:07 +09:00 |
|
fred-fri
|
1af4c64fff
|
added program info to select student ideas page
|
2013-10-08 13:11:37 +09:00 |
|
fred-fri
|
04099227ad
|
added program info to popuppanel
|
2013-10-08 13:01:56 +09:00 |
|
fred-fri
|
e06cf46e8c
|
added program to admin overview
|
2013-10-08 12:59:23 +09:00 |
|
fred-fri
|
42f1d37c90
|
added new profile and program component
|
2013-10-08 12:35:58 +09:00 |
|
fred-fri
|
f8030a94ad
|
cleanup and adding info
|
2013-10-08 11:41:29 +09:00 |
|
fred-fri
|
db0e79165c
|
added saving of creators program
|
2013-10-08 11:20:12 +09:00 |
|
fred-fri
|
cff4f59c4c
|
adding programs to newideaparticipation and student idea submission
|
2013-10-08 10:39:44 +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
|
d2532edc5a
|
Fixed deprecated code
|
2013-10-07 13:35:03 +02:00 |
|
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 |
|
