firstgarden/firstgarden-web-gnu
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Activity

g5 merge 충돌수정

Browse Source
This commit is contained in:
chicpro
2014-04-10 17:25:42 +09:00
parent 4340f6ad72 e28584cef7
commit 64e3027fbf
11 changed files with 15 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
install/gnuboard5.sql
View File

@ -43,7 +43,6 @@ CREATE TABLE IF NOT EXISTS `g5_board` (
`bo_download_point` int(11) NOT NULL DEFAULT '0',
`bo_use_category` tinyint(4) NOT NULL DEFAULT '0',
`bo_category_list` text NOT NULL,
`bo_disable_tags` text NOT NULL,
`bo_use_sideview` tinyint(4) NOT NULL DEFAULT '0',
`bo_use_file_content` tinyint(4) NOT NULL DEFAULT '0',
`bo_use_secret` tinyint(4) NOT NULL DEFAULT '0',
@ -67,8 +66,6 @@ CREATE TABLE IF NOT EXISTS `g5_board` (
`bo_image_width` int(11) NOT NULL DEFAULT '0',
`bo_skin` varchar(255) NOT NULL DEFAULT '',
`bo_mobile_skin` varchar(255) NOT NULL DEFAULT '',
`bo_image_head` varchar(255) NOT NULL DEFAULT '',
`bo_image_tail` varchar(255) NOT NULL DEFAULT '',
`bo_include_head` varchar(255) NOT NULL DEFAULT '',
`bo_include_tail` varchar(255) NOT NULL DEFAULT '',
`bo_content_head` text NOT NULL,
@ -196,14 +193,12 @@ CREATE TABLE IF NOT EXISTS `g5_config` (
`cf_add_script` text NOT NULL,
`cf_use_point` tinyint(4) NOT NULL DEFAULT '0',
`cf_point_term` int(11) NOT NULL DEFAULT '0',
`cf_use_norobot` tinyint(4) NOT NULL DEFAULT '0',
`cf_use_copy_log` tinyint(4) NOT NULL DEFAULT '0',
`cf_use_email_certify` tinyint(4) NOT NULL DEFAULT '0',
`cf_login_point` int(11) NOT NULL DEFAULT '0',
`cf_cut_name` tinyint(4) NOT NULL DEFAULT '0',
`cf_nick_modify` int(11) NOT NULL DEFAULT '0',
`cf_new_skin` varchar(255) NOT NULL DEFAULT '',
`cf_login_skin` varchar(255) NOT NULL DEFAULT '',
`cf_new_rows` int(11) NOT NULL DEFAULT '0',
`cf_search_skin` varchar(255) NOT NULL DEFAULT '',
`cf_connect_skin` varchar(255) NOT NULL DEFAULT '',
@ -211,7 +206,6 @@ CREATE TABLE IF NOT EXISTS `g5_config` (
`cf_write_point` int(11) NOT NULL DEFAULT '0',
`cf_comment_point` int(11) NOT NULL DEFAULT '0',
`cf_download_point` int(11) NOT NULL DEFAULT '0',
`cf_search_bgcolor` varchar(255) NOT NULL DEFAULT '',
`cf_search_color` varchar(255) NOT NULL DEFAULT '',
`cf_write_pages` int(11) NOT NULL DEFAULT '0',
`cf_mobile_pages` int(11) NOT NULL DEFAULT '0',
@ -222,7 +216,6 @@ CREATE TABLE IF NOT EXISTS `g5_config` (
`cf_intercept_ip` text NOT NULL,
`cf_analytics` text NOT NULL,
`cf_add_meta` text NOT NULL,
`cf_register_skin` varchar(255) NOT NULL DEFAULT 'basic',
`cf_member_skin` varchar(255) NOT NULL DEFAULT '',
`cf_use_homepage` tinyint(4) NOT NULL DEFAULT '0',
`cf_req_homepage` tinyint(4) NOT NULL DEFAULT '0',
@ -258,7 +251,6 @@ CREATE TABLE IF NOT EXISTS `g5_config` (
`cf_memo_del` int(11) NOT NULL DEFAULT '0',
`cf_visit_del` int(11) NOT NULL DEFAULT '0',
`cf_popular_del` int(11) NOT NULL DEFAULT '0',
`cf_use_jumin` tinyint(4) NOT NULL DEFAULT '0',
`cf_use_member_icon` tinyint(4) NOT NULL DEFAULT '0',
`cf_member_icon_size` int(11) NOT NULL DEFAULT '0',
`cf_member_icon_width` int(11) NOT NULL DEFAULT '0',
@ -442,10 +434,7 @@ CREATE TABLE IF NOT EXISTS `g5_member` (
`mb_nick_date` date NOT NULL default '0000-00-00',
`mb_email` varchar(255) NOT NULL default '',
`mb_homepage` varchar(255) NOT NULL default '',
`mb_password_q` varchar(255) NOT NULL default '',
`mb_password_a` varchar(255) NOT NULL default '',
`mb_level` tinyint(4) NOT NULL default '0',
`mb_jumin` varchar(255) NOT NULL default '',
`mb_sex` char(1) NOT NULL default '',
`mb_birth` varchar(255) NOT NULL default '',
`mb_tel` varchar(255) NOT NULL default '',