Peter M. Groen / knowledgetree

Commit ad3efa1491ed5a44bd7837ef7b1764f72fd914b4

Authored by Jarrett Jordaan
2 parents 64b31145 09a3275f

Merge branch 'edge' of git@github.com:ktgit/knowledgetree into edge

Inline Side-by-side
Showing 6 changed files with 11 additions and 9 deletions
.gitignore
  View file @ad3efa1
@@ -10,4 +10,5 @@ var/* @@ -10,4 +10,5 @@ var/*
10 plugins/commercial 10 plugins/commercial
11 clienttools/Karoo 11 clienttools/Karoo
12 clienttools/Office 12 clienttools/Office
13 -.gitmodules  
14 \ No newline at end of file 13 \ No newline at end of file
  14 +.gitmodules
  15 +*.out
docs/VERSION-NAME.txt
  View file @ad3efa1
1 -3.6.3 1 +3.7.0
docs/VERSION-OSS-DEV.txt
  View file @ad3efa1
1 -3.6.3 1 +3.7.0
docs/VERSION-OSS.txt
  View file @ad3efa1
1 -3.6.3 1 +3.7.0
docs/VERSION.txt
  View file @ad3efa1
1 -3.6.3 1 +3.7.0
sql/mysql/install/data.sql
  View file @ad3efa1
@@ -1460,8 +1460,8 @@ LOCK TABLES `system_settings` WRITE; @@ -1460,8 +1460,8 @@ LOCK TABLES `system_settings` WRITE;
1460 /*!40000 ALTER TABLE `system_settings` DISABLE KEYS */; 1460 /*!40000 ALTER TABLE `system_settings` DISABLE KEYS */;
1461 INSERT INTO `system_settings` VALUES 1461 INSERT INTO `system_settings` VALUES
1462 (1,'lastIndexUpdate','0'), 1462 (1,'lastIndexUpdate','0'),
1463 -(2,'knowledgeTreeVersion','3.6.3'),  
1464 -(3,'databaseVersion','3.6.3'), 1463 +(2,'knowledgeTreeVersion','3.7.0'),
  1464 +(3,'databaseVersion','3.7.0'),
1465 (4,'server_name','127.0.0.1'); 1465 (4,'server_name','127.0.0.1');
1466 /*!40000 ALTER TABLE `system_settings` ENABLE KEYS */; 1466 /*!40000 ALTER TABLE `system_settings` ENABLE KEYS */;
1467 UNLOCK TABLES; 1467 UNLOCK TABLES;
@@ -1763,7 +1763,8 @@ INSERT INTO `upgrades` VALUES @@ -1763,7 +1763,8 @@ INSERT INTO `upgrades` VALUES
1763 (222, 'sql*3.6.2*0*3.6.2/folders.sql', 'Folder created and modified timestamp fix','2009-05-01 00:00:00',1,'upgrade*3.6.2*99*upgrade3.6.2'), 1763 (222, 'sql*3.6.2*0*3.6.2/folders.sql', 'Folder created and modified timestamp fix','2009-05-01 00:00:00',1,'upgrade*3.6.2*99*upgrade3.6.2'),
1764 (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'), 1764 (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'),
1765 (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'), 1765 (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'),
1766 -(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'); 1766 +(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'),
  1767 +(226,'upgrade*3.7.0*99*upgrade3.7.0','Upgrade from version 3.6.3 to 3.7.0','2009-09-01 00:00:00',1,'upgrade*3.7.0*99*upgrade3.7.0');
1767 /*!40000 ALTER TABLE `upgrades` ENABLE KEYS */; 1768 /*!40000 ALTER TABLE `upgrades` ENABLE KEYS */;
1768 UNLOCK TABLES; 1769 UNLOCK TABLES;
1769 1770
@@ -2694,7 +2695,7 @@ UNLOCK TABLES; @@ -2694,7 +2695,7 @@ UNLOCK TABLES;
2694 LOCK TABLES `zseq_upgrades` WRITE; 2695 LOCK TABLES `zseq_upgrades` WRITE;
2695 /*!40000 ALTER TABLE `zseq_upgrades` DISABLE KEYS */; 2696 /*!40000 ALTER TABLE `zseq_upgrades` DISABLE KEYS */;
2696 INSERT INTO `zseq_upgrades` VALUES 2697 INSERT INTO `zseq_upgrades` VALUES
2697 -(225); 2698 +(226);
2698 /*!40000 ALTER TABLE `zseq_upgrades` ENABLE KEYS */; 2699 /*!40000 ALTER TABLE `zseq_upgrades` ENABLE KEYS */;
2699 UNLOCK TABLES; 2700 UNLOCK TABLES;
2700 2701