|
|
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 |
|
Leo
|
58ce936f35
|
Merge remote-tracking branch 'origin/develop' into develop
|
2014-01-20 14:05:44 +01:00 |
|
Leo
|
4fed89b41a
|
external organization visible
|
2014-01-20 14:05:07 +01:00 |
|
|
|
80df14b8b2
|
Merge remote-tracking branch 'origin/develop' into develop
|
2014-01-20 13:48:12 +01:00 |
|
|
|
c513e7a5c8
|
Added supervisor column to idea table in supervisor view.
|
2014-01-20 13:48:02 +01:00 |
|
Leo
|
42b9a74368
|
Merge remote-tracking branch 'origin/develop' into develop
|
2014-01-20 13:31:54 +01:00 |
|
Emil Siverhall
|
75cb75674b
|
upcoming milestones now cares about the current projects project type
|
2014-01-20 13:30:15 +01:00 |
|
Leo
|
db6da3a711
|
Merge remote-tracking branch 'origin/develop' into develop
|
2014-01-20 13:18:41 +01:00 |
|
Leo
|
a66c11c618
|
notification for inactivating an idea
|
2014-01-20 13:18:32 +01:00 |
|
Emil Siverhall
|
6fd9f7f765
|
Merge remote-tracking branch 'origin/develop' into develop
|
2014-01-20 13:01:13 +01:00 |
|
Emil Siverhall
|
f25f89a0f2
|
removed double feedback panels from admin - match - project partner
|
2014-01-20 13:00:59 +01:00 |
|
Emil Siverhall
|
1d70caa6fd
|
added feedback to employee auto complete panel that's being used in datatables
|
2014-01-20 12:55:49 +01:00 |
|
Richard
|
00fd4c18ed
|
Merge remote-tracking branch 'origin/develop' into develop
|
2014-01-20 11:48:43 +01:00 |
|
Leo
|
d481ee969a
|
formatting
|
2014-01-20 11:36:01 +01:00 |
|
Leo
|
12aecfb7f4
|
removed supervisors from checklists
|
2014-01-20 11:02:30 +01:00 |
|
Leo
|
6bdb4449de
|
fixed the issue with links in reviewing going to the wrong project
|
2014-01-20 10:42:19 +01:00 |
|
Emil Siverhall
|
b30869d306
|
moved feedback messages to properties
|
2014-01-17 22:11:37 +01:00 |
|
Emil Siverhall
|
78eea0e04d
|
confirmation when deleting internal users
|
2014-01-17 21:57:48 +01:00 |
|
Leo
|
84b179629c
|
fixed the issue where the same preliminary report was returned for both supervisor and reviewer
|
2014-01-17 16:57:05 +01:00 |
|
Leo
|
44817912da
|
fixed the error with deleting internal users
|
2014-01-17 16:23:46 +01:00 |
|
Leo
|
27f3f1dc19
|
fixed the error with deleting internal users
|
2014-01-17 16:03:57 +01:00 |
|
Leo
|
4568fd135b
|
added ViewAttachmentPanel to ReviewPanel
|
2014-01-17 14:29:43 +01:00 |
|
Leo
|
9e6353177b
|
renaming and new link logic for ReviewPanel
|
2014-01-17 13:48:21 +01:00 |
|
