6396 Commits

Author SHA1 Message Date
f32077a518 Merge branch 'defect/notification_duplicates' into develop 2013-01-31 11:32:56 +01:00
b2756736ab Mark read implementation. 2013-01-31 11:31:07 +01:00
577ef0779f Serious cleanup to remove all old notification stuff related to supervisor notification settings. 2013-01-31 11:21:24 +01:00
e899311473 Test to verify mark read click behaviour. 2013-01-31 11:01:56 +01:00
4468a7cdd8 Test for the notification data panel 2013-01-31 10:43:20 +01:00
f1a12f4992 Implementation of mark read functionality. 2013-01-31 09:48:45 +01:00
f27ea512bb Test to verify markRead works. 2013-01-31 09:45:22 +01:00
804d698a99 Activity plan and checklist notifications turned off 2013-01-31 09:32:17 +01:00
35a2677db6 Activity plan related notifications now say which activity plan was affected. 2013-01-31 09:27:02 +01:00
4a4dfbcd50 Fixed the login sso initialization and session issues which had potential for infinite redirect loops. 2013-01-30 18:11:37 +01:00
c7ff31eaf0 Now uses NotificationUtils to generate a source instead of doing it manually. 2013-01-30 17:40:41 +01:00
814582c0c5 Generating notification source with notification utils will automatically add the current user, if one exists, as the source of the notification thus preventing him from ending up on the recipient list. 2013-01-30 17:40:23 +01:00
154028dd86 Peer review events now ignore source user 2013-01-30 17:33:48 +01:00
7a962c7fd6 Project, seminar, peer requests now ignore the source user. 2013-01-30 17:24:10 +01:00
7d754b17f9 Idea notifications are no longer sent to the user specified in the source. 2013-01-30 13:29:48 +01:00
fred-fri
015a4ed4f3 removed sending of users with unread notifications to notifications page 2013-01-30 11:44:04 +09:00
fred-fri
26c847c743 removed sending of users with unread notifications to notifications page 2013-01-30 11:37:36 +09:00
d5c18cd44a Removed old admin notification settings page 2013-01-29 16:20:24 +01:00
3836e0f6f0 DateSettingPanel now uses constants to refer to wicket:ids 2013-01-29 16:14:41 +01:00
47a64df4d6 Merge branch 'develop' of ssh://git.dsv.su.se/git/scipro/scipro into develop 2013-01-29 15:47:55 +01:00
cbd034004d Extracted some interfaces to help cobertura 2013-01-29 15:47:34 +01:00
Emil Siverhall
51b62a731a Merge branch 'dateFilteringForAdmins' into develop 2013-01-29 15:05:36 +01:00
Emil Siverhall
303ecfd95b added date filtering to admin-> new idea panel 2013-01-29 15:04:00 +01:00
Emil Siverhall
07caf683e1 new constructor for date picker panel that takes a startdate and sets end date to todays date 2013-01-29 15:03:57 +01:00
32a24126a9 Cobertura plugin for code coverage 2013-01-29 14:45:11 +01:00
b1f37cbedf Merge branch 'develop' of ssh://git.dsv.su.se/git/scipro/scipro into develop 2013-01-29 14:02:40 +01:00
Emil Siverhall
e211ec73b4 Merge branch 'adminFixes' into develop 2013-01-29 12:25:09 +01:00
Emil Siverhall
9d4e4f8d66 status filter on admin-> new idea panel now only displays the statuses that are current supported instead of all idea statuses. status pending is added if partner confirmation system setting is turned on. 2013-01-29 12:14:01 +01:00
8b46ce8d3a Merge branch 'improvement/date_formatting' into develop
Conflicts:
	resources/db_update_scripts/current.sql
2013-01-29 12:00:00 +01:00
9e0084d0a7 SQL statements. 2013-01-29 11:57:32 +01:00
a5dd3dc087 Most classes that should be safe to use DateService have been changed to use it. 2013-01-29 11:52:23 +01:00
bb88eb06a8 Updated to new date service 2013-01-29 11:37:14 +01:00
f7f05c39d2 DateFormatter wicket utility class updated to use the DateService for formatting. 2013-01-29 11:34:51 +01:00
Emil Siverhall
958a31e801 cleanup.. 2013-01-29 11:33:13 +01:00
Emil Siverhall
cc28e0c36e admins may not manually match ideas to supervisors where targets numbers already are reached 2013-01-29 11:23:14 +01:00
358a52f12f Link to replacement patterns now open in a new window 2013-01-29 11:22:51 +01:00
ad47d1486f Date settings are now included in the admin settings menu 2013-01-29 11:21:17 +01:00
b0ca0a5583 Test to make sure the current format is displayed in the fields 2013-01-29 11:18:19 +01:00
Emil Siverhall
32e40754a8 added toString method to application period domain object that presents the name of the period.. 2013-01-29 11:12:24 +01:00
Emil Siverhall
2654af20ef prepared the admin-> new idea panel to use application period filtering. not sure if this should be visble since it gets pretty messy with all small periods created besides the regular ones 2013-01-29 11:11:39 +01:00
Emil Siverhall
36ed5ac407 new generic filter form panel with a dropdown choice component 2013-01-29 11:09:55 +01:00
bef77725a3 Convenience method in DateService 2013-01-29 11:09:13 +01:00
e87cac4f3a Submit button and feedback messages 2013-01-29 11:04:12 +01:00
71ef26740d Moved pages to better location 2013-01-29 10:52:19 +01:00
0366693c5f Test to include the label for each field explaining what it is 2013-01-29 10:40:19 +01:00
aaa06895e5 Updated test to include the panel required bean in the context 2013-01-29 10:39:22 +01:00
2776ad09db Annotation for the save method 2013-01-29 10:21:32 +01:00
e6d5ce73b2 Test checks that the filled out format is what gets saved. 2013-01-29 10:18:09 +01:00
8170845d30 Test checks for error messages if formats are not filled out 2013-01-29 10:07:53 +01:00
8511874b6b Tests verifies all settings are saved when filled out 2013-01-29 09:52:16 +01:00