|
|
dfc20e8196
|
Test verifying panel visibility when export failed.
|
2013-02-05 10:43:26 +01:00 |
|
|
|
812da20bbf
|
Idea export feedback panel.
|
2013-02-05 10:40:20 +01:00 |
|
|
|
8829e4af84
|
Fixed bug with filterform when passing in a non-modifiable list as default selection.
|
2013-02-05 09:50:03 +01:00 |
|
fred-fri
|
1ffedb60f6
|
made match pages visible to admins, not just sysadmins
|
2013-02-05 09:41:33 +09:00 |
|
Emil Siverhall
|
88328cbf24
|
Merge branch 'linkChange' into develop
|
2013-02-04 19:56:44 +01:00 |
|
Emil Siverhall
|
ee0467d3cb
|
changed redirect url when clicking resources link in the headerpanel
|
2013-02-04 19:56:36 +01:00 |
|
Emil Siverhall
|
fb308e9256
|
Merge branch 'badge' into develop
|
2013-02-04 19:36:26 +01:00 |
|
Emil Siverhall
|
504fc35b3c
|
removed println..
|
2013-02-04 19:25:36 +01:00 |
|
Emil Siverhall
|
01f0b34fdd
|
added badge to show number of new notifications. moved this into the HeaderPanel since ServiceMenuPanel sounded a bit wrong
|
2013-02-04 19:25:34 +01:00 |
|
|
|
c02f1c1cab
|
FilterFormCheckBoxPanel no longer has useless constructor parameter and instead takes an optional list of default selected values.
SupervisorMyProjectsPanel filter now defaults to only active projects.
|
2013-02-04 17:34:59 +01:00 |
|
|
|
a51cc416fc
|
Fixed two test to use the new auto context features.
|
2013-02-04 16:40:36 +01:00 |
|
|
|
6020dbcdf5
|
Merge branch 'feature/watch_idea_keywords' into develop
Conflicts:
resources/db_update_scripts/current.sql
|
2013-02-04 16:40:09 +01:00 |
|
|
|
d38d9f7800
|
New column in NotificationSettings table.
|
2013-02-04 16:28:11 +01:00 |
|
|
|
bd455dfa4c
|
The label is now hidden as well if the checkbox for idea keyword notifications is hidden due to roles.
|
2013-02-04 16:27:32 +01:00 |
|
|
|
5d3a787b70
|
Notifications about student ideas with matching keywords now have a proper URL.
|
2013-02-04 16:20:54 +01:00 |
|
|
|
983ef5d9a9
|
Notification settings panel contains a checkbox to toggle notifications for student created ideas with keywords matching the supervisors own specified. Checkbox only visible for users with employee role.
|
2013-02-04 16:18:32 +01:00 |
|
|
|
dfd152f5fe
|
SciPro test automatically puts all fields annotated with @Mock in the application context.
All tests updated to make us of the new functionality. If this functionality is not desired override autoContext() and return false.
|
2013-02-04 16:05:16 +01:00 |
|
|
|
82654812e9
|
Saving student ideas notifies relevant employees based on keywords specified if they have the type of notification turned on.
|
2013-02-04 13:48:41 +01:00 |
|
Emil Siverhall
|
ab116461cc
|
Merge branch 'release20130204-2'
20130204-2
|
2013-02-04 12:43:10 +01:00 |
|
Emil Siverhall
|
9aa3f03152
|
Merge branch 'annotationFix' into develop
|
2013-02-04 09:29:00 +01:00 |
|
Emil Siverhall
|
092d807bdd
|
changed sysadmin to admin annotation on admin match
|
2013-02-04 09:28:32 +01:00 |
|
fred-fri
|
cc254c97fd
|
Merge branch 'release20130204'
20130204
|
2013-02-04 10:35:55 +09:00 |
|
Emil Siverhall
|
432a41d92b
|
Merge branch 'keywordClear' into develop
|
2013-02-01 14:25:27 +01:00 |
|
Emil Siverhall
|
0781ad487d
|
label alignment on keyword filter checkboxes. you may now click label name as well for selection. also moved down the select button below Keywords header to uniform better with other filter options
|
2013-02-01 14:24:51 +01:00 |
|
Emil Siverhall
|
dcd74fed1f
|
made keyword filtering work properly on admin new idea pages
|
2013-02-01 14:16:29 +01:00 |
|
Emil Siverhall
|
73e7abf56a
|
moved the clear button on keyword filter panel inside the dialog instead
|
2013-02-01 14:10:00 +01:00 |
|
Emil Siverhall
|
4d865e94d8
|
Merge branch 'adminPopup' into develop
|
2013-02-01 11:38:57 +01:00 |
|
Emil Siverhall
|
3c8caec2c6
|
added some missing columns to the excel export on popup panel
|
2013-02-01 11:38:33 +01:00 |
|
Emil Siverhall
|
f855190ffe
|
added new overview datatable for admin match
|
2013-02-01 11:23:54 +01:00 |
|
Emil Siverhall
|
5c134cf0c5
|
page mount
|
2013-02-01 10:32:53 +01:00 |
|
Emil Siverhall
|
efaf05f1d3
|
new popup page for new idea administration
|
2013-02-01 10:32:37 +01:00 |
|
Emil Siverhall
|
2671fdd01d
|
renamed panel that is going to be used for popup page instead
|
2013-02-01 10:03:07 +01:00 |
|
Emil Siverhall
|
cc888e6762
|
Merge branch 'cleanup' into develop
|
2013-02-01 09:36:30 +01:00 |
|
Emil Siverhall
|
5924f4f8e2
|
removed start project link from supervisors idea page
|
2013-02-01 09:36:15 +01:00 |
|
Emil Siverhall
|
6f524c2369
|
removed some loggers from turnitincheckworker
|
2013-02-01 09:22:14 +01:00 |
|
Emil Siverhall
|
5b6a7ef275
|
Merge branch 'allSupervisorIdeas' into develop
|
2013-02-01 09:05:44 +01:00 |
|
Emil Siverhall
|
87eeae2aea
|
page mounting for new all supervisor ideas page
|
2013-02-01 09:03:00 +01:00 |
|
Emil Siverhall
|
4b759e4883
|
added link to new all supervisors page to idea start page
|
2013-02-01 08:59:43 +01:00 |
|
Emil Siverhall
|
e059bdfcd4
|
new page where supervisor can look at all supervisor ideas
|
2013-02-01 08:58:50 +01:00 |
|
Emil Siverhall
|
3b8fa4e44d
|
Merge branch 'matchFixes' into develop
|
2013-02-01 08:21:48 +01:00 |
|
Emil Siverhall
|
0a10e2170c
|
added title filtering to admin match
|
2013-02-01 08:21:25 +01:00 |
|
Emil Siverhall
|
d3f2d4d769
|
added filtering on completed ideas to supervisor idea start page
|
2013-02-01 08:18:45 +01:00 |
|
fred-fri
|
0218f12a1d
|
some cleanup
|
2013-02-01 16:17:04 +09:00 |
|
fred-fri
|
1be44d92a5
|
removed an identical component
|
2013-02-01 16:16:35 +09:00 |
|
fred-fri
|
5a4b6c327d
|
Merge branch 'release20130201'
20130201
|
2013-02-01 14:57:09 +09:00 |
|
fred-fri
|
103d3ca716
|
new db file
|
2013-02-01 14:56:49 +09:00 |
|
Emil Siverhall
|
c322c11c1e
|
Merge branch 'sysadminAnno' into develop
|
2013-02-01 06:40:27 +01:00 |
|
Emil Siverhall
|
66dbb4fb11
|
added sysadmin annotations to old idea pages
|
2013-02-01 06:40:09 +01:00 |
|
Emil Siverhall
|
ec299ebbb1
|
Merge branch 'languageFix' into develop
|
2013-02-01 06:34:23 +01:00 |
|
Emil Siverhall
|
31f3993424
|
removed language filter for now, since we don't have that info on all ideas
|
2013-02-01 06:33:53 +01:00 |
|
