6885 Commits

Author SHA1 Message Date
Richard
55f63be143 Merge remote-tracking branch 'origin/develop' into develop 2013-10-10 10:07:48 +02:00
Richard
095ad9df31 Changed information text for supervisors telling them how many ideas they have to create for current application period. 2013-10-10 10:07:34 +02:00
fred-fri
bd2140c354 fixed annotations - released milestones 2013-10-10 11:13:55 +09:00
Emil Siverhall
460d999fa7 finishing touches of wicket update 2013-10-09 16:38:24 +02:00
fred-fri
b753aea017 added program filter to popuppage 2013-10-09 18:17:38 +09:00
Richard
aba665cbe6 Fixed problem with hide/view details on project page falling down due to wrong column size. 2013-10-09 11:07:07 +02:00
Richard
216561d334 Changed button size in activity plan. 2013-10-09 10:19:14 +02:00
Richard
73bac75701 Merge remote-tracking branch 'origin/develop' into develop 2013-10-09 10:08:46 +02:00
Richard
45c5aebc59 Added bootstrap 3-styling to targetspanel. 2013-10-09 10:08:36 +02:00
fred-fri
e1f9e0db21 added notification when uploading file to activity plan 2013-10-09 16:58:42 +09:00
Richard
90ce51aede Fixed problem with feedback-panels appearing with a padding or outside of the grid. 2013-10-09 09:54:26 +02:00
Emil Siverhall
f092fbae97 fix 2013-10-09 09:29:47 +02:00
Emil Siverhall
24f7927b24 changes to generic data panel 2013-10-09 09:27:00 +02:00
fred-fri
c782e5b919 set activities per page to 999, this whole panel is a clusterfuck and should be refactored from scratch 2013-10-09 16:22:41 +09:00
Emil Siverhall
1d658966c8 more update fixes 2013-10-09 08:44:16 +02:00
fred-fri
06b737b93a added program filter but npes 2013-10-09 11:42:03 +09:00
fred-fri
7329d29b01 added program markup 2013-10-09 10:42:14 +09:00
Emil Siverhall
c8aec206ca added new modalwindow class for dialog handling and replaced (almost all) occurrences of wiquery dialog 2013-10-08 23:33:06 +02:00
Richard
2d6835d378 Styled a couple of pop-ups. 2013-10-08 15:30:34 +02:00
Leo
0bcd5a7047 updatestuffs 2013-10-08 15:13:00 +02:00
Richard
facf34994f Styling - Activity plan. 2013-10-08 13:45:00 +02:00
Richard
bec9662182 Merge remote-tracking branch 'origin/develop' into develop 2013-10-08 13:14:38 +02:00
Richard
426f632bcc Styling - Header. 2013-10-08 13:14:22 +02:00
Richard
897432eb04 Styling - Header. 2013-10-08 13:13:28 +02:00
Leo
0bcc98dafe updatestuffs 2013-10-08 13:05:55 +02:00
fred-fri
5259d09cd3 finishing partner program addition 2013-10-08 17:44:42 +09:00
fred-fri
a3a9cc5c22 finishing partner program addition 2013-10-08 17:44:26 +09:00
fred-fri
6258f98c24 moving stuff 2013-10-08 17:41:24 +09:00
fred-fri
eb454fc5b2 moving stuff 2013-10-08 17:15:17 +09:00
fred-fri
53ac215944 adding program selection for partner 2013-10-08 17:07:45 +09:00
fred-fri
703867a5c6 adding program selection for partner 2013-10-08 17:03:10 +09:00
Emil Siverhall
08e8b40b20 more update changes 2013-10-08 09:27:59 +02:00
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