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
|
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 |
|
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 |
|