Niklas
|
b9c90083f2
|
Deleted excess entity Pending as well as springdata classes depended on it,
Updated current.sql.
|
2013-01-07 10:11:03 +01:00 |
|
|
|
14179fa6de
|
Added missing semicolons
|
2013-01-07 09:34:08 +01:00 |
|
|
|
4eb1ed9771
|
Merge branch 'notifications' into develop
|
2013-01-07 09:22:24 +01:00 |
|
|
|
9702e6f759
|
Prepared for idea notifications
|
2013-01-07 09:21:57 +01:00 |
|
|
|
ce7588414e
|
Cleaned up old code
|
2013-01-07 09:06:44 +01:00 |
|
|
|
ee8dc4b76d
|
NotificationControllerImpl is no longer dependent on internal NotificationEvent data to figure out recipients for events
|
2013-01-07 09:00:23 +01:00 |
|
|
|
5a83e34526
|
Removed ' that caused formatting expression to not be evaluated
|
2013-01-04 17:07:42 +01:00 |
|
|
|
17f8c2fa98
|
Merge branch 'notifications' into develop
|
2013-01-04 17:02:06 +01:00 |
|
|
|
4d21723aad
|
Source added to a few project related notifications to make it easier to determine what happened
|
2013-01-04 16:43:20 +01:00 |
|
|
|
4c607756b1
|
Tests updated with the new mail formatter
|
2013-01-04 16:36:18 +01:00 |
|
|
|
7f488b6d3a
|
Formatters for seminars and peer events
|
2013-01-04 16:35:27 +01:00 |
|
|
|
ded0368191
|
Single mails now have the correct subject
|
2013-01-04 15:34:08 +01:00 |
|
|
|
9ebef3734b
|
Mail formatting is now handled by a separate service class. The format for subject/title and body defaults to what is used on the web but can be overridden in the MailFormatter property file
|
2013-01-04 15:28:39 +01:00 |
|
|
|
4e6a180757
|
Cleaning up in the properties file
|
2013-01-04 13:44:51 +01:00 |
|
|
|
375d466505
|
Properties file no longer depend on wicket smart attribute resolver
|
2013-01-04 13:37:40 +01:00 |
|
Emil Siverhall
|
b225afa9b1
|
Merge branch 'ideaDetailsAdjustments' into develop
|
2013-01-04 11:36:39 +01:00 |
|
Emil Siverhall
|
01a4bc1327
|
readded Scipro-logo that seems to have disappeared
|
2013-01-04 11:36:22 +01:00 |
|
Emil Siverhall
|
ea69b3aa25
|
added Idea title: text to dialog title bar
|
2013-01-04 11:34:16 +01:00 |
|
Emil Siverhall
|
76a5aaa8b2
|
Better looking input fields for first meeting dates by using new StylableDateTimeField component, which basically is the same as the DateTimeField but with customizable html
|
2013-01-04 11:20:50 +01:00 |
|
Emil Siverhall
|
9e28bc6ada
|
changed dialog size
|
2013-01-04 10:48:48 +01:00 |
|
Emil Siverhall
|
debf9b5ad6
|
changes to new idea details panel to match mockups. restructure of fields and use of new css classes. also removed first meeting details to put this in its own panel, since supervisors doesnt want to see this
|
2013-01-04 10:48:28 +01:00 |
|
Emil Siverhall
|
17a7ea824f
|
deleted swedish properties for login panel since we want to use a swedish locale for date formatting but we still want to use english language on our pages
|
2013-01-04 10:40:49 +01:00 |
|
|
|
a832f3e9f4
|
Presentation of notification details is now done in the presentation layer instead of service layer.
|
2013-01-03 16:21:11 +01:00 |
|
|
|
a783386853
|
Unread notifications are now displayed in bold in the datatable.
|
2013-01-03 15:58:14 +01:00 |
|
|
|
fd0d43ceb0
|
NotificationData is now more appropriately named NotificationEvent
|
2013-01-03 12:41:09 +01:00 |
|
|
|
b39f5555a0
|
source is now copied from notificationsource to notificationdata in the controller
|
2013-01-03 12:24:05 +01:00 |
|
|
|
733919f03a
|
NotificationData/Source now has a source attribute that can be used to show a more specific source than the basic entity that caused the notification
|
2013-01-03 12:17:56 +01:00 |
|
Emil Siverhall
|
991642592c
|
some new css styling to watson info panel
|
2013-01-03 09:43:27 +01:00 |
|
Jona Ekenberg
|
8bc70ad4b9
|
changed the Match-page to use ClickableTitleColumn
|
2013-01-03 01:19:14 +01:00 |
|
Jona Ekenberg
|
97ebd5c6ab
|
added css and some functionality for shortening ClickableTitle-titles
|
2013-01-03 01:00:03 +01:00 |
|
Jona Ekenberg
|
65bc47c01a
|
updated the markup for SubervisorNewEditIdeaPanel
|
2013-01-01 17:25:50 +01:00 |
|
Jona Ekenberg
|
a457d867e0
|
fixed a small thing in markup
|
2012-12-27 22:43:35 +01:00 |
|
Jona Ekenberg
|
dadf11aa06
|
now the markup looks quite good
|
2012-12-27 22:41:07 +01:00 |
|
Jona Ekenberg
|
46c9440a79
|
changed some classes in ProjectNewIdeaSubmissionPanel.html
|
2012-12-27 21:58:50 +01:00 |
|
Jona Ekenberg
|
65b288227c
|
started changing some css in submissionpanel
|
2012-12-26 18:36:54 +01:00 |
|
Jona Ekenberg
|
452d2fe6c6
|
changed id of panel
|
2012-12-26 18:20:08 +01:00 |
|
Maryam Ammouri
|
96a6af2894
|
Merge branch 'develop' of ssh://git.dsv.su.se/git/scipro/scipro into develop
|
2012-12-21 16:54:40 +01:00 |
|
Maryam Ammouri
|
58fd207265
|
last css push
|
2012-12-21 16:54:06 +01:00 |
|
|
|
efaa9a9c32
|
Merge branch 'notifications' into develop
|
2012-12-21 16:48:02 +01:00 |
|
|
|
5b171c6dd3
|
notifications for created, edited, deleted activity plans
|
2012-12-21 16:46:52 +01:00 |
|
Maryam Ammouri
|
b0d2ddb219
|
Merge branch 'develop' of ssh://git.dsv.su.se/git/scipro/scipro into develop
|
2012-12-21 16:21:33 +01:00 |
|
Maryam Ammouri
|
5aedb795ce
|
final touches scipro
|
2012-12-21 16:20:04 +01:00 |
|
|
|
13e50db8e5
|
notifications for new checklists
|
2012-12-21 16:07:30 +01:00 |
|
|
|
8d2d497c78
|
removed all recipients for notifications about checklist answered due to spam potential
1 checklist with 10 questions for 2 project members would result in 20 notifications
|
2012-12-21 15:20:56 +01:00 |
|
|
|
a4a5ada904
|
added missing notificationcontroller bean
|
2012-12-21 15:20:07 +01:00 |
|
|
|
9154f183c1
|
readded the test since apitest seems to be working again
|
2012-12-21 15:19:41 +01:00 |
|
|
|
c231f48e3f
|
Merge branch 'notifications' into develop
|
2012-12-21 15:12:06 +01:00 |
|
|
|
233c85f182
|
Merge branch 'develop' of git.dsv.su.se:/git/scipro/scipro into develop
|
2012-12-21 15:11:41 +01:00 |
|
Emil Siverhall
|
86ae4cadfe
|
merge conflict from hotfix
|
2012-12-21 14:04:50 +01:00 |
|
Emil Siverhall
|
5c438092b4
|
Merge branch 'hotfix-20121221'
20121221
|
2012-12-21 13:59:57 +01:00 |
|
