fred-fri
|
40cc910147
|
added row coloring
|
2012-10-05 16:37:28 +09:00 |
|
Emil Siverhall
|
ab1a108bef
|
Merge branch 'historyOnPopUpPage' into develop
|
2012-10-04 10:22:31 +02:00 |
|
Emil Siverhall
|
0fc26cd8f2
|
added dialog with idea info when clicking title of student idea on the popup page. match history available here as well
|
2012-10-04 10:22:08 +02:00 |
|
Emil Siverhall
|
61e64687ac
|
Merge branch 'ideaBug' into develop
|
2012-10-04 09:37:43 +02:00 |
|
Emil Siverhall
|
0273ec12db
|
fixed bug that made level filtering bug out the datatable with supervisor ideas to choose from for students
|
2012-10-04 09:37:23 +02:00 |
|
fred-fri
|
afba788abb
|
added info about levels and languages to some pages
|
2012-10-04 12:53:30 +09:00 |
|
Emil Siverhall
|
b5998866e0
|
Merge branch 'studentIdeaMatchHistory' into develop
|
2012-10-03 22:40:12 +02:00 |
|
Emil Siverhall
|
40906ee1fb
|
added match history tab to edit dialog as well on student idea datatable in admin - match
|
2012-10-03 22:36:50 +02:00 |
|
Emil Siverhall
|
8cf705f72c
|
supervisor name is now displayed correctly in match history
|
2012-10-03 22:02:41 +02:00 |
|
Emil Siverhall
|
59a3c768ec
|
added new match history panel to and refactor of student idea details popup at admin - match - student project ideas
|
2012-10-03 21:55:02 +02:00 |
|
Emil Siverhall
|
ef8c5ced9a
|
added new match service methods to retrieve match history from a student idea
|
2012-10-03 21:54:05 +02:00 |
|
Emil Siverhall
|
55ac04ffed
|
Merge branch 'statusRename' into develop
|
2012-10-03 09:16:49 +02:00 |
|
Emil Siverhall
|
fd7981f919
|
changes to name of idea statuses
|
2012-10-03 09:16:33 +02:00 |
|
Emil Siverhall
|
da2e52a03f
|
Merge branch 'firstMeetingTime' into develop
|
2012-10-03 08:30:06 +02:00 |
|
Emil Siverhall
|
adbad045c1
|
same changes to student submitted ideas
|
2012-10-03 08:29:40 +02:00 |
|
Emil Siverhall
|
f98212d276
|
added possibility to add which time of the day the first meeting is to supervisor ideas
|
2012-10-03 08:29:03 +02:00 |
|
Emil Siverhall
|
a7209d7e51
|
Merge branch 'columnNameFix' into develop
|
2012-10-02 20:01:46 +02:00 |
|
Emil Siverhall
|
944a1c6b99
|
application period datatable had two edit columns instead of edit/delete
|
2012-10-02 20:01:34 +02:00 |
|
Emil Siverhall
|
3917c083c4
|
Merge branch 'exemptions' into develop
|
2012-10-02 19:23:02 +02:00 |
|
Emil Siverhall
|
03a6ee1934
|
admins may also add one student to bachelors if exemption is granted
|
2012-10-02 14:56:26 +02:00 |
|
Emil Siverhall
|
503aa1a1be
|
students with exemption does not need to add a bachelor partner when selecting supervisor ideas
|
2012-10-02 14:44:31 +02:00 |
|
Emil Siverhall
|
2afbe78ded
|
supervisors may now add only one author to a bachelor idea if student has been granted an exemption
|
2012-10-02 14:28:55 +02:00 |
|
Emil Siverhall
|
75571ce46f
|
added new repo and services for student exemptions
|
2012-10-02 13:51:13 +02:00 |
|
Emil Siverhall
|
fe8d10f56f
|
Merge branch 'assignStudentsWithoutAppPeriod' into develop
|
2012-10-02 13:25:32 +02:00 |
|
Emil Siverhall
|
81e311154f
|
refactor of when admins adding students to supervisor ideas. now it's possible to add students without an open application period. a future period is still needed
|
2012-10-02 13:19:56 +02:00 |
|
fred-fri
|
4a3d657e92
|
fixed dialect bug
|
2012-10-02 16:31:08 +09:00 |
|
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 |
|
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 |
|