fred-fri
|
3a3fefb1ff
|
added new sql file
|
2013-01-25 12:41:34 +09:00 |
|
|
|
ff82a57a45
|
Test and behaviour for notifications for successful idea exports
|
2013-01-24 16:01:07 +01:00 |
|
|
|
0a0fa5eecb
|
Test to verify notifying behaviour in IdeaExportWorker
|
2013-01-24 15:45:14 +01:00 |
|
|
|
9f63458a6c
|
Refactoring
|
2013-01-24 15:23:04 +01:00 |
|
Emil Siverhall
|
1bfbc66209
|
Merge branch 'smallFix' into develop
|
2013-01-24 15:11:23 +01:00 |
|
Emil Siverhall
|
77e537e82a
|
changed to show first meeting room info instead of optional description field in admin new idea details dialog
|
2013-01-24 15:11:15 +01:00 |
|
|
|
1a59b9275b
|
Transactions, successful runs, logging
|
2013-01-24 14:57:11 +01:00 |
|
|
|
6dfab3e744
|
Initial worker implementation.
|
2013-01-24 14:49:46 +01:00 |
|
|
|
77dde031a5
|
New entity holding the export status
|
2013-01-24 14:48:37 +01:00 |
|
|
|
4c0a8f8092
|
Builders to help setup tests faster
|
2013-01-24 14:46:51 +01:00 |
|
Emil Siverhall
|
72451d3496
|
Merge branch 'showSupervisor' into develop
|
2013-01-24 13:46:42 +01:00 |
|
Emil Siverhall
|
45558d9401
|
prepared supervisor settings panel to use newidea count numbers (if we gonna use this instead of targets/app period..
|
2013-01-24 13:35:21 +01:00 |
|
Emil Siverhall
|
38fe922dcc
|
removed ExpiredIdeaParticipationsWorker from scheduler since we gonna skip that one as well for now
|
2013-01-24 12:49:36 +01:00 |
|
Emil Siverhall
|
4d8df6f846
|
added new getAvailability method for NewIdea+Projects count. we need to use this one since we dont have anything ready for targets per app period yet
|
2013-01-23 21:08:54 +01:00 |
|
Emil Siverhall
|
ecfbbae8d6
|
some alignments to make all filter options fit on one row
|
2013-01-23 21:07:28 +01:00 |
|
Emil Siverhall
|
2090507898
|
some changes to the visibility of the match3.5 start page for supervisors. when entering the page as a sysadmin without employee role, the content was weird. now we wont show anything if the employee role is missing
|
2013-01-23 18:07:44 +01:00 |
|
Emil Siverhall
|
c88ef78602
|
we want to show the name of the supervisor when students select supervisor submitted ideas
|
2013-01-23 12:45:57 +01:00 |
|
Emil Siverhall
|
e0ed807a09
|
Merge branch 'inactivation' into develop
|
2013-01-23 11:09:07 +01:00 |
|
Emil Siverhall
|
892444511a
|
removed the watson completion worker from our scheduler. match 3.5 does not have this worker at all.
|
2013-01-23 11:02:42 +01:00 |
|
Emil Siverhall
|
410ffd2a0d
|
Merge branch 'connectProjectToNewIdea' into develop
|
2013-01-23 10:57:20 +01:00 |
|
Emil Siverhall
|
dc9a5aa965
|
import method to connect projects created in daisy with NewIdea-objects if a match is found (supervisor, projectclass and authors).
|
2013-01-23 10:57:02 +01:00 |
|
|
|
1a170177eb
|
Fixed icon paths to relative instead of absolute
|
2013-01-23 09:51:00 +01:00 |
|
|
|
c60de5093b
|
Added HTML pages for Shibboleth and ShibbolethInitialization
|
2013-01-23 09:44:45 +01:00 |
|
|
|
5a1da3019c
|
Merge branch 'feature/notifications/request_deleted' into develop
Conflicts:
src/main/java/se/su/dsv/scipro/notifications/MailFormatter.properties
|
2013-01-23 09:34:05 +01:00 |
|
fred-fri
|
dce46f95f4
|
removed html from notifications mail
|
2013-01-23 13:07:33 +09:00 |
|
fred-fri
|
26f4526163
|
removed html from notifications mail
|
2013-01-23 12:54:07 +09:00 |
|
|
|
cd38f5e3e5
|
Safe-guards for missing entities.
|
2013-01-22 16:13:01 +01:00 |
|
|
|
b08bff4c67
|
Display properties for Peer Requests related events
|
2013-01-22 16:09:23 +01:00 |
|
|
|
94dd8dcadf
|
Renamed Peer Request enums to help differentiate with Peer Reviews.
|
2013-01-22 16:08:47 +01:00 |
|
|
|
92aab2f588
|
Added functionality to determine if the entity the event was about is deleted and safe-guards if it is.
|
2013-01-22 16:08:23 +01:00 |
|
|
|
7d85ab8400
|
Database update for peer request notifications.
|
2013-01-22 16:06:12 +01:00 |
|
|
|
a31cebfe98
|
Only show delete column for !isSupervisor.
Deleting a peer request now sends notification
|
2013-01-22 15:08:02 +01:00 |
|
|
|
b10b64667e
|
Service support for notification generation about deleted peer requests.
|
2013-01-22 14:56:52 +01:00 |
|
|
|
ee0089da31
|
Notification for expired peer requests
|
2013-01-22 14:45:27 +01:00 |
|
Jona Ekenberg
|
a911903917
|
Merge branch 'develop' of ssh://git.dsv.su.se/git/scipro/scipro into develop
|
2013-01-22 14:40:14 +01:00 |
|
Jona Ekenberg
|
09ea39e45a
|
updated a test
|
2013-01-22 14:39:19 +01:00 |
|
Emil Siverhall
|
205d9f1f15
|
Merge branch 'exporter' into develop
|
2013-01-22 14:16:52 +01:00 |
|
Jona Ekenberg
|
0331dcf38b
|
removed unneccesary test
|
2013-01-22 13:59:48 +01:00 |
|
Jona Ekenberg
|
ec695f37dd
|
now exporting to excel works
|
2013-01-22 13:59:07 +01:00 |
|
Emil Siverhall
|
872b962d1e
|
we know retrieve error message from api clients header to get a better understanding of why students may not be added to theses while exporting from scipro
|
2013-01-22 13:44:48 +01:00 |
|
Jona Ekenberg
|
89ce1aa7b8
|
started to make a test for supervisornewallstudentideaspanel
|
2013-01-22 12:36:43 +01:00 |
|
Jona Ekenberg
|
e2be8275b5
|
Merge branch 'updateSupervisorSelectIdea' into develop
|
2013-01-22 10:44:46 +01:00 |
|
Jona Ekenberg
|
d731fd7d6f
|
made a SubmitNewFirstMeetingPanel that can be used for creation of first meetings, and added a small test for SupervisorNewIdeaDetailsPanel
|
2013-01-22 10:44:26 +01:00 |
|
fred-fri
|
87420dc427
|
if user has unread notification, and is not heading somewhere else, user is sent to notifications page instead of role start page upon loggin in
|
2013-01-22 15:51:41 +09:00 |
|
fred-fri
|
e270ab36b4
|
made role tabs visible again. did not change author string to my projects, because that would be weird and mess result in a confusing hierarchy.
|
2013-01-22 14:38:59 +09:00 |
|
Emil Siverhall
|
15f7915e0c
|
Merge branch 'newMailPanel' into develop
|
2013-01-21 21:25:40 +01:00 |
|
Emil Siverhall
|
c27858b206
|
some changes to the already existing mail panel. removed possibility to send mail to authors with refused and suggested ideas since we dont have those processes implemented at the moment. also made sure completed ideas are accounted for when sending mail to authors with matched ideas.
|
2013-01-21 21:15:05 +01:00 |
|
Emil Siverhall
|
8ff37ff030
|
we still want to use the old mail panel for now..
|
2013-01-21 21:15:03 +01:00 |
|
Emil Siverhall
|
9400dafbf3
|
enclosureContainer instead of wicket:enclosure within form to prevent wicket warnings
|
2013-01-21 21:15:01 +01:00 |
|
Emil Siverhall
|
1ef1fca335
|
changed default return value from null to a new empty user set
|
2013-01-21 21:14:58 +01:00 |
|
