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 |
|
|
|
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 |
|
|
|
6de36dc24c
|
Fixed broken test as a result of adding supervisor name to the notification body
|
2013-01-14 17:01:06 +01:00 |
|
|
|
76fe77f709
|
Separate notification sent to the affected partner when it is added.
|
2013-01-14 16:52:30 +01:00 |
|
|
|
91b12ea125
|
Supervisor name and status is now displayed in the notification body.
|
2013-01-14 16:04:06 +01:00 |
|
|
|
d02fe452c1
|
PARTNER_ACCEPT notifications
|
2013-01-14 16:01:58 +01:00 |
|
|
|
49af9b1eae
|
Fixed bug in NewIdeaServiceImpl that prevented authors from adding new partners if the previous one declined
Idea notifications for STATUS_CHANGE, SUPERVISOR_CHANGE, PARTNER_DECLINE
|
2013-01-14 15:47:42 +01:00 |
|
|
|
9e9900edb5
|
Prevent NPE if an idea does not have a supervisor but it is specified as a recipient for an idea related event.
|
2013-01-14 15:43:24 +01:00 |
|
|
|
b180ae6df2
|
Fixed bug in parameter type, should be NewIdeaParticipation not IdeaParticipation
|
2013-01-14 11:23:07 +01:00 |
|
fred-fri
|
1fe1166054
|
db update
|
2013-01-14 17:38:30 +09:00 |
|
fred-fri
|
32ce7b86b2
|
Merge branch 'release20130114'
20130114
|
2013-01-14 17:16:33 +09:00 |
|
fred-fri
|
4b5c09d561
|
added new db update file
|
2013-01-14 17:09:44 +09:00 |
|
fred-fri
|
07d5428f7a
|
changed datetimes to stylabledatetimes
|
2013-01-14 16:48:29 +09:00 |
|
fred-fri
|
56febd5d56
|
replaced one customdate with stylable
|
2013-01-14 16:35:12 +09:00 |
|
fred-fri
|
5adb97b5f9
|
added ajax method to styleable
|
2013-01-14 16:24:09 +09:00 |
|
fred-fri
|
6034fd79b8
|
keywords css fixed
|
2013-01-14 15:11:19 +09:00 |
|
fred-fri
|
931546f834
|
fixed bug in cleanstring method
|
2013-01-14 14:12:25 +09:00 |
|
fred-fri
|
ce4be0f530
|
refactored the stupid longtointservice into the utility class
|
2013-01-14 13:04:33 +09:00 |
|
fred-fri
|
fee658e9cf
|
copied longtoint method into utility class
|
2013-01-14 12:47:26 +09:00 |
|
fred-fri
|
ddbc355915
|
corrected error in the shorter method fix
|
2013-01-14 12:35:31 +09:00 |
|
fred-fri
|
d7472d4390
|
checking that all titles can indeed be displayed in dialogs
|
2013-01-14 12:30:52 +09:00 |
|
fred-fri
|
38b2aec4fd
|
hooked up another method to the previous stuff
|
2013-01-14 12:25:34 +09:00 |
|
fred-fri
|
c3e7f7eee9
|
created new utility class and hooked up project gettitle method to it to clean title strings before they are used
|
2013-01-14 12:14:49 +09:00 |
|
fred-fri
|
7837adac01
|
found a good regexp that removes all (?) control and non-printable characters"
|
2013-01-14 11:29:44 +09:00 |
|
fred-fri
|
0d6122ee0d
|
replaced a if else with onvisibility allowed and removed old supervisor project panel no longer in use
|
2013-01-14 09:29:58 +09:00 |
|
|
|
3dfe93ba5c
|
Test for NewMatchServiceImpl
|
2013-01-11 17:26:27 +01:00 |
|
