6099 Commits

Author SHA1 Message Date
fred-fri
f1a92dca81 added research area import when importing single users through gui interface. also rearranged some stuff which violated DRY 2013-01-09 13:12:26 +09:00
Jona Ekenberg
6554e7b061 changed every Dialog to DialogPlus 2013-01-09 01:12:33 +01:00
fbd54fcb3c added peer requester as a possible recipient to peer events
re-added deleted review aborted notification
refactored abortreviewpanel and created a test
2013-01-08 17:23:04 +01:00
029a5ba020 added /classes/ to ignore 2013-01-08 16:24:38 +01:00
Emil Siverhall
d09ef0af0d Merge branch 'cssFixes' into develop 2013-01-08 10:47:35 +01:00
Emil Siverhall
913bd70793 some dialog width changes and css changes to make accept dialog look proper 2013-01-08 10:46:55 +01:00
fred-fri
25070686a3 removed duplicates from mail lists 2013-01-08 18:41:41 +09:00
Emil Siverhall
f705399515 less space between create and select buttons on project idea start page 2013-01-08 10:14:39 +01:00
fred-fri
11691f09ec minor fix of header 2013-01-08 14:18:01 +09:00
fred-fri
6255bcf35c removed mail section of turnitin worker, now we just seterror and thats it 2013-01-08 12:12:01 +09:00
fred-fri
0fef8dafc1 some cleanup, removal of iserror check on turnitin worker so we can print errors and contact turnitin about it 2013-01-08 12:01:42 +09:00
fred-fri
7b6a129931 blabla 2013-01-08 11:36:15 +09:00
Emil Siverhall
4834aec9c0 minor style changes to idea start pages 2013-01-07 21:09:52 +01:00
Emil Siverhall
878ee1774a Merge branch 'authorDialogStyling' into develop 2013-01-07 20:41:01 +01:00
Emil Siverhall
6629eb11b2 restructuring of complete idea dialog panel 2013-01-07 20:40:43 +01:00
Emil Siverhall
03d71f14ea added row-fluid to some feedback panels 2013-01-07 20:40:41 +01:00
Emil Siverhall
c8df5894cf added some new css for feedback panels 2013-01-07 20:40:39 +01:00
Emil Siverhall
6206db3066 logo supposed to be added through css file but wasnt visible. changed to correct target folder to make it work 2013-01-07 20:40:37 +01:00
Emil Siverhall
de3e8dbb2b author watson completion dialog style changes 2013-01-07 20:40:34 +01:00
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