|
|
8d9e8c7cb1
|
Added more logic and test to make sure successful submissions are marked as submitted and saved to the database.
|
2014-10-17 10:57:36 +02:00 |
|
|
|
644e9db6b9
|
Merge remote-tracking branch 'origin/develop' into develop
|
2014-10-17 10:03:38 +02:00 |
|
|
|
89a7a87ad9
|
[SCIPRO-20301] Fixed rendering of student ideas for supervisor.
|
2014-10-17 10:03:29 +02:00 |
|
fred-fri
|
a57e0d35a6
|
cleanup
|
2014-10-17 16:52:38 +09:00 |
|
fred-fri
|
0d9db71deb
|
rewritten opposition and participation gui
|
2014-10-17 16:27:29 +09:00 |
|
fred-fri
|
214620c2ad
|
refactoring multiple attachments
|
2014-10-17 13:46:50 +09:00 |
|
fred-fri
|
f853793e56
|
Merge branch 'develop' into attachments
|
2014-10-17 12:41:38 +09:00 |
|
fred-fri
|
018cb5d6a3
|
improved display of checklist title and description
|
2014-10-17 12:31:28 +09:00 |
|
fred-fri
|
0f2379cb82
|
improved info
|
2014-10-17 11:34:38 +09:00 |
|
fred-fri
|
806d74afd7
|
final grading report > grading report in a single place
|
2014-10-17 11:16:54 +09:00 |
|
fred-fri
|
a74cbdc901
|
Revert "final grading report > grading report"
This reverts commit 4dee431b3ccf14f844b5be27b8a6bf5ad5ad6af0.
|
2014-10-17 11:13:10 +09:00 |
|
|
|
8d1ba39723
|
Change checklist text format to header fix test
|
2014-10-16 20:05:42 +02:00 |
|
|
|
1fb42a3948
|
Change checklist text format to header
|
2014-10-16 19:10:36 +02:00 |
|
|
|
8204adabe6
|
Merge remote-tracking branch 'origin/develop' into develop
|
2014-10-16 16:44:11 +02:00 |
|
|
|
181a4d70d1
|
Business logic for submitting a grading report as a preliminary report.
|
2014-10-16 16:17:11 +02:00 |
|
|
|
eb27cb1771
|
Add description text to add exception panel
|
2014-10-16 16:13:30 +02:00 |
|
|
|
455ad130fa
|
Local user table split name add e-mail
|
2014-10-16 16:09:54 +02:00 |
|
|
|
03ddbc622e
|
Admins can now change users password.
|
2014-10-16 14:05:21 +02:00 |
|
|
|
9f9cf107de
|
Removed bottom margin on buttons within modal footers.
|
2014-10-16 14:04:01 +02:00 |
|
|
|
d423d70274
|
Made comment for application period exemptions handle strings up to 65536 characters (TEXT MySQL type) instead of only 255 (VARCHAR(255)).
|
2014-10-16 12:47:06 +02:00 |
|
|
|
8c12482542
|
Fixed approval history to also show reason with MultiLineLabel
|
2014-10-16 11:02:41 +02:00 |
|
|
|
ad5561275b
|
Bootstrapped the HTML and fixed IDE warnings due to wicket:for
|
2014-10-16 10:56:53 +02:00 |
|
fred-fri
|
94386a1544
|
refactoring multiple attachments
|
2014-10-16 17:55:59 +09:00 |
|
|
|
701030874f
|
Simplified HTML.
|
2014-10-16 10:30:21 +02:00 |
|
|
|
b4bfb44662
|
Green button.
|
2014-10-16 10:25:36 +02:00 |
|
|
|
a802b1b3f9
|
Changed text.
|
2014-10-16 10:24:43 +02:00 |
|
|
|
fd0914c036
|
Merge remote-tracking branch 'origin/develop' into develop
|
2014-10-16 10:04:02 +02:00 |
|
|
|
2431214ef7
|
Refactored so the boolean parameter is actually used.
|
2014-10-16 10:03:56 +02:00 |
|
|
|
142b91b99c
|
Some more minor touches.
|
2014-10-16 09:47:39 +02:00 |
|
fred-fri
|
c7b66cba20
|
Merge branch 'develop' into attachments
|
2014-10-16 16:47:04 +09:00 |
|
fred-fri
|
2c97b2e2cd
|
Merge remote-tracking branch 'origin/develop' into develop
|
2014-10-16 16:46:02 +09:00 |
|
|
|
ecad9d6a3f
|
Removed warning suppression.
|
2014-10-16 09:45:44 +02:00 |
|
fred-fri
|
751f22cc1c
|
test
|
2014-10-16 16:45:41 +09:00 |
|
|
|
51603fcfc9
|
Removed useless user field. Less state = better.
|
2014-10-16 09:43:19 +02:00 |
|
|
|
948eaca150
|
Removed second useless parameter.
|
2014-10-16 09:40:01 +02:00 |
|
|
|
aa37c37059
|
Removed useless parameter.
|
2014-10-16 09:38:27 +02:00 |
|
|
|
8f34ad5a8a
|
Merge remote-tracking branch 'origin/develop' into develop
Conflicts:
core/src/main/java/se/su/dsv/scipro/activityplan/ActivityPlanTemplateService.java
core/src/main/java/se/su/dsv/scipro/activityplan/ActivityPlanTemplateServiceImpl.java
|
2014-10-16 09:30:21 +02:00 |
|
fred-fri
|
48094772d7
|
clarification on user notification
|
2014-10-16 16:20:25 +09:00 |
|
fred-fri
|
e68f4f566b
|
removed reference to daisy in gui
|
2014-10-16 14:54:43 +09:00 |
|
fred-fri
|
17f778da27
|
gui
|
2014-10-16 14:53:39 +09:00 |
|
fred-fri
|
2ab4dc9aa7
|
multilinelabel
|
2014-10-16 12:57:57 +09:00 |
|
fred-fri
|
592c5b6d70
|
tables side by side
|
2014-10-16 12:45:03 +09:00 |
|
|
|
6d726ce21d
|
Small presentation improvements.
|
2014-10-15 13:23:29 +02:00 |
|
|
|
5a2ebac64c
|
Refactored AddActivitiesFromTemplatePanel into a straightforward panel without too much AJAX and dialog crap. Also simplified the logic for switching between list and detailed view.
|
2014-10-15 13:12:39 +02:00 |
|
fred-fri
|
c1f0dd00cd
|
refactoring to multiple attachments
|
2014-10-15 18:37:23 +09:00 |
|
|
|
1f7a77ff80
|
Major refactoring of AddActivitiesFromTemplatePanel.
|
2014-10-15 11:11:12 +02:00 |
|
|
|
12451b3e45
|
Removed faulty Bootstrap CSS.
|
2014-10-15 10:35:10 +02:00 |
|
|
|
96ebe21fc5
|
Sonar.
|
2014-10-15 09:49:37 +02:00 |
|
fred-fri
|
28cc7ba26a
|
Merge branch 'develop' into attachments
|
2014-10-15 16:47:20 +09:00 |
|
fred-fri
|
4dee431b3c
|
final grading report > grading report
|
2014-10-15 16:06:26 +09:00 |
|
