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 |
|
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 |
|
|
|
36b0d795db
|
Shibboleth page no longer, explicitly, requires a logged in session
|
2013-01-17 15:19:23 +01:00 |
|
|
|
97baab69f1
|
Merge branch 'improvement/login/combined' into feature/login/external/automatic
Conflicts:
src/main/java/se/su/dsv/scipro/SciProApplication.java
src/main/java/se/su/dsv/scipro/loginlogout/pages/LoginPage.java
src/main/java/se/su/dsv/scipro/loginlogout/pages/ShibbolethPage.java
|
2013-01-17 15:17:21 +01:00 |
|
Emil Siverhall
|
c230120988
|
Merge branch 'buggingOut' into develop
|
2013-01-17 14:30:05 +01:00 |
|
Emil Siverhall
|
6dfd812480
|
added more details of the idea authors in supervisors info dialog regarding SupervisorIdeas. e-mail is now showing as well
|
2013-01-17 13:49:39 +01:00 |
|
Emil Siverhall
|
4e52e97ba8
|
added transactional(readonly=false) to NewIdeaService.partnerAcceptIdea since new match objects didnt get attached to the idea without it
|
2013-01-17 13:08:19 +01:00 |
|
Emil Siverhall
|
c6f296b4f3
|
Merge branch 'stringUtilFix' into develop
|
2013-01-17 12:40:01 +01:00 |
|
Emil Siverhall
|
2c08586431
|
avoid nullpointer at StringUtil toUpper
|
2013-01-17 12:34:57 +01:00 |
|
Emil Siverhall
|
09694375dc
|
Merge branch 'nullPointer' into develop
|
2013-01-17 11:23:31 +01:00 |
|
Emil Siverhall
|
86d0c7a665
|
null pointer when supervisors trying to open seminars, since we check visibilityallowed with studentService.findByUser(loggedInUser). When supervisor does not have a student role, exception is thrown
|
2013-01-17 11:23:21 +01:00 |
|
fred-fri
|
ad28116c19
|
Merge branch 'release20130117'
20130117
|
2013-01-17 18:22:27 +09:00 |
|
fred-fri
|
a6a1ccaee8
|
new db file
|
2013-01-17 18:21:07 +09:00 |
|
Emil Siverhall
|
d89e2e11e7
|
Merge branch 'seminarBugs' into develop
|
2013-01-17 10:04:49 +01:00 |
|
Emil Siverhall
|
85ac08dd6f
|
removed some code from current that we already used on prodserver and moved it to an older db_update
|
2013-01-17 10:04:40 +01:00 |
|
Emil Siverhall
|
6824180a79
|
Merge branch 'seminarBugs' into develop
|
2013-01-17 10:03:21 +01:00 |
|
Emil Siverhall
|
a67283ba3f
|
reloading seminars and opposition before attaching files to hopefully prevent some exceptions
|
2013-01-17 10:03:02 +01:00 |
|
Emil Siverhall
|
927c5c003c
|
added some old sql that shouldve been with this sql file
|
2013-01-17 10:02:12 +01:00 |
|
|
|
ac26276eca
|
You are now returned to the intercepted page after logging in.
|
2013-01-17 09:36:43 +01:00 |
|
|
|
425e2ad0a6
|
New login page combining kerberos, external and Shibboleth.
|
2013-01-16 17:42:10 +01:00 |
|
|
|
df1b1a1827
|
CSS rules for wickets TabbedPanel
|
2013-01-16 17:41:44 +01:00 |
|
|
|
b610fad78e
|
Shibboleth login made better
|
2013-01-16 16:02:42 +01:00 |
|
|
|
9b8c8a0f86
|
Automatic detecting of Shibboleth sessions and redirects to system if you have one from the login page.
|
2013-01-16 15:57:03 +01:00 |
|
Emil Siverhall
|
3f1fefd27a
|
Merge branch 'develop' of ssh://git.dsv.su.se/git/scipro/scipro into develop
|
2013-01-16 14:15:34 +01:00 |
|
|
|
4340529655
|
Merge branch 'develop' of ssh://git.dsv.su.se/git/scipro/scipro into develop
|
2013-01-16 14:14:52 +01:00 |
|
|
|
f180bd6d11
|
Shibboleth page now displays header information
|
2013-01-16 14:14:40 +01:00 |
|
Emil Siverhall
|
7ad7a27b35
|
Merge branch 'seminarCreation' into develop
|
2013-01-16 14:13:46 +01:00 |
|
Emil Siverhall
|
bf4876b183
|
only sysadmins allowed to create final seminars.. removed this to allow supervisors as well
|
2013-01-16 14:13:35 +01:00 |
|
Jona Ekenberg
|
3fe623a01e
|
Merge branch 'updateSupervisorSelectIdea' into develop
|
2013-01-16 12:31:40 +01:00 |
|
|
|
68597b39f8
|
Shibboleth page now redirects to user home page after login complete
|
2013-01-16 11:08:39 +01:00 |
|
|
|
1a3cbd3426
|
Added missing column to NotificationData
|
2013-01-16 10:32:32 +01:00 |
|
|
|
502e812500
|
Shibboleth page dumping all headers
|
2013-01-16 10:19:57 +01:00 |
|
|
|
06a1237b8e
|
Ignoring test for supervisor notifications since they are disabled due to authors not knowing who the supervisor is.
|
2013-01-16 09:20:42 +01:00 |
|
