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 |
|
|
|
b610fad78e
|
Shibboleth login made better
|
2013-01-16 16:02:42 +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 |
|
fred-fri
|
af756e819c
|
removed iserror boolean from turnitincheck because we no longer get the md5 errors
|
2013-01-16 16:53:49 +09:00 |
|
fred-fri
|
370c0909e6
|
Merge branch 'release20130116b'
20130114b
|
2013-01-16 14:02:18 +09:00 |
|
fred-fri
|
8f0c406344
|
did something criminal: commented out a test in order to be able to deploy
|
2013-01-16 14:01:06 +09:00 |
|
fred-fri
|
650cab2695
|
Merge branch 'release20130116'
20130116
|
2013-01-16 13:28:02 +09:00 |
|
fred-fri
|
b348fe039e
|
Merge branch 'develop' of ssh://git.dsv.su.se/git/scipro/scipro into develop
|
2013-01-16 11:47:07 +09:00 |
|
fred-fri
|
55815ea6b9
|
turned turnitin diagnostics off
|
2013-01-16 11:45:55 +09:00 |
|
fred-fri
|
0828e2bc37
|
not sending author names to turnitin anymore
|
2013-01-16 11:44:00 +09:00 |
|
Jona Ekenberg
|
d766ce474b
|
touched it some more
|
2013-01-15 19:23:29 +01:00 |
|
Jona Ekenberg
|
9d05c8ddcb
|
touched up the looks for the keywords-filter
|
2013-01-15 19:09:14 +01:00 |
|
Jona Ekenberg
|
52f22844b7
|
removed the 'filter by'-part of a lot of the filters
|
2013-01-15 18:14:26 +01:00 |
|
|
|
93c6173dbf
|
FIRST_MEETING notifications for ideas
|
2013-01-15 14:16:34 +01:00 |
|
|
|
efe0c85aea
|
STATUS_CHANGE notification when admin unmatches an idea
|
2013-01-15 12:59:50 +01:00 |
|
|
|
0ed0eb55dd
|
STATUS_CHANGE notification when supervisor accepts supervision
|
2013-01-15 12:55:42 +01:00 |
|
|
|
86fbaa2ec3
|
Notifications are no longer sent about supervisor changes since authors cant see who they are anyway
|
2013-01-15 12:53:46 +01:00 |
|
|
|
ee684adf10
|
SysAdmins can now switch to any user on any realm. Use username <your user>::<other user>[@<other realm>]. If other realm is not specified it defaults to DSV.SU.SE.
|
2013-01-15 10:19:03 +01:00 |
|
|
|
6e1fd2b431
|
Merge branch 'feature/notifications/idea' into develop
Conflicts:
src/main/java/se/su/dsv/scipro/notifications/panels/NotificationDataPanel.java
|
2013-01-15 10:06:04 +01:00 |
|
|
|
00be56d99c
|
PARTNER_ACCEPT notifications when authors accept a supervisor idea
|
2013-01-15 09:58:35 +01:00 |
|
|
|
a4363b596d
|
Prevent exception if a sysadmin logs in as a non-existent user
|
2013-01-15 09:58:12 +01:00 |
|
|
|
ed24958363
|
ADDED_AS_PARTNER event only sent to the co author
|
2013-01-15 08:55:52 +01:00 |
|
fred-fri
|
dc67b073f0
|
removed folder named useless which contained old css no longer used
|
2013-01-15 11:28:18 +09:00 |
|
fred-fri
|
05477ea25f
|
Merge branch 'develop' of ssh://git.dsv.su.se/git/scipro/scipro into develop
|
2013-01-15 11:19:36 +09:00 |
|
fred-fri
|
a81b3d7cbe
|
hooked up dialogplus to use new cleanmethod which cleans more illegal characters away than just backslash n
|
2013-01-15 10:54:13 +09:00 |
|
Emil Siverhall
|
e97e13d552
|
Merge branch 'labelFixes' into develop
|
2013-01-14 22:37:29 +01:00 |
|
Emil Siverhall
|
023d20ce78
|
more label/css fixes
|
2013-01-14 22:37:16 +01:00 |
|
Emil Siverhall
|
9e0fc75f3e
|
fixing filter form labels to look the same
|
2013-01-14 22:19:49 +01:00 |
|
Emil Siverhall
|
9d13e1c660
|
Merge branch 'mailFix' into develop
|
2013-01-14 22:09:53 +01:00 |
|
Emil Siverhall
|
d7e2357ffd
|
fixed css on admin -> mail
|
2013-01-14 22:09:42 +01:00 |
|
Emil Siverhall
|
253be0a7ff
|
Merge branch 'moreFixes' into develop
|
2013-01-14 21:35:40 +01:00 |
|
Emil Siverhall
|
f4c8b18206
|
we dont want to show new idea admin link just yet..
|
2013-01-14 21:33:30 +01:00 |
|
Emil Siverhall
|
6998f18e98
|
more css fixes to admin-newidea
|
2013-01-14 21:33:27 +01:00 |
|
Emil Siverhall
|
c717b3c567
|
starting to do some css fixes on admin - match - new idea page
|
2013-01-14 21:33:25 +01:00 |
|
Emil Siverhall
|
c0b8ccb3b8
|
minor changes to all supervisor/student idea pages
|
2013-01-14 21:33:21 +01:00 |
|
