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 |
|
Dan Lagnöhed
|
e18da87dfb
|
.
|
2013-10-08 09:18:35 +02:00 |
|
fred-fri
|
8ca1fbb413
|
added dialog
|
2013-10-08 16:14:58 +09:00 |
|
fred-fri
|
e48c8f90db
|
fixed display
|
2013-10-08 15:20:30 +09:00 |
|
fred-fri
|
2c503a087c
|
hiding programs if none present
|
2013-10-08 14:39:02 +09:00 |
|
fred-fri
|
155b57d3e4
|
hiding programs if none present
|
2013-10-08 14:36:29 +09:00 |
|
fred-fri
|
cfd961e59c
|
added program selector to select supervisor idea page
|
2013-10-08 14:19:47 +09:00 |
|
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
|
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 |
|
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 |
|
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 |
|
Leo
|
b3a8cd63a9
|
fix
|
2013-10-04 11:25:07 +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 |
|
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 |
|
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
|
90cbbc7836
|
only try to export projects with no export
|
2013-10-04 14:25:12 +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 |
|
fred-fri
|
0925b5db42
|
cleanup
|
2013-10-03 15:36:55 +09:00 |
|
fred-fri
|
934407194a
|
added radiofilter
|
2013-10-03 15:26:46 +09:00 |
|
fred-fri
|
5260d56642
|
removed statusfilter
|
2013-10-03 15:23:15 +09:00 |
|
Richard
|
b8e0480d42
|
Continued work with upgrading to bootstrap 3.
|
2013-10-02 16:46:13 +02:00 |
|
Richard
|
27d09e0f21
|
Continued work with upgrading to bootstrap 3.
Admin settings pages fixed.
Added glyphicons.
|
2013-10-02 15:17:23 +02:00 |
|
|
|
829b028502
|
Subject now has a simple [SciPro] tag so that people can filter them if they are not interested.
|
2013-10-02 14:31:07 +02:00 |
|
|
|
b8ef0379f0
|
Tests no longer generate error mails.
|
2013-10-02 14:26:25 +02:00 |
|
|
|
811c35d831
|
Enjoy the mails motherfuckeeeeeeeeeers.
|
2013-10-02 14:11:51 +02:00 |
|
Richard
|
7078121011
|
Continued work with upgrading to bootstrap 3.
Different fixes, for example droplists, non-column data that break grid, buttons.
|
2013-10-02 13:37:37 +02:00 |
|
Leo
|
7f3e6d4d5f
|
changed validation for contract checkbox
|
2013-10-02 11:51:08 +02:00 |
|
Leo
|
bffe52ba22
|
tests for validateSupervisorAcceptance
|
2013-10-02 11:34:01 +02:00 |
|
Leo
|
ce999e4eca
|
hides MilesStoneSummaryPanel and the link to MileStones when there are no active milestones
|
2013-10-02 11:07:12 +02:00 |
|
