Emil Siverhall
|
67e262e696
|
cleanup and alignment fixes
|
2013-02-21 16:25:38 +01:00 |
|
Emil Siverhall
|
4187ff876e
|
new settings page under Supervisor - My settings tab
|
2013-02-21 16:24:07 +01:00 |
|
Emil Siverhall
|
23c3a0948a
|
removed notification settings from notifications page
|
2013-02-21 16:16:43 +01:00 |
|
Emil Siverhall
|
ff30ce4d8d
|
Merge branch 'matchColumn' into develop
|
2013-02-21 11:58:39 +01:00 |
|
Emil Siverhall
|
3bc72b5a38
|
changed date format in the history panel to show time of day as well
|
2013-02-21 11:56:30 +01:00 |
|
Emil Siverhall
|
4c6992763c
|
added same selection to popup page as well
|
2013-02-21 11:56:05 +01:00 |
|
Emil Siverhall
|
cd4d5986ac
|
added supervisor selection column for student ideas on admin - match - ideas
|
2013-02-21 11:55:45 +01:00 |
|
Emil Siverhall
|
fb256b021e
|
Merge branch 'showExternal' into develop
|
2013-02-21 10:39:33 +01:00 |
|
Emil Siverhall
|
091e95f196
|
added external organization info to students project detail panel
|
2013-02-21 10:39:01 +01:00 |
|
fred-fri
|
ed983f0a79
|
added new sql with some constraints and columns
|
2013-02-21 17:35:24 +09:00 |
|
fred-fri
|
2bb5d84c0b
|
added constraints and attributes
|
2013-02-21 17:01:54 +09:00 |
|
fred-fri
|
5a7a19c4ff
|
Merge branch 'ap' into develop
|
2013-02-21 16:38:11 +09:00 |
|
fred-fri
|
e9be82e8ca
|
made mock in order to make tests work
|
2013-02-21 16:37:40 +09:00 |
|
fred-fri
|
f4b59da40e
|
made student select supervisor ideas page become invisible if application period has passed or student has no open exemption
|
2013-02-21 16:05:54 +09:00 |
|
fred-fri
|
5190ecdc43
|
made students links to application periods appear after application period end if student has exemption
|
2013-02-21 15:55:36 +09:00 |
|
fred-fri
|
1a3b3cc9f4
|
hiding supervisor view all student ideas on application periods that are over
|
2013-02-21 15:46:22 +09:00 |
|
fred-fri
|
8c55a365e7
|
made student create idea page use selected application period
|
2013-02-21 15:33:49 +09:00 |
|
fred-fri
|
5e5f1a6161
|
made students select supervisor idea page use levels in application period
|
2013-02-21 13:33:34 +09:00 |
|
fred-fri
|
e7ae541ae0
|
made students select supervisor idea page use levels in application period
|
2013-02-21 11:36:26 +09:00 |
|
fred-fri
|
51e1516bdb
|
made supervisors select student ideas page use levels from application period
|
2013-02-21 11:25:36 +09:00 |
|
Emil Siverhall
|
13affa78f1
|
Merge branch 'release20130220'
20130220
|
2013-02-20 15:09:44 +01:00 |
|
Emil Siverhall
|
4679971194
|
added new current.sql file
|
2013-02-20 15:02:38 +01:00 |
|
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 |
|
