Emil Siverhall
|
50951e1afb
|
Merge branch 'deactivateSupervisorChanged' into develop
|
2013-02-20 13:50:00 +01:00 |
|
Emil Siverhall
|
6aa3fcf9c0
|
temporarily turned off sending of mail when supervisor changes through daisy imports
|
2013-02-20 13:41:05 +01:00 |
|
Emil Siverhall
|
fea020a822
|
Merge branch 'subjectTitles' into develop
|
2013-02-20 12:41:18 +01:00 |
|
Emil Siverhall
|
f164ccc436
|
removed project information from notification page subject column since we have a separate column for project title
|
2013-02-20 12:40:46 +01:00 |
|
|
|
406245d140
|
Unread column now shows solid red flag or transparent red flag based on unread status to allow marking notifications as unread.
|
2013-02-20 11:41:08 +01:00 |
|
|
|
8a6347e41d
|
Added new 16x16 transparent red flag
|
2013-02-20 11:40:43 +01:00 |
|
|
|
bcbee9da6e
|
Icon column now has an overrideable method to change the icon based on the row model.
|
2013-02-20 11:40:19 +01:00 |
|
fred-fri
|
c92ba14271
|
using static strings for ids
|
2013-02-20 16:48:55 +09:00 |
|
fred-fri
|
fe92049ef3
|
refactored links and removed redundant link from supervisor idea subtabmenu
|
2013-02-20 16:43:05 +09:00 |
|
fred-fri
|
cf0f493c9e
|
beginning to refactor links
|
2013-02-20 16:23:17 +09:00 |
|
fred-fri
|
93a2fd45d7
|
beginning to refactor links
|
2013-02-20 16:21:28 +09:00 |
|
fred-fri
|
42b1773a67
|
beginning to refactor links
|
2013-02-20 16:21:10 +09:00 |
|
fred-fri
|
9f1a246109
|
some refactoring and rearranging of components on the students ideas page
|
2013-02-20 14:40:19 +09:00 |
|
|
|
3002817410
|
Merge branch 'improvement/notification_gui' into develop
Conflicts:
src/main/java/se/su/dsv/scipro/icons/ImageObject.java
|
2013-02-19 16:52:26 +01:00 |
|
|
|
9f94159304
|
Role column and refactoring of notification data panel
|
2013-02-19 16:43:49 +01:00 |
|
|
|
2308192829
|
Service methods to find a users role in a project (null if not member)
|
2013-02-19 15:58:58 +01:00 |
|
|
|
2c6b507d52
|
Added missing serialversionuid
|
2013-02-19 15:55:52 +01:00 |
|
|
|
1e134bc4c6
|
From column in notification table
|
2013-02-19 15:50:38 +01:00 |
|
|
|
ddafeb6b8a
|
Database definition update to include the new caused by user id in notification data table.
|
2013-02-19 15:50:22 +01:00 |
|
|
|
408cc0a0b7
|
The user who caused the event is now saved in the notificationevent entity
|
2013-02-19 15:35:33 +01:00 |
|
|
|
bb467a2d80
|
Added new mocked services to notification view tests
|
2013-02-19 15:28:13 +01:00 |
|
Jona Ekenberg
|
880962f2cf
|
Merge branch 'hehehehehe' into develop
|
2013-02-19 15:23:33 +01:00 |
|
Jona Ekenberg
|
1f0c5e6dd3
|
mer update på forummockup
|
2013-02-19 15:22:47 +01:00 |
|
|
|
f66d4e8335
|
Landing page for projects that redirects to the proper view based on project association
|
2013-02-19 15:21:46 +01:00 |
|
|
|
9b405335f8
|
Project column is now clickable if you are part of the project in some way
|
2013-02-19 14:38:30 +01:00 |
|
|
|
e5ff3a4c65
|
Method for checking if a user is part of a project
|
2013-02-19 14:21:39 +01:00 |
|
|
|
86bdfc1423
|
Project column
|
2013-02-19 14:15:35 +01:00 |
|
Jona Ekenberg
|
a61d243c8c
|
la till flagga
|
2013-02-19 14:01:43 +01:00 |
|
Jona Ekenberg
|
d3d67bc554
|
uppdaterat forummockupen
|
2013-02-19 13:55:47 +01:00 |
|
Jona Ekenberg
|
f60f297061
|
updated the scipro_m.css and moved it under bootstrap.css so that it overrides bootstrap properly
|
2013-02-19 13:55:36 +01:00 |
|
|
|
b572e9f8cb
|
getTitle is now abstract
|
2013-02-19 13:42:05 +01:00 |
|
|
|
f2176e108d
|
Removed old subject column
|
2013-02-19 12:40:14 +01:00 |
|
|
|
a8130847d7
|
Clicking the subject will mark the notification as read
|
2013-02-19 12:39:58 +01:00 |
|
|
|
3785afe0e5
|
Callback added when external link is clicked
|
2013-02-19 12:39:47 +01:00 |
|
|
|
e4c60ce173
|
Subject column
|
2013-02-19 12:32:59 +01:00 |
|
|
|
36c9bcd117
|
External link column (uses absolute URLs instead of wicket pages).
|
2013-02-19 12:28:05 +01:00 |
|
|
|
28e4a39a1d
|
Added DateService to test
|
2013-02-19 11:51:58 +01:00 |
|
|
|
baf8c294ff
|
First column now named status and now shows a red flag indicating the read status.
|
2013-02-19 11:25:16 +01:00 |
|
|
|
9eedb9874d
|
Added red flag to ImageObject
|
2013-02-19 11:08:01 +01:00 |
|
|
|
4d197fff27
|
Added red glyphicons using class="icon-red"
|
2013-02-19 11:03:34 +01:00 |
|
|
|
2aceec6139
|
Merge branch 'feature/external_project' into develop
Conflicts:
resources/db_update_scripts/current.sql
|
2013-02-19 10:21:24 +01:00 |
|
|
|
ee0b3eaed4
|
SQL statement for external organization column in project table
|
2013-02-19 10:17:57 +01:00 |
|
|
|
c2e95412da
|
External organization panel added to supervisor project view
|
2013-02-19 10:17:03 +01:00 |
|
|
|
0ee8be09f2
|
Help icon for external organization
|
2013-02-19 10:13:40 +01:00 |
|
|
|
092e9f2889
|
Improved rendering test.
|
2013-02-19 10:06:51 +01:00 |
|
|
|
5453e31ef8
|
Added enclosure to hide label when not connected to external organization.
Major panel refactoring.
|
2013-02-19 09:58:50 +01:00 |
|
fred-fri
|
32c944b60c
|
made select supervisor idea page use method that uses exemptions
|
2013-02-19 17:33:57 +09:00 |
|
fred-fri
|
3ef5dc5bcb
|
fixed a null bug
|
2013-02-19 16:49:51 +09:00 |
|
fred-fri
|
c24e7713af
|
Merge branch 'develop' of ssh://git.dsv.su.se/git/scipro/scipro into develop
|
2013-02-19 16:36:51 +09:00 |
|
fred-fri
|
80b5700171
|
Merge branch 'ap2' into develop
|
2013-02-19 16:36:13 +09:00 |
|
