9303 Commits

Author SHA1 Message Date
fred-fri
25ba45d3b4 sql 20131015 2013-10-15 10:12:23 +09:00
Dan Lagnöhed
13607ed8ea TurnItIn component. Initial checkin with incomplete tests 2013-10-14 15:40:54 +02:00
Dan Lagnöhed
510bd9aac5 Merge remote-tracking branch 'origin/develop' into develop 2013-10-14 15:01:17 +02:00
Dan Lagnöhed
2387722f92 Fixed turnItIn component. Initial checkin without test 2013-10-14 15:01:00 +02:00
Richard
531eed3ce6 Merge remote-tracking branch 'origin/develop' into develop 2013-10-14 13:17:00 +02:00
Richard
d7b4c5cf3a Minor font changes.
Added "preliminary grading report" to final seminar-page.
2013-10-14 13:16:54 +02:00
Dan Lagnöhed
555e73f698 Fixed turnItIn component. Initial checkin without test 2013-10-14 13:13:36 +02:00
Dan Lagnöhed
4ff7318b35 Merge remote-tracking branch 'origin/develop' into develop 2013-10-14 13:08:24 +02:00
Dan Lagnöhed
5cdc01e2c7 Fixed turnItIn component. Initial checkin without test 2013-10-14 13:08:08 +02:00
Richard
e3e3bdc7a3 Fixed minor problem with filtering-panels not scaling as they should. 2013-10-14 11:37:12 +02:00
Richard
fe72264b34 Merge remote-tracking branch 'origin/develop' into develop 2013-10-14 11:19:59 +02:00
Richard
5c6cdca24f Removed links to old css-files in BasePage. 2013-10-14 11:19:50 +02:00
Richard
3c097f30ba Minor styling changes, buttons and overview. 2013-10-14 11:16:48 +02:00
fred-fri
c1cbc98629 removed settings.xml 2013-10-14 17:05:41 +09:00
fred-fri
ea18e02b09 created local version of autocomplete with source code from components, commented out artifactory from settings.xml 2013-10-14 15:27:33 +09:00
fred-fri
f973a21cf3 used program code where appropriate 2013-10-14 14:15:43 +09:00
fred-fri
a721778af8 removed profiles 2013-10-14 14:01:28 +09:00
6806cfc6b0 Knasbollar 2013-10-11 09:39:39 +02:00
fred-fri
c98a4f08dc fixes 2013-10-11 15:51:45 +09:00
fred-fri
a6aade7fa2 fixes 2013-10-11 15:17:14 +09:00
fred-fri
f6ebe04885 added more program details 2013-10-11 13:01:55 +09:00
Dan Lagnöhed
2630298c66 Fixed some Sonar critical issues 2013-10-10 14:55:27 +02:00
Dan Lagnöhed
5de063a553 Fixed some Sonar critical issues 2013-10-10 14:14:33 +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
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
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
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
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
Richard
facf34994f Styling - Activity plan. 2013-10-08 13:45:00 +02:00