Emil Siverhall
|
fb071e8200
|
Merge remote-tracking branch 'origin/develop' into develop
|
2013-11-11 13:01:10 +01:00 |
|
Emil Siverhall
|
ac64a2c821
|
fixed exception caused by trying to enter idea submission page without application period id
|
2013-11-11 13:00:57 +01:00 |
|
niklas3
|
1f4424fa1e
|
Merge remote-tracking branch 'origin/develop' into develop
|
2013-11-11 12:52:53 +01:00 |
|
niklas3
|
58b4696714
|
Hiding and showing of final thesis information in AFTP.
|
2013-11-11 12:52:48 +01:00 |
|
Emil Siverhall
|
643e80514c
|
Merge remote-tracking branch 'origin/develop' into develop
|
2013-11-11 11:02:52 +01:00 |
|
Emil Siverhall
|
ff5f39b0f0
|
redirect when trying to access Author -> Ideas without student role.
|
2013-11-11 11:02:10 +01:00 |
|
Per Lundholm
|
00ec5cb030
|
Merge remote-tracking branch 'origin/develop' into develop
|
2013-11-11 10:52:16 +01:00 |
|
Per Lundholm
|
b76a4ff001
|
Continued working on KeywordFilterpanel
|
2013-11-11 10:52:10 +01:00 |
|
niklas3
|
02191e45ac
|
Merge remote-tracking branch 'origin/develop' into develop
|
2013-11-11 10:17:17 +01:00 |
|
niklas3
|
0fa0e2893e
|
ApproveFinalThesisPanel is hidden unless you are a SysAdmin.
ApproveFinalThesisPanel is hidden if the final seminar hasn't taken place yet.
|
2013-11-11 10:17:12 +01:00 |
|
Emil Siverhall
|
bee93a4462
|
Merge remote-tracking branch 'origin/develop' into develop
|
2013-11-11 10:13:40 +01:00 |
|
fred-fri
|
8826628603
|
begun work on new keywordfilterpanel
|
2013-11-11 18:01:22 +09:00 |
|
Emil Siverhall
|
5aed7bbe12
|
more checklist refactoring to work with models
|
2013-11-11 10:00:55 +01:00 |
|
fred-fri
|
2766c9780a
|
raised wicket warning level to error to stop the stupid mails
|
2013-11-11 16:33:08 +09:00 |
|
fred-fri
|
e2cd20a9a8
|
changed to filedesciptionpanel
|
2013-11-11 15:18:01 +09:00 |
|
fred-fri
|
4480ddd569
|
added info label
|
2013-11-11 13:40:26 +09:00 |
|
Emil Siverhall
|
1e79c08a7a
|
Checklist pages should work a bit more with models..
|
2013-11-08 23:33:26 +01:00 |
|
|
|
97bf968125
|
Merge remote-tracking branch 'origin/develop' into develop
|
2013-11-08 17:56:46 +01:00 |
|
|
|
ea63bc1dd6
|
Start of grading report gui used by supervisors for filling out grading report templates.
|
2013-11-08 17:56:42 +01:00 |
|
niklas3
|
d0095e03ad
|
Notifications goes out to all concerned parties on final thesis approval.
|
2013-11-08 17:22:51 +01:00 |
|
niklas3
|
430c165dc5
|
Notifications goes out to all concerned parties on final thesis approval.
|
2013-11-08 17:14:05 +01:00 |
|
|
|
e287d2a333
|
Changed download link to render file name in body.
|
2013-11-08 15:36:26 +01:00 |
|
|
|
35a55b7dd4
|
Removed useless hide on dead link flag since it was always true.
Added flag for what to render in the body. Defaults to nothing.
|
2013-11-08 15:36:07 +01:00 |
|
fred-fri
|
ee54e4557e
|
Merge branch 'ehcacheremoved' into develop
|
2013-11-08 17:18:18 +09:00 |
|
fred-fri
|
f0566f090d
|
forgot to remove this before pushing yesterday
|
2013-11-08 14:10:36 +09:00 |
|
fred-fri
|
6f442ff84d
|
removed ehcache
|
2013-11-08 13:49:01 +09:00 |
|
|
|
819f6f4654
|
Fixed violations.
|
2013-11-07 17:01:31 +01:00 |
|
|
|
1daf8822dc
|
Merge remote-tracking branch 'origin/develop' into develop
|
2013-11-07 16:16:41 +01:00 |
|
|
|
b195f10dd7
|
Fixed critical issues.
|
2013-11-07 16:16:36 +01:00 |
|
Emil Siverhall
|
e73cdd65e3
|
Merge remote-tracking branch 'origin/develop' into develop
|
2013-11-07 14:54:15 +01:00 |
|
Emil Siverhall
|
a2cabad87e
|
removed unnecessary one-to-many relationship milestone phase -> milestone activities.
|
2013-11-07 14:53:34 +01:00 |
|
|
|
0f0210b2ee
|
Removed unused private fields.
|
2013-11-07 14:45:18 +01:00 |
|
niklas3
|
08e2e8d41e
|
Added ApproveFinalThesisPanel.
|
2013-11-07 14:34:50 +01:00 |
|
|
|
8a649c90c6
|
Moved logic determining if uploading a final thesis is allowed to the service layer from view.
|
2013-11-07 13:55:04 +01:00 |
|
|
|
71049b37df
|
Uploading final thesis form is hidden if there exists a final thesis in NOT_DECIDED or APPROVED status.
|
2013-11-07 13:31:42 +01:00 |
|
Emil Siverhall
|
c4d2e09bd8
|
Merge remote-tracking branch 'origin/develop' into develop
|
2013-11-07 10:53:24 +01:00 |
|
Emil Siverhall
|
6a00575141
|
fixed lazy init and hibernate exception bugs when updating seminars.
|
2013-11-07 10:49:14 +01:00 |
|
fred-fri
|
86ecaf5f76
|
store method that actually works
|
2013-11-07 16:41:11 +09:00 |
|
fred-fri
|
2a8563dffd
|
fixed tests
|
2013-11-07 14:50:34 +09:00 |
|
fred-fri
|
095192b0c0
|
added finalthesispanel
|
2013-11-07 14:21:57 +09:00 |
|
fred-fri
|
b482a98f3a
|
more improvements on mail fail logging
|
2013-11-07 12:46:11 +09:00 |
|
fred-fri
|
e55c637db6
|
added link for the third time, it keeps magically disappearing
|
2013-11-07 12:08:24 +09:00 |
|
Emil Siverhall
|
41b50dfecf
|
delete thesis from SeminarThesisPanel now refresh page on SeminarPanel to make sure turnitin link disappears if it's not valid.
|
2013-11-06 15:56:12 +01:00 |
|
Leo
|
4ac389a2a3
|
Merge remote-tracking branch 'origin/develop' into develop
Conflicts:
view/src/test/java/se/su/dsv/scipro/project/panels/FinalThesisPanelTest.java
|
2013-11-06 14:26:41 +01:00 |
|
Emil Siverhall
|
ddab3ee144
|
fixed NPE in the forum when a post was submitted by someone who no longer has association with the project (eg. supervisor has been changed but old supervisor posted in the forum).
|
2013-11-06 14:12:46 +01:00 |
|
Emil Siverhall
|
2283b4dfdb
|
Merge remote-tracking branch 'origin/develop' into develop
|
2013-11-06 13:51:15 +01:00 |
|
Emil Siverhall
|
84df6b7255
|
added notification when uploading final thesis
|
2013-11-06 13:50:27 +01:00 |
|
Leo
|
7a8a7d5e11
|
hides uploadForm if no final seminar has taken place
|
2013-11-06 13:48:50 +01:00 |
|
Emil Siverhall
|
530c793159
|
avoid npe when searching for older projects that doesn't have supervisor attached (for some reason..)
|
2013-11-06 11:41:57 +01:00 |
|
Leo
|
17d258227b
|
Merge remote-tracking branch 'origin/develop' into develop
|
2013-11-06 11:10:47 +01:00 |
|
