Update of /cvsroot/tikiwiki/tiki/db In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv14997 Modified Files: tiki-1.10-mysql.sql tiki-1.10-mysqli.sql tiki-1.10-oci8.sql tiki-1.10-pgsql.sql tiki-1.10-sqlite.sql tiki-1.10-sybase.sql Log Message: db sync Index: tiki-1.10-mysql.sql =================================================================== RCS file: /cvsroot/tikiwiki/tiki/db/tiki-1.10-mysql.sql,v retrieving revision 1.60 retrieving revision 1.61 diff -u -d -r1.60 -r1.61 --- tiki-1.10-mysql.sql 26 Jul 2007 14:11:12 -0000 1.60 +++ tiki-1.10-mysql.sql 3 Aug 2007 18:03:25 -0000 1.61 @@ -4469,6 +4469,8 @@ INSERT INTO tiki_quicktags (taglabel, taginsert, tagicon, tagcategory) VALUES ('colored text','~~#FF0000:text~~','pics/icons/palette.png','wiki'); INSERT INTO tiki_quicktags (taglabel, taginsert, tagicon, tagcategory) VALUES ('dynamic variable','%text%','pics/icons/book_open.png','wiki'); INSERT INTO tiki_quicktags (taglabel, taginsert, tagicon, tagcategory) VALUES ('image','{img src= width= height= align= desc= link= }','pics/icons/picture.png','wiki'); +INSERT INTO tikii_quicktags (taglabel, taginsert, tagicon, tagcategory) VALUES ('list bullets', '*text', 'pics/icons/text_list_bullets.png', 'wiki'); +INSERT INTO tikii_quicktags (taglabel, taginsert, tagicon, tagcategory) VALUES ('list numbers', '#text', 'pics/icons/text_list_numbers.png', 'wiki'); # maps INSERT INTO tiki_quicktags (taglabel, taginsert, tagicon, tagcategory) VALUES ('New wms Metadata','METADATA\r\n \"wms_name\" \"myname\"\r\n "wms_srs" "EPSG:4326"\r\n "wms_server_version" " "\r\n "wms_layers" "mylayers"\r\n "wms_request" "myrequest"\r\n "wms_format" " "\r\n "wms_time" " "\r\n END', 'pics/icons/tag_blue_add.png','maps'); @@ -4488,7 +4490,7 @@ INSERT INTO tiki_quicktags (taglabel, taginsert, tagicon, tagcategory) VALUES ('bold','__text__','pics/icons/text_bold.png','newsletters'); INSERT INTO tiki_quicktags (taglabel, taginsert, tagicon, tagcategory) VALUES ('italic','\'\'text\'\'','pics/icons/text_italic.png','newsletters'); INSERT INTO tiki_quicktags (taglabel, taginsert, tagicon, tagcategory) VALUES ('underline','===text===','pics/icons/text_underline.png','newsletters'); -INSERT INTO tiki_quicktags (taglabel, taginsert, tagicon, tagcategory) VALUES ('external link','[http://example.com|text]','pics/icons/world_link.png','newsletters'); +INSERT INTO tiki_quicktags (taglabel, taginsert, tagicon, tagcategory) VALUES ('external link','[http://example.com|text|nocache]','pics/icons/world_link.png','newsletters'); INSERT INTO tiki_quicktags (taglabel, taginsert, tagicon, tagcategory) VALUES ('heading1','!text','pics/icons/text_heading_1.png','newsletters'); INSERT INTO tiki_quicktags (taglabel, taginsert, tagicon, tagcategory) VALUES ('heading2','!!text','pics/icons/text_heading_2.png','newsletters'); INSERT INTO tiki_quicktags (taglabel, taginsert, tagicon, tagcategory) VALUES ('heading3','!!!text','pics/icons/text_heading_3.png','newsletters'); @@ -4873,7 +4875,7 @@ CREATE TABLE `tiki_webmail_contacts_ext` ( `contactId` int(11) NOT NULL, `fieldId` int(10) unsigned NOT NULL, - `value` varchar(256) NOT NULL, + `value` varchar(255) NOT NULL, `hidden` tinyint(1) NOT NULL, KEY `contactId` (`contactId`) ) ENGINE=MyISAM; @@ -4882,7 +4884,7 @@ CREATE TABLE `tiki_webmail_contacts_fields` ( `fieldId` int(10) unsigned NOT NULL auto_increment, `user` VARCHAR( 200 ) NOT NULL , - `fieldname` VARCHAR( 256 ) NOT NULL , + `fieldname` VARCHAR( 255 ) NOT NULL , `order` int(2) NOT NULL default '0', `show` char(1) NOT NULL default 'n', PRIMARY KEY ( `fieldId` ), Index: tiki-1.10-mysqli.sql =================================================================== RCS file: /cvsroot/tikiwiki/tiki/db/tiki-1.10-mysqli.sql,v retrieving revision 1.7 retrieving revision 1.8 diff -u -d -r1.7 -r1.8 --- tiki-1.10-mysqli.sql 26 Jul 2007 14:11:12 -0000 1.7 +++ tiki-1.10-mysqli.sql 3 Aug 2007 18:03:25 -0000 1.8 @@ -4469,6 +4469,8 @@ INSERT INTO tiki_quicktags (taglabel, taginsert, tagicon, tagcategory) VALUES ('colored text','~~#FF0000:text~~','pics/icons/palette.png','wiki'); INSERT INTO tiki_quicktags (taglabel, taginsert, tagicon, tagcategory) VALUES ('dynamic variable','%text%','pics/icons/book_open.png','wiki'); INSERT INTO tiki_quicktags (taglabel, taginsert, tagicon, tagcategory) VALUES ('image','{img src= width= height= align= desc= link= }','pics/icons/picture.png','wiki'); +INSERT INTO tikii_quicktags (taglabel, taginsert, tagicon, tagcategory) VALUES ('list bullets', '*text', 'pics/icons/text_list_bullets.png', 'wiki'); +INSERT INTO tikii_quicktags (taglabel, taginsert, tagicon, tagcategory) VALUES ('list numbers', '#text', 'pics/icons/text_list_numbers.png', 'wiki'); # maps INSERT INTO tiki_quicktags (taglabel, taginsert, tagicon, tagcategory) VALUES ('New wms Metadata','METADATA\r\n \"wms_name\" \"myname\"\r\n "wms_srs" "EPSG:4326"\r\n "wms_server_version" " "\r\n "wms_layers" "mylayers"\r\n "wms_request" "myrequest"\r\n "wms_format" " "\r\n "wms_time" " "\r\n END', 'pics/icons/tag_blue_add.png','maps'); @@ -4488,7 +4490,7 @@ INSERT INTO tiki_quicktags (taglabel, taginsert, tagicon, tagcategory) VALUES ('bold','__text__','pics/icons/text_bold.png','newsletters'); INSERT INTO tiki_quicktags (taglabel, taginsert, tagicon, tagcategory) VALUES ('italic','\'\'text\'\'','pics/icons/text_italic.png','newsletters'); INSERT INTO tiki_quicktags (taglabel, taginsert, tagicon, tagcategory) VALUES ('underline','===text===','pics/icons/text_underline.png','newsletters'); -INSERT INTO tiki_quicktags (taglabel, taginsert, tagicon, tagcategory) VALUES ('external link','[http://example.com|text]','pics/icons/world_link.png','newsletters'); +INSERT INTO tiki_quicktags (taglabel, taginsert, tagicon, tagcategory) VALUES ('external link','[http://example.com|text|nocache]','pics/icons/world_link.png','newsletters'); INSERT INTO tiki_quicktags (taglabel, taginsert, tagicon, tagcategory) VALUES ('heading1','!text','pics/icons/text_heading_1.png','newsletters'); INSERT INTO tiki_quicktags (taglabel, taginsert, tagicon, tagcategory) VALUES ('heading2','!!text','pics/icons/text_heading_2.png','newsletters'); INSERT INTO tiki_quicktags (taglabel, taginsert, tagicon, tagcategory) VALUES ('heading3','!!!text','pics/icons/text_heading_3.png','newsletters'); @@ -4873,7 +4875,7 @@ CREATE TABLE `tiki_webmail_contacts_ext` ( `contactId` int(11) NOT NULL, `fieldId` int(10) unsigned NOT NULL, - `value` varchar(256) NOT NULL, + `value` varchar(255) NOT NULL, `hidden` tinyint(1) NOT NULL, KEY `contactId` (`contactId`) ) ENGINE=MyISAM; @@ -4882,7 +4884,7 @@ CREATE TABLE `tiki_webmail_contacts_fields` ( `fieldId` int(10) unsigned NOT NULL auto_increment, `user` VARCHAR( 200 ) NOT NULL , - `fieldname` VARCHAR( 256 ) NOT NULL , + `fieldname` VARCHAR( 255 ) NOT NULL , `order` int(2) NOT NULL default '0', `show` char(1) NOT NULL default 'n', PRIMARY KEY ( `fieldId` ), Index: tiki-1.10-oci8.sql =================================================================== RCS file: /cvsroot/tikiwiki/tiki/db/tiki-1.10-oci8.sql,v retrieving revision 1.50 retrieving revision 1.51 diff -u -d -r1.50 -r1.51 --- tiki-1.10-oci8.sql 26 Jul 2007 14:11:13 -0000 1.50 +++ tiki-1.10-oci8.sql 3 Aug 2007 18:03:25 -0000 1.51 @@ -5561,6 +5561,10 @@ INSERT INTO "tiki_quicktags" ("taglabel","taginsert","tagicon","tagcategory") VALUES ('image','{img src= width= height= align= desc= link= }','pics/icons/picture.png','wiki'); +INSERT INTO "tikii_quicktags" ("taglabel","taginsert","tagicon","tagcategory") VALUES ('list bullets', '*text', 'pics/icons/text_list_bullets.png', 'wiki'); + +INSERT INTO "tikii_quicktags" ("taglabel","taginsert","tagicon","tagcategory") VALUES ('list numbers', '--text', 'pics/icons/text_list_numbers.png', 'wiki'); + -- maps INSERT INTO "tiki_quicktags" ("taglabel","taginsert","tagicon","tagcategory") VALUES ('New wms Metadata','METADATA\r\n \"wms_name\" \"myname\"\r\n "wms_srs" "EPSG:4326"\r\n "wms_server_version" " "\r\n "wms_layers" "mylayers"\r\n "wms_request" "myrequest"\r\n "wms_format" " "\r\n "wms_time" " "\r\n END', 'pics/icons/tag_blue_add.png','maps'); @@ -5595,7 +5599,7 @@ INSERT INTO "tiki_quicktags" ("taglabel","taginsert","tagicon","tagcategory") VALUES ('underline','===text===','pics/icons/text_underline.png','newsletters'); -INSERT INTO "tiki_quicktags" ("taglabel","taginsert","tagicon","tagcategory") VALUES ('external link','[http://example.com|text]','pics/icons/world_link.png','newsletters'); +INSERT INTO "tiki_quicktags" ("taglabel","taginsert","tagicon","tagcategory") VALUES ('external link','[http://example.com|text|nocache]','pics/icons/world_link.png','newsletters'); INSERT INTO "tiki_quicktags" ("taglabel","taginsert","tagicon","tagcategory") VALUES ('heading1','!text','pics/icons/text_heading_1.png','newsletters'); @@ -6218,7 +6222,7 @@ CREATE TABLE `tiki_webmail_contacts_ext` ( `contactId` number(11) NOT NULL, `fieldId` number(10) NOT NULL, - `value` varchar(256) NOT NULL, + `value` varchar(255) NOT NULL, `hidden` number(1) NOT NULL, KEY `contactId` (`contactId`) ) ENGINE=MyISAM; @@ -6229,7 +6233,7 @@ CREATE TABLE `tiki_webmail_contacts_fields` ( `fieldId` number(10) NOT NULL auto_increment, `user` VARCHAR( 200 ) NOT NULL , - `fieldname` VARCHAR( 256 ) NOT NULL , + `fieldname` VARCHAR( 255 ) NOT NULL , `order` number(2) default '0' NOT NULL, `show` char(1) default 'n' NOT NULL, PRIMARY KEY ( `fieldId` ), Index: tiki-1.10-pgsql.sql =================================================================== RCS file: /cvsroot/tikiwiki/tiki/db/tiki-1.10-pgsql.sql,v retrieving revision 1.50 retrieving revision 1.51 diff -u -d -r1.50 -r1.51 --- tiki-1.10-pgsql.sql 26 Jul 2007 14:11:13 -0000 1.50 +++ tiki-1.10-pgsql.sql 3 Aug 2007 18:03:25 -0000 1.51 @@ -5273,6 +5273,10 @@ INSERT INTO "tiki_quicktags" ("taglabel","taginsert","tagicon","tagcategory") VALUES ('image','{img src= width= height= align= desc= link= }','pics/icons/picture.png','wiki'); +INSERT INTO "tikii_quicktags" ("taglabel","taginsert","tagicon","tagcategory") VALUES ('list bullets', '*text', 'pics/icons/text_list_bullets.png', 'wiki'); + +INSERT INTO "tikii_quicktags" ("taglabel","taginsert","tagicon","tagcategory") VALUES ('list numbers', '--text', 'pics/icons/text_list_numbers.png', 'wiki'); + -- maps INSERT INTO "tiki_quicktags" ("taglabel","taginsert","tagicon","tagcategory") VALUES ('New wms Metadata','METADATA\r\n \"wms_name\" \"myname\"\r\n "wms_srs" "EPSG:4326"\r\n "wms_server_version" " "\r\n "wms_layers" "mylayers"\r\n "wms_request" "myrequest"\r\n "wms_format" " "\r\n "wms_time" " "\r\n END', 'pics/icons/tag_blue_add.png','maps'); @@ -5307,7 +5311,7 @@ INSERT INTO "tiki_quicktags" ("taglabel","taginsert","tagicon","tagcategory") VALUES ('underline','===text===','pics/icons/text_underline.png','newsletters'); -INSERT INTO "tiki_quicktags" ("taglabel","taginsert","tagicon","tagcategory") VALUES ('external link','[http://example.com|text]','pics/icons/world_link.png','newsletters'); +INSERT INTO "tiki_quicktags" ("taglabel","taginsert","tagicon","tagcategory") VALUES ('external link','[http://example.com|text|nocache]','pics/icons/world_link.png','newsletters'); INSERT INTO "tiki_quicktags" ("taglabel","taginsert","tagicon","tagcategory") VALUES ('heading1','!text','pics/icons/text_heading_1.png','newsletters'); @@ -5913,7 +5917,7 @@ CREATE TABLE "tiki_webmail_contacts_ext" ( "contactId" bigint NOT NULL, "fieldId" bigint NOT NULL, - "value" varchar(256) NOT NULL, + "value" varchar(255) NOT NULL, "hidden" smallint NOT NULL ) ENGINE=MyISAM; @@ -5924,7 +5928,7 @@ CREATE TABLE "tiki_webmail_contacts_fields" ( "fieldId" bigserial, "user" VARCHAR( 200 ) NOT NULL , - "fieldname" VARCHAR( 256 ) NOT NULL , + "fieldname" VARCHAR( 255 ) NOT NULL , "order" smallint NOT NULL default '0', "show" char(1) NOT NULL default 'n', PRIMARY KEY ("fieldId"), Index: tiki-1.10-sqlite.sql =================================================================== RCS file: /cvsroot/tikiwiki/tiki/db/tiki-1.10-sqlite.sql,v retrieving revision 1.50 retrieving revision 1.51 diff -u -d -r1.50 -r1.51 --- tiki-1.10-sqlite.sql 26 Jul 2007 14:11:13 -0000 1.50 +++ tiki-1.10-sqlite.sql 3 Aug 2007 18:03:25 -0000 1.51 @@ -5284,6 +5284,10 @@ INSERT INTO "tiki_quicktags" ("taglabel","taginsert","tagicon","tagcategory") VALUES ('image','{img src= width= height= align= desc= link= }','pics/icons/picture.png','wiki'); +INSERT INTO "tikii_quicktags" ("taglabel","taginsert","tagicon","tagcategory") VALUES ('list bullets', '*text', 'pics/icons/text_list_bullets.png', 'wiki'); + +INSERT INTO "tikii_quicktags" ("taglabel","taginsert","tagicon","tagcategory") VALUES ('list numbers', '--text', 'pics/icons/text_list_numbers.png', 'wiki'); + -- maps INSERT INTO "tiki_quicktags" ("taglabel","taginsert","tagicon","tagcategory") VALUES ('New wms Metadata','METADATA\r\n \"wms_name\" \"myname\"\r\n "wms_srs" "EPSG:4326"\r\n "wms_server_version" " "\r\n "wms_layers" "mylayers"\r\n "wms_request" "myrequest"\r\n "wms_format" " "\r\n "wms_time" " "\r\n END', 'pics/icons/tag_blue_add.png','maps'); @@ -5318,7 +5322,7 @@ INSERT INTO "tiki_quicktags" ("taglabel","taginsert","tagicon","tagcategory") VALUES ('underline','===text===','pics/icons/text_underline.png','newsletters'); -INSERT INTO "tiki_quicktags" ("taglabel","taginsert","tagicon","tagcategory") VALUES ('external link','[http://example.com|text]','pics/icons/world_link.png','newsletters'); +INSERT INTO "tiki_quicktags" ("taglabel","taginsert","tagicon","tagcategory") VALUES ('external link','[http://example.com|text|nocache]','pics/icons/world_link.png','newsletters'); INSERT INTO "tiki_quicktags" ("taglabel","taginsert","tagicon","tagcategory") VALUES ('heading1','!text','pics/icons/text_heading_1.png','newsletters'); @@ -5924,7 +5928,7 @@ CREATE TABLE tiki_webmail_contacts_ext ( contactId bigint NOT NULL, fieldId bigint unsigned NOT NULL, - value varchar(256) NOT NULL, + value varchar(255) NOT NULL, hidden smallint NOT NULL, KEY contactId (contactId) ) ENGINE=MyISAM; @@ -5935,7 +5939,7 @@ CREATE TABLE tiki_webmail_contacts_fields ( fieldId INTEGER, user VARCHAR( 200 ) NOT NULL , - fieldname VARCHAR( 256 ) NOT NULL , + fieldname VARCHAR( 255 ) NOT NULL , order smallint NOT NULL default '0', show char(1) NOT NULL default 'n', PRIMARY KEY ( fieldId ), Index: tiki-1.10-sybase.sql =================================================================== RCS file: /cvsroot/tikiwiki/tiki/db/tiki-1.10-sybase.sql,v retrieving revision 1.49 retrieving revision 1.50 diff -u -d -r1.49 -r1.50 --- tiki-1.10-sybase.sql 26 Jul 2007 14:11:14 -0000 1.49 +++ tiki-1.10-sybase.sql 3 Aug 2007 18:03:25 -0000 1.50 @@ -7018,6 +7018,14 @@ go +INSERT INTO "tikii_quicktags" ("taglabel","taginsert","tagicon","tagcategory") VALUES ('list bullets', '*text', 'pics/icons/text_list_bullets.png', 'wiki') +go + + +INSERT INTO "tikii_quicktags" ("taglabel","taginsert","tagicon","tagcategory") VALUES ('list numbers', '--text', 'pics/icons/text_list_numbers.png', 'wiki') +go + + -- maps INSERT INTO "tiki_quicktags" ("taglabel","taginsert","tagicon","tagcategory") VALUES ('New wms Metadata','METADATA\r\n \"wms_name\" \"myname\"\r\n "wms_srs" "EPSG:4326"\r\n "wms_server_version" " "\r\n "wms_layers" "mylayers"\r\n "wms_request" "myrequest"\r\n "wms_format" " "\r\n "wms_time" " "\r\n END', 'pics/icons/tag_blue_add.png','maps') @@ -7082,7 +7090,7 @@ go -INSERT INTO "tiki_quicktags" ("taglabel","taginsert","tagicon","tagcategory") VALUES ('external link','[http://example.com|text]','pics/icons/world_link.png','newsletters') +INSERT INTO "tiki_quicktags" ("taglabel","taginsert","tagicon","tagcategory") VALUES ('external link','[http://example.com|text|nocache]','pics/icons/world_link.png','newsletters') go @@ -8132,7 +8140,7 @@ CREATE TABLE `tiki_webmail_contacts_ext` ( `contactId` numeric(11,0) NOT NULL, `fieldId` numeric(10,0) NOT NULL, - `value` varchar(256) NOT NULL, + `value` varchar(255) NOT NULL, `hidden` numeric(1,0) NOT NULL, KEY `contactId` (`contactId`) ) ENGINE=MyISAM @@ -8147,7 +8155,7 @@ CREATE TABLE `tiki_webmail_contacts_fields` ( `fieldId numeric(10 ,0) identity, `user` VARCHAR( 200 ) NOT NULL , - `fieldname` VARCHAR( 256 ) NOT NULL , + `fieldname` VARCHAR( 255 ) NOT NULL , `order` numeric(2,0) default '0' NOT NULL, `show` char(1) default 'n' NOT NULL, PRIMARY KEY ( `fieldId` ), |