9541 Commits

Author SHA1 Message Date
Dan Lagnöhed
5de063a553 Fixed some Sonar critical issues 2013-10-10 14:14:33 +02:00
Emil Siverhall
b8bc695f39 changes to make wicket 6 work 2013-10-10 13:23:56 +02:00
fred-fri
6e13c4c7ca Merge branch 'flyway' into develop 2013-10-10 18:51:38 +09:00
fred-fri
d9a24ec9d6 removed plugin, turned off generateddl in dev profile and added new dev generate ddl profile specifically for generating ddl 2013-10-10 18:33:03 +09:00
fred-fri
0784b07d5e fix 2013-10-10 17:33:27 +09:00
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
17261a54f7 added flyway 2013-10-10 16:56:39 +09:00
fred-fri
8bd2bd4caf new db file 20131010 2013-10-10 11:16:14 +09: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
fred-fri
ac7ff04215 Merge branch 'develop' of ssh://git.dsv.su.se/git/scipro/scipro into develop 2013-10-09 18:11:49 +09:00
fred-fri
4c1d66325a fixed delete method 2013-10-09 18:11:22 +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
fred-fri
cff3333308 fixed delete method 2013-10-09 18:02:50 +09: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
8e7be1d313 Merge branch 'programfilter' into develop 2013-10-09 15:39:58 +09:00
fred-fri
2989ac3459 added queryinits, fixed npes 2013-10-09 15:39:44 +09:00
fred-fri
64fbce27cb fixed orphan rows that prevent hibernate from adding constraints 2013-10-09 15:18:16 +09: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
f4ac702f5c DEV profile now includes test-log4j.xml so that all logging is done to the console instead. 2013-10-08 15:21:30 +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
a4c4a0196a moving stuff 2013-10-08 17:22:54 +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
fred-fri
4d68258fc6 removed file that should be removed 2013-10-08 16:19:27 +09:00
Dan Lagnöhed
e18da87dfb . 2013-10-08 09:18:35 +02:00