Commit eee7525a7550fc31561cc5ae1945c6034045ab21

Authored by Paul Barrett
2 parents 3bcb6f7a 5f1bd74f

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

docs/VERSION-NAME.txt
1   -3.7.0.3
2 1 \ No newline at end of file
  2 +3.7.0.4
3 3 \ No newline at end of file
... ...
docs/VERSION-OSS-DEV.txt
1   -3.7.0.3
2 1 \ No newline at end of file
  2 +3.7.0.4
3 3 \ No newline at end of file
... ...
docs/VERSION-OSS.txt
1   -3.7.0.3
2 1 \ No newline at end of file
  2 +3.7.0.4
3 3 \ No newline at end of file
... ...
docs/VERSION.txt
1   -3.7.0.3
2 1 \ No newline at end of file
  2 +3.7.0.4
3 3 \ No newline at end of file
... ...
sql/mysql/install/data.sql
... ... @@ -1497,8 +1497,8 @@ LOCK TABLES `system_settings` WRITE;
1497 1497 /*!40000 ALTER TABLE `system_settings` DISABLE KEYS */;
1498 1498 INSERT INTO `system_settings` VALUES
1499 1499 (1,'lastIndexUpdate','0'),
1500   -(2,'knowledgeTreeVersion','3.7.0.3'),
1501   -(3,'databaseVersion','3.7.0.3'),
  1500 +(2,'knowledgeTreeVersion','3.7.0.4'),
  1501 +(3,'databaseVersion','3.7.0.4'),
1502 1502 (4,'server_name','127.0.0.1');
1503 1503 /*!40000 ALTER TABLE `system_settings` ENABLE KEYS */;
1504 1504 UNLOCK TABLES;
... ... @@ -1814,7 +1814,9 @@ INSERT INTO `upgrades` VALUES
1814 1814 (236,'sql*3.7.0.3*0*3.7.0.3/uploaded_files.sql','Database upgrade to version 3.7.0.3: Uploaded Files','2009-12-10 00:00:00',1,'upgrade*3.7.0.3*99*upgrade3.7.0.3'),
1815 1815 (237,'sql*3.7.0.3*0*3.7.0.3/active_sessions_ip.sql','Database upgrade to version 3.7.0.3: Active Sessions Ip','2009-12-10 00:00:00',1,'upgrade*3.7.0.3*99*upgrade3.7.0.3'),
1816 1816 (238,'sql*3.7.0.3*0*3.7.0.3/download_queue_zip.sql','Database upgrade to version 3.7.0.3: Download Queue Zip','2009-12-10 00:00:00',1,'upgrade*3.7.0.3*99*upgrade3.7.0.3'),
1817   -(239,'upgrade*3.7.0.3*99*upgrade3.7.0.3','Upgrade from version 3.7.0.2 to 3.7.0.3','2009-12-14 00:00:00',1,'upgrade*3.7.0.3*99*upgrade3.7.0.3');
  1817 +(239,'upgrade*3.7.0.3*99*upgrade3.7.0.3','Upgrade from version 3.7.0.2 to 3.7.0.3','2009-12-14 00:00:00',1,'upgrade*3.7.0.3*99*upgrade3.7.0.3'),
  1818 +(240,'sql*3.7.0.4*0*3.7.0.4/download_files.sql','Database upgrade to version 3.7.0.4: Download Files','2010-02-19 00:00:00',1,'upgrade*3.7.0.4*99*upgrade3.7.0.4'),
  1819 +(241,'upgrade*3.7.0.4*99*upgrade3.7.0.4','Upgrade from version 3.7.0.3 to 3.7.0.4','2010-02-19 00:00:00',1,'upgrade*3.7.0.4*99*upgrade3.7.0.4');
1818 1820 /*!40000 ALTER TABLE `upgrades` ENABLE KEYS */;
1819 1821 UNLOCK TABLES;
1820 1822  
... ...