6238 Commits

Author SHA1 Message Date
Leo
1d90c9afcc hides create report link if submitted 2014-01-22 09:44:27 +01:00
Emil Siverhall
62685f0aa3 hi 2014-01-21 23:05:29 +01:00
Emil Siverhall
3cba8fb096 tests 2014-01-21 22:58:43 +01:00
Emil Siverhall
acac4a963b removed supervisor peer list panel since it's basically the same as the old admin peer list panel. now called peer list panel. 2014-01-21 22:53:12 +01:00
Emil Siverhall
1ea236f112 Merge remote-tracking branch 'origin/develop' into develop 2014-01-21 22:13:17 +01:00
a47a309838 Merge remote-tracking branch 'origin/develop' into develop 2014-01-21 16:47:57 +01:00
a6cc487aac Refactored ActivityPlanPanel to reduce anonymous class size and general improvements. 2014-01-21 16:47:51 +01:00
Leo
0b7306a234 Merge remote-tracking branch 'origin/develop' into develop 2014-01-21 16:26:46 +01:00
Leo
14302f4682 added download link för preliminary pdf 2014-01-21 16:26:34 +01:00
Emil Siverhall
4e5a1fe9b2 proper sized dialogs when previeweing peer review templates 2014-01-21 16:16:03 +01:00
Emil Siverhall
93cd002a78 Merge remote-tracking branch 'origin/develop' into develop 2014-01-21 16:07:43 +01:00
Emil Siverhall
c6f7fafdc6 menu highlighting and back button from select student ideas 2014-01-21 16:07:31 +01:00
Richard
d22dc00f70 Merge remote-tracking branch 'origin/develop' into develop 2014-01-21 16:03:35 +01:00
Richard
432d65886c Improved styling when performing a peer review. 2014-01-21 15:59:24 +01:00
Emil Siverhall
7625db7d4a Merge remote-tracking branch 'origin/develop' into develop 2014-01-21 15:30:49 +01:00
Emil Siverhall
68843e8517 ... 2014-01-21 15:30:29 +01:00
Richard
1bcd7bdba7 Merge remote-tracking branch 'origin/develop' into develop 2014-01-21 15:10:01 +01:00
Richard
882e5c42dd Styling of the external organisation panel. 2014-01-21 15:07:23 +01:00
Emil Siverhall
3eb5f47198 Merge remote-tracking branch 'origin/develop' into develop 2014-01-21 15:07:05 +01:00
Emil Siverhall
0845d95f2a more student -> author 2014-01-21 15:04:23 +01:00
Emil Siverhall
fa053f9612 student -> author on admin-match-project partner, admin-match-application periods 2014-01-21 14:43:20 +01:00
Emil Siverhall
67e8b8afa3 student -> author on admin-statistics-peer 2014-01-21 14:37:01 +01:00
a71bcbedbc Made labels even wider. 2014-01-21 14:12:57 +01:00
Leo
8d9fb6e77d minor changes to PreliminaryGradingReport's pdf template 2014-01-21 14:00:20 +01:00
e21098a2ca Fixed sonar issue. 2014-01-20 17:18:33 +01:00
24588aa004 Merge remote-tracking branch 'origin/develop' into develop 2014-01-20 17:00:55 +01:00
c673fd6f71 Fixed sonar issue. 2014-01-20 17:00:50 +01:00
Leo
f209429343 can now generate pdf:s for PreliminaryGradingReport 2014-01-20 16:54:50 +01:00
Leo
0ac262b578 Merge remote-tracking branch 'origin/develop' into develop
Conflicts:
	view/src/main/resources/template_preliminary.jrxml
2014-01-20 16:50:10 +01:00
4c9ad5251a Merge remote-tracking branch 'origin/develop' into develop 2014-01-20 16:48:34 +01:00
55f5fd2dbf Made labels wider. 2014-01-20 16:48:30 +01:00
Leo
dcdcc0d607 fixed some variable names 2014-01-20 16:47:08 +01:00
Emil Siverhall
522b2ec8ce Merge remote-tracking branch 'origin/develop' into develop 2014-01-20 16:39:49 +01:00
Emil Siverhall
e1abce4530 dialog changes when creating first meetings for ideas 2014-01-20 16:38:05 +01:00
6d306a522c Fixed some Sonar issues. 2014-01-20 16:36:14 +01:00
adfdfeeed2 Fixed some field names. 2014-01-20 16:18:59 +01:00
1f00aa780a Created jasperreports template for preliminary grading reports. 2014-01-20 16:12:23 +01:00
7a938f1b13 Merge remote-tracking branch 'origin/develop' into develop 2014-01-20 15:35:00 +01:00
9af4f6a920 Added copy column to supervisors idea page. 2014-01-20 15:34:38 +01:00
Leo
8fee6ddcc6 Merge remote-tracking branch 'origin/develop' into develop 2014-01-20 15:03:50 +01:00
Leo
80e8c8f759 shows author of report 2014-01-20 15:03:43 +01:00
2e9bfe5916 Fixed javascript confirmation (Wicket ajax does not care about onclick handler returning false). 2014-01-20 14:59:48 +01:00
44ea37e87b Fixed text. 2014-01-20 14:46:03 +01:00
fc86c32c2b Fixed some Sonar violations. 2014-01-20 14:41:49 +01:00
Richard
104cf233dd Merge remote-tracking branch 'origin/develop' into develop 2014-01-20 14:40:34 +01:00
ee9689bad0 Merge remote-tracking branch 'origin/develop' into develop 2014-01-20 14:38:37 +01:00
aa93d8c04b Removed AjaxLinkColumn since it was a duplicate of AjaxLinkPanel.
Added confirmation capabilities to AjaxConfirmingLinkPanel.
2014-01-20 14:38:16 +01:00
Emil Siverhall
a9676d3cca Merge remote-tracking branch 'origin/develop' into develop 2014-01-20 14:16:49 +01:00
Emil Siverhall
36a6a5312e feedback when confirming seminar active participation 2014-01-20 14:16:30 +01:00
Emil Siverhall
cc87c70b69 feedback when confirming seminar opposition 2014-01-20 14:11:19 +01:00