Commit Graph

5335 Commits

Author SHA1 Message Date
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
Emil Siverhall
9b93a2d1c1 added confirmation dialog when admins activate/inactivate keywords 2012-09-26 21:49:29 +02:00
fred-fri
44899889ba Merge branch 'develop' of ssh://git.dsv.su.se/git/scipro/scipro into develop 2012-09-26 19:28:24 +09:00
fred-fri
92a6a76027 new admin all final seminars panel finished 2012-09-26 19:27:50 +09:00
fred-fri
41841a2b51 lots of stuff 2012-09-26 13:17:07 +09:00
Emil Siverhall
be7fe813a5 Merge branch 'firstMeetingStudents' into develop 2012-09-25 14:31:36 +02:00
Emil Siverhall
68e3bff0ef changes to current.sql 2012-09-25 14:31:25 +02:00
Emil Siverhall
702885a4d0 added first meeting column to student idea datatable in supervisor view 2012-09-25 14:30:05 +02:00
Emil Siverhall
c2d3fdea43 added components to add first meeting to project ideas submitted by students 2012-09-25 14:30:03 +02:00
Emil Siverhall
8d500cca26 new domain object for student idea first meetings 2012-09-25 14:30:01 +02:00
Emil Siverhall
6d5cefc39b added new serviceclasses for student idea first meetings 2012-09-25 14:29:59 +02:00
fred-fri
f376867254 removed old panel 2012-09-25 14:49:43 +09:00
fred-fri
c36f4e5348 fixed deletion 2012-09-25 14:46:10 +09:00
fred-fri
76a9819a4f almost finished, just deletion left 2012-09-25 13:53:56 +09:00
fred-fri
cb6b5ba7a2 modified datecolumn and created new application periods panel 2012-09-25 13:35:09 +09:00
fred-fri
53d8ed3eba renamed create project start project 2012-09-25 12:29:46 +09:00
fred-fri
da58c1cad2 Merge branch 'hidden' into develop 2012-09-25 12:22:18 +09:00
fred-fri
bb16cd4bac removed test on hidden logic 2012-09-25 12:22:12 +09:00
fred-fri
2b6362fb91 removed test on hidden logic 2012-09-25 12:22:03 +09:00
fred-fri
72629a25d5 removed hidden logic and code 2012-09-25 12:16:45 +09:00
Emil Siverhall
87f6cfee9d Merge branch 'resetAjax' into develop 2012-09-24 12:50:23 +02:00
Emil Siverhall
445f3d99e1 changes to reloading of page when new count date is set. page is now reloading to display correct date in datatable 2012-09-24 12:49:44 +02:00
fred-fri
a5a88dad1e removed hidden logic and code 2012-09-24 16:38:12 +09:00
fred-fri
12ab19555f cleanup 2012-09-24 16:35:15 +09:00
fred-fri
f449a5e6b3 removed hidden stuff 2012-09-24 16:32:38 +09:00
fred-fri
8fa358d175 Merge branch 'develop' of ssh://git.dsv.su.se/git/scipro/scipro into develop 2012-09-24 16:28:08 +09:00
fred-fri
799d5b52ed added research areas and keywords to view all available supervisor project ideas in student view 2012-09-24 16:26:56 +09:00
Emil Siverhall
24a429ee8c Merge branch 'exceptionFix' into develop 2012-09-24 08:44:43 +02:00
Emil Siverhall
9840ea8ea9 changed order of validation when checking to see if idea is exportable or not. 2012-09-24 08:43:54 +02:00
fred-fri
84e4b41bf2 fixed markup bug 2012-09-24 15:33:33 +09:00
fred-fri
fd1fcc0e1b added columns to all available project ideas 2012-09-24 15:09:04 +09:00
fred-fri
3b21427f4f added info links for unlcear supervisor idea form stuff 2012-09-24 13:54:26 +09:00
fred-fri
c6e15adc5f added help link to prerequisites 2012-09-24 13:38:26 +09:00
fred-fri
333945f4f8 restructured dialog 2012-09-24 13:26:18 +09:00
fred-fri
b6feaf206e added dialog 2012-09-24 13:14:42 +09:00
fred-fri
a0a9a97f3c restructured the form a bit 2012-09-24 12:49:06 +09:00