Emil Siverhall
|
a9de588321
|
supervisors may now add students to ideas without an open application period. an upcoming period with the same project class is still needed
|
2012-10-01 14:21:19 +02:00 |
|
Emil Siverhall
|
9937c59213
|
Merge branch 'statusFilter' into develop
|
2012-10-01 11:28:51 +02:00 |
|
Emil Siverhall
|
3d67c100f6
|
added filtering on status to admin - supervisor project ideas
|
2012-10-01 11:28:37 +02:00 |
|
Emil Siverhall
|
a497cc5240
|
Merge branch 'watsinException' into develop
|
2012-10-01 08:45:17 +02:00 |
|
Emil Siverhall
|
e2bcb151b0
|
fixed bug that caused internal error when editing watson boxes as a student. also added check to not open watson dialog if watson boxes already are filled in
|
2012-10-01 08:44:25 +02:00 |
|
fred-fri
|
270d57776e
|
added confimations to participate and oppose links
|
2012-10-01 15:29:27 +09:00 |
|
fred-fri
|
622a03bcc2
|
added research area filter to view available supervisor project ideas
|
2012-10-01 12:48:57 +09:00 |
|
fred-fri
|
a7f7e0f3f5
|
added research area filter but not hooked
|
2012-10-01 12:27:33 +09:00 |
|
fred-fri
|
7147547489
|
added keywords column to all supervisor project ideas panel
|
2012-10-01 12:08:53 +09:00 |
|
fred-fri
|
f052b299c5
|
added hr for better separation
|
2012-10-01 12:06:21 +09:00 |
|
fred-fri
|
47186ad2e1
|
added research area columna and hooked the filter
|
2012-10-01 11:59:39 +09:00 |
|
fred-fri
|
c08a890af2
|
added research area filter gui to view all supervisor project ideas panel (not hooked to service though)
|
2012-10-01 11:56:51 +09:00 |
|
fred-fri
|
faa73e957f
|
dialog is now as big as it needs to be
|
2012-10-01 11:44:56 +09:00 |
|
fred-fri
|
3186597bdc
|
Merge branch 'develop' of ssh://git.dsv.su.se/git/scipro/scipro into develop
|
2012-10-01 11:38:21 +09:00 |
|
fred-fri
|
78f78d7855
|
removed faulty info
|
2012-10-01 11:37:52 +09:00 |
|
Emil Siverhall
|
6a796091b8
|
Merge branch 'sortOrder' into develop
|
2012-09-28 11:40:15 +02:00 |
|
Emil Siverhall
|
63d2140122
|
changed sort direction to show newest on top at admin supervisor idea crud panel
|
2012-09-28 11:39:56 +02:00 |
|
Emil Siverhall
|
cb1a88da0e
|
Merge branch 'allStudentIdeasFiltering' into develop
|
2012-09-28 11:29:14 +02:00 |
|
Emil Siverhall
|
9d1d13c38b
|
added filtering on research areas as well
|
2012-09-28 11:28:39 +02:00 |
|
Emil Siverhall
|
423e32248f
|
added filtering on project level when selecting between student ideas as a supervisor
|
2012-09-28 11:24:04 +02:00 |
|
ranil
|
effbe86e7c
|
remind message textarea added to the match settings page
|
2012-09-28 10:41:30 +02:00 |
|
Emil Siverhall
|
75d2993dc8
|
Merge branch 'allSupervisorIdeasCountBug' into develop
|
2012-09-28 10:12:11 +02:00 |
|
Emil Siverhall
|
0f717477d6
|
override of getSize on all available supervisor ideas to make count work properly
|
2012-09-28 10:11:50 +02:00 |
|
Emil Siverhall
|
4d2ea6b293
|
Merge branch 'popupPage' into develop
|
2012-09-28 09:43:43 +02:00 |
|
Emil Siverhall
|
b4465d2a9a
|
added filtering on idea status to popup page, and added role authorization to make page only visible to admins or sysadminds
|
2012-09-28 09:43:00 +02:00 |
|
Emil Siverhall
|
31175c643e
|
increased max width of datatable in the custom css class
|
2012-09-28 09:42:58 +02:00 |
|
Emil Siverhall
|
0ecac6745a
|
added link to new popup page on admin - match - student project ideas
|
2012-09-28 09:42:56 +02:00 |
|
Emil Siverhall
|
8b780ab030
|
mounted page url to new popup page
|
2012-09-28 09:42:54 +02:00 |
|
Emil Siverhall
|
bcb0a7f43d
|
restructured popup page and added custom css class for popup
|
2012-09-28 09:42:52 +02:00 |
|
Emil Siverhall
|
3911f472df
|
started working on link to popuppage with custom css style
|
2012-09-28 09:42:50 +02:00 |
|
Emil Siverhall
|
f4b795284d
|
added filtering by title, supervisor, date created, unit and research areas
|
2012-09-28 09:42:47 +02:00 |
|
Emil Siverhall
|
5f5eb4d50b
|
new panel with a lot of columns in the datatable to use on a new popup style page
|
2012-09-28 09:42:45 +02:00 |
|
fred-fri
|
b25fa31791
|
new db file
20120928
|
2012-09-28 15:54:20 +09:00 |
|
fred-fri
|
ffc22124cc
|
fixed admin all final seminars count bug
|
2012-09-28 15:43:21 +09:00 |
|
fred-fri
|
4ccc070e71
|
added hr
|
2012-09-28 15:37:38 +09:00 |
|
fred-fri
|
17d543f331
|
fixed confusing setvisible rules
|
2012-09-28 15:24:46 +09:00 |
|
fred-fri
|
546d08f858
|
fixed my selected supervisor provided ideas count bug
|
2012-09-28 15:18:44 +09:00 |
|
Emil Siverhall
|
c8dc063fc5
|
Merge branch 'partnerFix' into develop
|
2012-09-27 15:52:33 +02:00 |
|
Emil Siverhall
|
9094a502cf
|
changes to partner addition panel to make the displayed name switch correctly if the partner of the submitting author wants to edit the idea
|
2012-09-27 15:52:08 +02:00 |
|
Emil Siverhall
|
671e391ede
|
Merge branch 'editStudentIdea' into develop
|
2012-09-27 14:58:24 +02:00 |
|
Emil Siverhall
|
ad91b3573a
|
made sure that keywords is still selected when editing submitted student idea
|
2012-09-27 14:57:44 +02:00 |
|
Emil Siverhall
|
7424a98019
|
only check if partner participating on another idea if it is a new idea. otherwise validation fails since the partner participating on the current indea
|
2012-09-27 14:13:14 +02:00 |
|
Emil Siverhall
|
4b24ec2cd2
|
Merge branch 'submissionBug' into develop
|
2012-09-27 13:25:09 +02:00 |
|
Emil Siverhall
|
a72fa34922
|
changes to make new ideas editable as well when submitting student ideas
|
2012-09-27 13:24:50 +02:00 |
|
fred-fri
|
38772666f2
|
added deletion of project ideas
|
2012-09-27 18:05:47 +09:00 |
|
fred-fri
|
bd7fcbd1a8
|
editing of project ideas allowed under certain circumstances
|
2012-09-27 18:01:00 +09:00 |
|
fred-fri
|
a17b760250
|
fixed typo in current
|
2012-09-27 13:56:20 +09:00 |
|
Emil Siverhall
|
feff919ff7
|
Merge branch 'partnerSelectionBug' into develop
|
2012-09-26 22:32:35 +02:00 |
|
Emil Siverhall
|
1ee621f673
|
made sure partner addition panel is visible when switching between master/bachelor on student idea submission panel
|
2012-09-26 22:31:56 +02:00 |
|
Emil Siverhall
|
31c8bb43d6
|
Merge branch 'keywordConfirmation' into develop
|
2012-09-26 21:49:58 +02:00 |
|