Merge
This commit is contained in:
commit
df9864cb30
8 changed files with 7 additions and 8 deletions
|
@ -1,3 +1,2 @@
|
||||||
INSERT INTO `plugins` (`FileName`, `Name`, `Type`, `Owner`, `Permission`, `Status`, `Weight`, `Info`) VALUES
|
INSERT INTO `plugins` (`FileName`, `Name`, `Type`, `Owner`, `Permission`, `Status`, `Weight`, `Info`) VALUES
|
||||||
('Domain_Management', 'Domain_Management', 'Manual', '', 'admin', 1, 0, '{"PluginName":"Domain Management","Description":"Plug-in for Domain Management.","Version":"1.0.0","TemplatePath":"..\\/..\\/..\\/private_php\\/ams\\/plugins\\/Domain_Management\\/templates\\/index.tpl","Type":"Manual","":null}');
|
('Domain_Management', 'Domain_Management', 'Manual', '', 'admin', 1, 0, '{"PluginName":"Domain Management","Description":"Plug-in for Domain Management.","Version":"1.0.0","TemplatePath":"..\\/..\\/..\\/private_php\\/ams\\/plugins\\/Domain_Management\\/templates\\/index.tpl","Type":"Manual","":null}');
|
||||||
|
|
||||||
|
|
|
@ -1,3 +1,2 @@
|
||||||
ALTER TABLE `plugins` ADD UNIQUE(`Name`);
|
ALTER TABLE `plugins` ADD UNIQUE(`Name`);
|
||||||
UPDATE `plugins` SET `Info` = '{"PluginName":"Achievements","Description":"Returns the achievements of a user with respect to the character","Version":"1.0.0","TemplatePath":"..\\/..\\/..\\/private_php\\/ams\\/plugins\\/Achievements\\/templates\\/index.tpl","Type":"Manual","":null}' WHERE `Name` = 'Achievements';
|
UPDATE `plugins` SET `Info` = '{"PluginName":"Achievements","Description":"Returns the achievements of a user with respect to the character","Version":"1.0.0","TemplatePath":"..\\/..\\/..\\/private_php\\/ams\\/plugins\\/Achievements\\/templates\\/index.tpl","Type":"Manual","":null}' WHERE `Name` = 'Achievements';
|
||||||
|
|
||||||
|
|
1
code/web/private_php/setup/sql/nel_ams_lib_00005.sql
Normal file
1
code/web/private_php/setup/sql/nel_ams_lib_00005.sql
Normal file
|
@ -0,0 +1 @@
|
||||||
|
ALTER TABLE `ticket_attachments` DEFAULT CHARACTER SET utf8 COLLATE utf8_general_ci;
|
1
code/web/private_php/setup/sql/nel_tool_00002.sql
Normal file
1
code/web/private_php/setup/sql/nel_tool_00002.sql
Normal file
|
@ -0,0 +1 @@
|
||||||
|
UPDATE `neltool_notes` SET `note_user_id` = '1' WHERE `note_user_id` =27;
|
|
@ -11,8 +11,8 @@
|
||||||
define('NELTOOL_DBNAME', $cfg['db']['tool']['name']);
|
define('NELTOOL_DBNAME', $cfg['db']['tool']['name']);
|
||||||
|
|
||||||
// site paths definitions
|
// site paths definitions
|
||||||
define('NELTOOL_SITEBASE', $_SERVER['PHP_SELF']);
|
define('NELTOOL_SITEBASE', dirname($_SERVER['PHP_SELF']) .'/');
|
||||||
define('NELTOOL_SYSTEMBASE', dirname( dirname(__FILE__) ) . '/admin/');
|
define('NELTOOL_SYSTEMBASE', dirname(__FILE__) .'/');
|
||||||
define('NELTOOL_LOGBASE', NELTOOL_SYSTEMBASE .'/logs/');
|
define('NELTOOL_LOGBASE', NELTOOL_SYSTEMBASE .'/logs/');
|
||||||
define('NELTOOL_IMGBASE', NELTOOL_SYSTEMBASE .'/imgs/');
|
define('NELTOOL_IMGBASE', NELTOOL_SYSTEMBASE .'/imgs/');
|
||||||
|
|
||||||
|
|
|
@ -1,4 +1,3 @@
|
||||||
|
|
||||||
{include file="page_header.tpl"}
|
{include file="page_header.tpl"}
|
||||||
|
|
||||||
{literal}
|
{literal}
|
||||||
|
|
|
@ -2,11 +2,11 @@
|
||||||
|
|
||||||
// Service
|
// Service
|
||||||
$db_nel = 3;
|
$db_nel = 3;
|
||||||
$db_nel_tool = 1;
|
$db_nel_tool = 2;
|
||||||
|
|
||||||
// Support
|
// Support
|
||||||
$db_nel_ams = 1;
|
$db_nel_ams = 1;
|
||||||
$db_nel_ams_lib = 4;
|
$db_nel_ams_lib = 5;
|
||||||
|
|
||||||
// Domain
|
// Domain
|
||||||
$db_ring_domain = 1;
|
$db_ring_domain = 1;
|
||||||
|
|
|
@ -1,6 +1,6 @@
|
||||||
<?php
|
<?php
|
||||||
|
|
||||||
// Increment whenever a web upgrade is required.
|
// Increment whenever a web upgrade is required.
|
||||||
$NEL_SETUP_VERSION = 5;
|
$NEL_SETUP_VERSION = 6;
|
||||||
|
|
||||||
/* end of file */
|
/* end of file */
|
||||||
|
|
Loading…
Reference in a new issue