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 |
|
Emil Siverhall
|
00254295ff
|
mail facade now filter new idea participants properly as well..
|
2013-01-21 21:14:56 +01:00 |
|
Emil Siverhall
|
fb894fefb2
|
added date filtering support to new idea service
|
2013-01-21 21:14:54 +01:00 |
|
Emil Siverhall
|
2b42fbfff4
|
more work on new mail panel
|
2013-01-21 21:14:51 +01:00 |
|
Emil Siverhall
|
e8495d41c8
|
started working on new mail panel for newideas
|
2013-01-21 21:14:49 +01:00 |
|
|
|
3b18444c42
|
Mail formatter for peer request notification events
|
2013-01-21 18:14:14 +01:00 |
|
|
|
5fb1976f38
|
NotificationController implementation for handling peer request notifications
|
2013-01-21 18:02:01 +01:00 |
|
|
|
ea943c2e61
|
Panel for displaying a notification event about a peer request
|
2013-01-21 18:00:43 +01:00 |
|
|
|
fb55ea0c8c
|
Event entity for Peer Request notifications
|
2013-01-21 18:00:14 +01:00 |
|
Emil Siverhall
|
2732b62df1
|
Merge branch 'hotfix-20130121' into develop
|
2013-01-21 14:07:34 +01:00 |
|
Emil Siverhall
|
edd012b45a
|
Merge branch 'hotfix-20130121'
20130121
|
2013-01-21 13:51:25 +01:00 |
|
Emil Siverhall
|
f97da4e812
|
we want to make sure all students can see who their supervisor is regardless of whether the supervisor has revealed his/her identity or not
|
2013-01-21 13:48:35 +01:00 |
|
Jona Ekenberg
|
2fcd079183
|
hej
|
2013-01-18 19:55:18 +01:00 |
|
Jona Ekenberg
|
bbcb4621d6
|
Merge branch 'develop' into updateSupervisorSelectIdea
|
2013-01-18 17:05:10 +01:00 |
|
|
|
53b67ec40f
|
Fix for presenting the requested page to the user after a successful automatic Shibboleth login
|
2013-01-18 15:22:02 +01:00 |
|
|
|
a384785c00
|
Idea notifications for PARTNER_TIMEOUT
|
2013-01-18 14:30:53 +01:00 |
|
|
|
5181fd161a
|
Mail formatter tests are now run and assert that no exceptions get thrown. They also print out the formatted mail to easily check how they look.
|
2013-01-18 14:28:48 +01:00 |
|
fred-fri
|
0e8ec5cb9a
|
added new system notification css
|
2013-01-18 17:18:18 +09:00 |
|
fred-fri
|
03e01591e9
|
Merge branch 'release20130118b'
|
2013-01-18 16:05:39 +09:00 |
|
fred-fri
|
d3eaa8f373
|
trying to fix lazyloading bug
20130118b
|
2013-01-18 15:24:46 +09:00 |
|
fred-fri
|
b9dbadafa2
|
trying to fix a lazyloading exception
|
2013-01-18 14:35:14 +09:00 |
|
fred-fri
|
8427831839
|
Merge branch 'release20130118'
20130118
|
2013-01-18 13:35:27 +09:00 |
|
fred-fri
|
baa52e05fd
|
because the dateselector and button was not inside a form, the date selected was never used, but todays date used instead
|
2013-01-18 13:25:24 +09:00 |
|
|
|
ecee7b54cc
|
Removed faulty CSS include header element
|
2013-01-17 16:15:55 +01:00 |
|
|
|
4e9a7989fc
|
Merge branch 'develop' of ssh://git.dsv.su.se/git/scipro/scipro into develop
|
2013-01-17 16:03:32 +01:00 |
|
|
|
643674bc8d
|
404 error page logs request uri at TRACE level
for login automatic redirection debugging
|
2013-01-17 16:03:22 +01:00 |
|
Emil Siverhall
|
5aa6ef7de6
|
Merge branch 'develop' of ssh://git.dsv.su.se/git/scipro/scipro into develop
|
2013-01-17 15:43:06 +01:00 |
|
Emil Siverhall
|
a036ff280e
|
Merge branch 'removeOpp' into develop
|
2013-01-17 15:41:23 +01:00 |
|
Emil Siverhall
|
8bc796253a
|
problems when removing some opponents due to a detached entity. we now reload the seminar before deleting opponent which seems to work fine. also added an ajax confirmation link to remove opposition
|
2013-01-17 15:40:34 +01:00 |
|
|
|
cb05a5223e
|
Removed faulty /
|
2013-01-17 15:39:48 +01:00 |
|
|
|
bb8657d0fa
|
Removed defunct and useless test
|
2013-01-17 15:26:27 +01:00 |
|
|
|
275f152da8
|
Merge branch 'feature/login/external' into develop
|
2013-01-17 15:23:21 +01:00 |
|
|
|
b4950ec7a5
|
Login page now automatically redirects a shibb logged in user only once to allow access to the page after the initial login phase for purposes such as change user.
|
2013-01-17 15:21:44 +01:00 |
|
|
|
31532d2617
|
Improved HTML markup for feedback panel
|
2013-01-17 15:20:43 +01:00 |
|
|
|
054b2d3dd1
|
SSO initialization page now redirects back to the login page directly to preserve the original intercept url for use after a successful login.
|
2013-01-17 15:20:16 +01:00 |
|
