From 2406aad3a2269fefb2b80b5973e39da7e16bc509 Mon Sep 17 00:00:00 2001 From: Megan Watson Date: Thu, 12 Nov 2009 17:13:21 +0200 Subject: [PATCH] Changed the version name to 3.7.0-1 to better indicate the build number. --- docs/VERSION-NAME.txt | 2 +- docs/VERSION-OSS-DEV.txt | 2 +- docs/VERSION-OSS.txt | 2 +- docs/VERSION.txt | 2 +- sql/mysql/install/data.sql | 18 +++++++++--------- sql/mysql/upgrade/3.7.0-1/call_home_task.sql | 2 ++ sql/mysql/upgrade/3.7.0-1/config_settings.sql | 5 +++++ sql/mysql/upgrade/3.7.0-1/hide_zip_config.sql | 1 + sql/mysql/upgrade/3.7.0-1/mime_extractors_reset.sql | 1 + sql/mysql/upgrade/3.7.0-1/plugin_helper.sql | 1 + sql/mysql/upgrade/3.7.0-1/plugins_admin.sql | 2 ++ sql/mysql/upgrade/3.7.0.1/call_home_task.sql | 2 -- sql/mysql/upgrade/3.7.0.1/config_settings.sql | 5 ----- sql/mysql/upgrade/3.7.0.1/hide_zip_config.sql | 1 - sql/mysql/upgrade/3.7.0.1/mime_extractors_reset.sql | 1 - sql/mysql/upgrade/3.7.0.1/plugin_helper.sql | 1 - sql/mysql/upgrade/3.7.0.1/plugins_admin.sql | 2 -- 17 files changed, 25 insertions(+), 25 deletions(-) create mode 100644 sql/mysql/upgrade/3.7.0-1/call_home_task.sql create mode 100644 sql/mysql/upgrade/3.7.0-1/config_settings.sql create mode 100644 sql/mysql/upgrade/3.7.0-1/hide_zip_config.sql create mode 100644 sql/mysql/upgrade/3.7.0-1/mime_extractors_reset.sql create mode 100644 sql/mysql/upgrade/3.7.0-1/plugin_helper.sql create mode 100644 sql/mysql/upgrade/3.7.0-1/plugins_admin.sql delete mode 100644 sql/mysql/upgrade/3.7.0.1/call_home_task.sql delete mode 100644 sql/mysql/upgrade/3.7.0.1/config_settings.sql delete mode 100644 sql/mysql/upgrade/3.7.0.1/hide_zip_config.sql delete mode 100644 sql/mysql/upgrade/3.7.0.1/mime_extractors_reset.sql delete mode 100644 sql/mysql/upgrade/3.7.0.1/plugin_helper.sql delete mode 100644 sql/mysql/upgrade/3.7.0.1/plugins_admin.sql diff --git a/docs/VERSION-NAME.txt b/docs/VERSION-NAME.txt index 78d7503..fff6861 100644 --- a/docs/VERSION-NAME.txt +++ b/docs/VERSION-NAME.txt @@ -1 +1 @@ -3.7.0.1 \ No newline at end of file +3.7.0-1 \ No newline at end of file diff --git a/docs/VERSION-OSS-DEV.txt b/docs/VERSION-OSS-DEV.txt index 78d7503..fff6861 100644 --- a/docs/VERSION-OSS-DEV.txt +++ b/docs/VERSION-OSS-DEV.txt @@ -1 +1 @@ -3.7.0.1 \ No newline at end of file +3.7.0-1 \ No newline at end of file diff --git a/docs/VERSION-OSS.txt b/docs/VERSION-OSS.txt index 78d7503..fff6861 100644 --- a/docs/VERSION-OSS.txt +++ b/docs/VERSION-OSS.txt @@ -1 +1 @@ -3.7.0.1 \ No newline at end of file +3.7.0-1 \ No newline at end of file diff --git a/docs/VERSION.txt b/docs/VERSION.txt index 78d7503..fff6861 100644 --- a/docs/VERSION.txt +++ b/docs/VERSION.txt @@ -1 +1 @@ -3.7.0.1 \ No newline at end of file +3.7.0-1 \ No newline at end of file diff --git a/sql/mysql/install/data.sql b/sql/mysql/install/data.sql index 7c05b41..29d8e6c 100755 --- a/sql/mysql/install/data.sql +++ b/sql/mysql/install/data.sql @@ -1463,8 +1463,8 @@ LOCK TABLES `system_settings` WRITE; /*!40000 ALTER TABLE `system_settings` DISABLE KEYS */; INSERT INTO `system_settings` VALUES (1,'lastIndexUpdate','0'), -(2,'knowledgeTreeVersion','3.7.0.1'), -(3,'databaseVersion','3.7.0.1'), +(2,'knowledgeTreeVersion','3.7.0-1'), +(3,'databaseVersion','3.7.0-1'), (4,'server_name','127.0.0.1'); /*!40000 ALTER TABLE `system_settings` ENABLE KEYS */; UNLOCK TABLES; @@ -1767,13 +1767,13 @@ INSERT INTO `upgrades` VALUES (223, 'sql*3.6.2*0*3.6.2/data_types.sql', 'Add large text and date fields','2009-05-01 00:00:00',1,'upgrade*3.6.2*99*upgrade3.6.2'), (224,'upgrade*3.6.2*99*upgrade3.6.2','Upgrade from version 3.6.1 to 3.6.2','2009-05-01 00:00:00',1,'upgrade*3.6.2*99*upgrade3.6.2'), (225,'upgrade*3.6.3*99*upgrade3.6.3','Upgrade from version 3.6.2 to 3.6.3','2009-06-01 00:00:00',1,'upgrade*3.6.3*99*upgrade3.6.3'), -(226,'sql*3.7.0.1*0*3.7.0.1/plugins_admin.sql','Database upgrade to version 3.7.0.1: Plugins admin','2009-09-01 00:00:00',1,'upgrade*3.7.0.1*99*upgrade3.7.0.1'), -(227,'sql*3.7.0.1*0*3.7.0.1/config_settings.sql','Database upgrade to version 3.7.0.1: Config settings','2009-09-01 00:00:00',1,'upgrade*3.7.0.1*99*upgrade3.7.0.1'), -(228,'sql*3.7.0.1*0*3.7.0.1/plugin_helper.sql','Database upgrade to version 3.7.0.1: Plugin helper','2009-09-01 00:00:00',1,'upgrade*3.7.0.1*99*upgrade3.7.0.1'), -(229,'sql*3.7.0.1*0*3.7.0.1/call_home_task.sql','Database upgrade to version 3.7.0.1: Call home task','2009-09-01 00:00:00',1,'upgrade*3.7.0.1*99*upgrade3.7.0.1'), -(230,'sql*3.7.0.1*0*3.7.0.1/hide_zip_config.sql','Database upgrade to version 3.7.0.1: Hide zip config','2009-09-01 00:00:00',1,'upgrade*3.7.0.1*99*upgrade3.7.0.1'), -(231,'sql*3.7.0.1*0*3.7.0.1/mime_extractors_reset.sql','Database upgrade to version 3.7.0.1: Mime extractors reset','2009-09-01 00:00:00',1,'upgrade*3.7.0.1*99*upgrade3.7.0.1'), -(232,'upgrade*3.7.0.1.1*99*upgrade3.7.0.1','Upgrade from version 3.6.3 to 3.7.0.1','2009-09-01 00:00:00',1,'upgrade*3.7.0.1*99*upgrade3.7.0.1'); +(226,'sql*3.7.0-1*0*3.7.0-1/plugins_admin.sql','Database upgrade to version 3.7.0-1: Plugins admin','2009-09-01 00:00:00',1,'upgrade*3.7.0-1*99*upgrade3.7.0-1'), +(227,'sql*3.7.0-1*0*3.7.0-1/config_settings.sql','Database upgrade to version 3.7.0-1: Config settings','2009-09-01 00:00:00',1,'upgrade*3.7.0-1*99*upgrade3.7.0-1'), +(228,'sql*3.7.0-1*0*3.7.0-1/plugin_helper.sql','Database upgrade to version 3.7.0-1: Plugin helper','2009-09-01 00:00:00',1,'upgrade*3.7.0-1*99*upgrade3.7.0-1'), +(229,'sql*3.7.0-1*0*3.7.0-1/call_home_task.sql','Database upgrade to version 3.7.0-1: Call home task','2009-09-01 00:00:00',1,'upgrade*3.7.0-1*99*upgrade3.7.0-1'), +(230,'sql*3.7.0-1*0*3.7.0-1/hide_zip_config.sql','Database upgrade to version 3.7.0-1: Hide zip config','2009-09-01 00:00:00',1,'upgrade*3.7.0-1*99*upgrade3.7.0-1'), +(231,'sql*3.7.0-1*0*3.7.0-1/mime_extractors_reset.sql','Database upgrade to version 3.7.0-1: Mime extractors reset','2009-09-01 00:00:00',1,'upgrade*3.7.0-1*99*upgrade3.7.0-1'), +(232,'upgrade*3.7.0-1*99*upgrade3.7.0-1','Upgrade from version 3.6.3 to 3.7.0-1','2009-09-01 00:00:00',1,'upgrade*3.7.0-1*99*upgrade3.7.0-1'); /*!40000 ALTER TABLE `upgrades` ENABLE KEYS */; UNLOCK TABLES; diff --git a/sql/mysql/upgrade/3.7.0-1/call_home_task.sql b/sql/mysql/upgrade/3.7.0-1/call_home_task.sql new file mode 100644 index 0000000..0ba0234 --- /dev/null +++ b/sql/mysql/upgrade/3.7.0-1/call_home_task.sql @@ -0,0 +1,2 @@ +INSERT INTO `scheduler_tasks` (task, script_url, frequency, run_time, status) +VALUES ('Call Home','bin/system_info.php','daily','2009-10-01','system'); \ No newline at end of file diff --git a/sql/mysql/upgrade/3.7.0-1/config_settings.sql b/sql/mysql/upgrade/3.7.0-1/config_settings.sql new file mode 100644 index 0000000..0bba239 --- /dev/null +++ b/sql/mysql/upgrade/3.7.0-1/config_settings.sql @@ -0,0 +1,5 @@ +INSERT INTO `config_settings` (group_name, display_name, description, item, value, default_value, type, options, can_edit) +VALUES ('urls', 'Internal Var Directory', 'The path to the internal var directory that must sit within the web root', 'internalVarDirectory', 'default', '${fileSystemRoot}/var', 'string', NULL, 0); + +INSERT INTO `config_settings` (group_name, display_name, description, item, value, default_value, type, options, can_edit) +VALUES ('externalBinary', 'convert', 'The path to the ImageMagick "convert" binary', 'convertPath', 'default', 'convert', 'string', NULL, 1); \ No newline at end of file diff --git a/sql/mysql/upgrade/3.7.0-1/hide_zip_config.sql b/sql/mysql/upgrade/3.7.0-1/hide_zip_config.sql new file mode 100644 index 0000000..27abae2 --- /dev/null +++ b/sql/mysql/upgrade/3.7.0-1/hide_zip_config.sql @@ -0,0 +1 @@ +UPDATE config_settings SET value = 'true', default_value = 'true', can_edit = 0 WHERE item = 'useBinary' AND group_name = 'export'; \ No newline at end of file diff --git a/sql/mysql/upgrade/3.7.0-1/mime_extractors_reset.sql b/sql/mysql/upgrade/3.7.0-1/mime_extractors_reset.sql new file mode 100644 index 0000000..9e81e6d --- /dev/null +++ b/sql/mysql/upgrade/3.7.0-1/mime_extractors_reset.sql @@ -0,0 +1 @@ +UPDATE system_settings SET value = 0 WHERE name = 'mimeTypesRegistered'; \ No newline at end of file diff --git a/sql/mysql/upgrade/3.7.0-1/plugin_helper.sql b/sql/mysql/upgrade/3.7.0-1/plugin_helper.sql new file mode 100644 index 0000000..469e624 --- /dev/null +++ b/sql/mysql/upgrade/3.7.0-1/plugin_helper.sql @@ -0,0 +1 @@ +ALTER TABLE `plugin_helper` CHANGE `viewtype` `viewtype` ENUM( 'general', 'dashboard', 'plugin', 'folder', 'document', 'admindispatcher', 'dispatcher', 'process' ) CHARACTER SET utf8 COLLATE utf8_general_ci NOT NULL DEFAULT 'general' \ No newline at end of file diff --git a/sql/mysql/upgrade/3.7.0-1/plugins_admin.sql b/sql/mysql/upgrade/3.7.0-1/plugins_admin.sql new file mode 100644 index 0000000..7782f08 --- /dev/null +++ b/sql/mysql/upgrade/3.7.0-1/plugins_admin.sql @@ -0,0 +1,2 @@ +ALTER TABLE `plugins` ADD COLUMN `list_admin` INTEGER NOT NULL DEFAULT 1 AFTER `orderby`; +UPDATE plugins set list_admin = 0 WHERE namespace in ('ktcore.plugin', 'inet.multiselect.lookupvalue.plugin', 'ktcore.language.plugin'); \ No newline at end of file diff --git a/sql/mysql/upgrade/3.7.0.1/call_home_task.sql b/sql/mysql/upgrade/3.7.0.1/call_home_task.sql deleted file mode 100644 index 0ba0234..0000000 --- a/sql/mysql/upgrade/3.7.0.1/call_home_task.sql +++ /dev/null @@ -1,2 +0,0 @@ -INSERT INTO `scheduler_tasks` (task, script_url, frequency, run_time, status) -VALUES ('Call Home','bin/system_info.php','daily','2009-10-01','system'); \ No newline at end of file diff --git a/sql/mysql/upgrade/3.7.0.1/config_settings.sql b/sql/mysql/upgrade/3.7.0.1/config_settings.sql deleted file mode 100644 index 0bba239..0000000 --- a/sql/mysql/upgrade/3.7.0.1/config_settings.sql +++ /dev/null @@ -1,5 +0,0 @@ -INSERT INTO `config_settings` (group_name, display_name, description, item, value, default_value, type, options, can_edit) -VALUES ('urls', 'Internal Var Directory', 'The path to the internal var directory that must sit within the web root', 'internalVarDirectory', 'default', '${fileSystemRoot}/var', 'string', NULL, 0); - -INSERT INTO `config_settings` (group_name, display_name, description, item, value, default_value, type, options, can_edit) -VALUES ('externalBinary', 'convert', 'The path to the ImageMagick "convert" binary', 'convertPath', 'default', 'convert', 'string', NULL, 1); \ No newline at end of file diff --git a/sql/mysql/upgrade/3.7.0.1/hide_zip_config.sql b/sql/mysql/upgrade/3.7.0.1/hide_zip_config.sql deleted file mode 100644 index 27abae2..0000000 --- a/sql/mysql/upgrade/3.7.0.1/hide_zip_config.sql +++ /dev/null @@ -1 +0,0 @@ -UPDATE config_settings SET value = 'true', default_value = 'true', can_edit = 0 WHERE item = 'useBinary' AND group_name = 'export'; \ No newline at end of file diff --git a/sql/mysql/upgrade/3.7.0.1/mime_extractors_reset.sql b/sql/mysql/upgrade/3.7.0.1/mime_extractors_reset.sql deleted file mode 100644 index 9e81e6d..0000000 --- a/sql/mysql/upgrade/3.7.0.1/mime_extractors_reset.sql +++ /dev/null @@ -1 +0,0 @@ -UPDATE system_settings SET value = 0 WHERE name = 'mimeTypesRegistered'; \ No newline at end of file diff --git a/sql/mysql/upgrade/3.7.0.1/plugin_helper.sql b/sql/mysql/upgrade/3.7.0.1/plugin_helper.sql deleted file mode 100644 index 469e624..0000000 --- a/sql/mysql/upgrade/3.7.0.1/plugin_helper.sql +++ /dev/null @@ -1 +0,0 @@ -ALTER TABLE `plugin_helper` CHANGE `viewtype` `viewtype` ENUM( 'general', 'dashboard', 'plugin', 'folder', 'document', 'admindispatcher', 'dispatcher', 'process' ) CHARACTER SET utf8 COLLATE utf8_general_ci NOT NULL DEFAULT 'general' \ No newline at end of file diff --git a/sql/mysql/upgrade/3.7.0.1/plugins_admin.sql b/sql/mysql/upgrade/3.7.0.1/plugins_admin.sql deleted file mode 100644 index 7782f08..0000000 --- a/sql/mysql/upgrade/3.7.0.1/plugins_admin.sql +++ /dev/null @@ -1,2 +0,0 @@ -ALTER TABLE `plugins` ADD COLUMN `list_admin` INTEGER NOT NULL DEFAULT 1 AFTER `orderby`; -UPDATE plugins set list_admin = 0 WHERE namespace in ('ktcore.plugin', 'inet.multiselect.lookupvalue.plugin', 'ktcore.language.plugin'); \ No newline at end of file -- libgit2 0.21.4