Skip to content

Commit

Permalink
Add SQL alter, update d3 and review PR - refs BT#9068
Browse files Browse the repository at this point in the history
  • Loading branch information
ywarnier committed Feb 10, 2015
1 parent 1a181ed commit bdddf08
Show file tree
Hide file tree
Showing 11 changed files with 822 additions and 543 deletions.
2 changes: 1 addition & 1 deletion main/admin/skills_wheel.php
Expand Up @@ -20,7 +20,7 @@
}

//Adds the JS needed to use the jqgrid
$htmlHeadXtra[] = api_get_js('d3/d3.v2.min.js');
$htmlHeadXtra[] = api_get_js('d3/d3.v3.5.4.min.js');
$htmlHeadXtra[] = api_get_js('d3/colorbrewer.js');
$htmlHeadXtra[] = api_get_js('d3/jquery.xcolor.js');

Expand Down
Binary file removed main/img/icon_start.png
Binary file not shown.
1 change: 1 addition & 0 deletions main/inc/lib/add_course.lib.inc.php
Expand Up @@ -1759,6 +1759,7 @@ function create_course_tables($course_db_name = null) {
show_form_profile int NOT NULL default 0,
form_fields TEXT NOT NULL,
session_id int unsigned NOT NULL default 0,
visible_results int unsigned DEFAULT 0,
PRIMARY KEY (c_id, survey_id)
)" . $charset_clause;
$result = Database::query($sql);
Expand Down
26 changes: 26 additions & 0 deletions main/inc/lib/javascript/d3/d3.LICENSE
@@ -0,0 +1,26 @@
Copyright (c) 2010-2015, Michael Bostock
All rights reserved.

Redistribution and use in source and binary forms, with or without
modification, are permitted provided that the following conditions are met:

* Redistributions of source code must retain the above copyright notice, this
list of conditions and the following disclaimer.

* Redistributions in binary form must reproduce the above copyright notice,
this list of conditions and the following disclaimer in the documentation
and/or other materials provided with the distribution.

* The name Michael Bostock may not be used to endorse or promote products
derived from this software without specific prior written permission.

THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
DISCLAIMED. IN NO EVENT SHALL MICHAEL BOSTOCK BE LIABLE FOR ANY DIRECT,
INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY
OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE,
EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
4 changes: 0 additions & 4 deletions main/inc/lib/javascript/d3/d3.v2.min.js

This file was deleted.

0 comments on commit bdddf08

Please sign in to comment.