Home Explore Help
Register Sign In
Omnimaga
/
SMF2.1
mirror of [email protected]:Omnimaga/SMF2.1.git
2
0
Fork 0
Files Issues 0 Wiki
Browse Source

Merge pull request #713 from Arantor/release-2.1

A few miscellaneous bits and pieces, nothing exciting
Arantor 10 years ago
parent
24f3247c28 4799df97b3
commit
5497ec1fb8
9 changed files with 15 additions and 7 deletions
Split View Show Diff Stats
  1. 1 1
      Themes/default/languages/Admin.english.php
  2. 4 3
      contributors.txt
  3. 2 1
      other/install_2-1_mysql.sql
  4. 1 0
      other/install_2-1_postgresql.sql
  5. 1 0
      other/install_2-1_sqlite.sql
  6. 1 0
      other/install_2-1_sqlite3.sql
  7. 2 1
      other/upgrade_2-0_mysql.sql
  8. 1 0
      other/upgrade_2-0_postgresql.sql
  9. 2 1
      other/upgrade_2-0_sqlite.sql

+ 1 - 1
Themes/default/languages/Admin.english.php
View File 

@@ -6,7 +6,7 @@ global $settings, $scripturl;
 
 $txt['forum_in_maintainence'] = 'Your forum is in Maintenance Mode. Only administrators can currently log in.';
 
 $txt['maintenance_page'] = 'You can turn off Maintenance Mode from the <a href="%1$s">Server Settings</a> area.';
 
 
-$txt['admin_boards'] = 'Boards';
 
+$txt['admin_boards'] = 'Boards and Categories';
 
 $txt['admin_users'] = 'Members';
 
 $txt['admin_newsletters'] = 'Newsletters';
 
 $txt['admin_edit_news'] = 'News';

+ 4 - 3
contributors.txt
View File 

@@ -55,6 +55,7 @@ Third Party Software and Graphics;
 
 Graphics
 
 Fugue Icons | © 2012 Yusuke Kamiyamane | These icons are licensed under a Creative Commons Attribution 3.0 License
 
 Oxygen Icons | These icons are licensed under CC BY-SA 3.0
 
+Crystal Project Icons | These icons are licensed under the GNU Lesser General Public Licence
 
 
 Software
 
 JQuery | © John Resig | Licensed under The MIT License (MIT)
 
@@ -64,9 +65,9 @@ SCEditor | © Sam Clarke | Licensed under The MIT License (MIT)
 
 animaDrag | © Abel Mohler | Licensed under The MIT License (MIT)
 
 
 Fonts
 
-Anonymous Pro |© 2009 | This font is licensed under the SIL Open Font License, Version 1.1
 
-ConsolaMono |© 2012 | This font is licensed under the SIL Open Font License, Version 1.1
 
-Phennig |© 2009-2012 | This font is licensed under the SIL Open Font License, Version 1.1
 
+Anonymous Pro | © 2009 | This font is licensed under the SIL Open Font License, Version 1.1
 
+ConsolaMono | © 2012 | This font is licensed under the SIL Open Font License, Version 1.1
 
+Phennig | © 2009-2012 | This font is licensed under the SIL Open Font License, Version 1.1

+ 2 - 1
other/install_2-1_mysql.sql
View File 

@@ -1968,7 +1968,8 @@ VALUES (1, 'Google', 'googlebot', ''),
 
 	(16, 'InternetArchive', 'ia_archiver-web.archive.org', ''),
 
 	(17, 'Alexa', 'ia_archiver', ''),
 
 	(18, 'Omgili', 'omgilibot', ''),
 
-	(19, 'EntireWeb', 'Speedy Spider', '');
 
+	(19, 'EntireWeb', 'Speedy Spider', ''),
 
+	(20, 'Yandex', 'yandex', '');
 
 
 #
 
 # Table structure for table `subscriptions`

+ 1 - 0
other/install_2-1_postgresql.sql
View File 

@@ -2477,6 +2477,7 @@ INSERT INTO {$db_prefix}spiders (id_spider, spider_name, user_agent, ip_info) VA
 
 INSERT INTO {$db_prefix}spiders (id_spider, spider_name, user_agent, ip_info) VALUES (17, 'Alexa', 'ia_archiver', '');
 
 INSERT INTO {$db_prefix}spiders (id_spider, spider_name, user_agent, ip_info) VALUES (18, 'Omgili', 'omgilibot', '');
 
 INSERT INTO {$db_prefix}spiders (id_spider, spider_name, user_agent, ip_info) VALUES (19, 'EntireWeb', 'Speedy Spider', '');
 
+INSERT INTO {$db_prefix}spiders (id_spider, spider_name, user_agent, ip_info) VALUES (20, 'Yandex', 'yandex', '');
 
 
 #
 
 # Sequence for table `subscriptions`

+ 1 - 0
other/install_2-1_sqlite.sql
View File 

@@ -2116,6 +2116,7 @@ INSERT INTO {$db_prefix}spiders (id_spider, spider_name, user_agent, ip_info) VA
 
 INSERT INTO {$db_prefix}spiders (id_spider, spider_name, user_agent, ip_info) VALUES (17, 'Alexa', 'ia_archiver', '');
 
 INSERT INTO {$db_prefix}spiders (id_spider, spider_name, user_agent, ip_info) VALUES (18, 'Omgili', 'omgilibot', '');
 
 INSERT INTO {$db_prefix}spiders (id_spider, spider_name, user_agent, ip_info) VALUES (19, 'EntireWeb', 'Speedy Spider', '');
 
+INSERT INTO {$db_prefix}spiders (id_spider, spider_name, user_agent, ip_info) VALUES (20, 'Yandex', 'yandex', '');
 
 
 #
 
 # Table structure for table `subscriptions`

+ 1 - 0
other/install_2-1_sqlite3.sql
View File 

@@ -2116,6 +2116,7 @@ INSERT INTO {$db_prefix}spiders (id_spider, spider_name, user_agent, ip_info) VA
 
 INSERT INTO {$db_prefix}spiders (id_spider, spider_name, user_agent, ip_info) VALUES (17, 'Alexa', 'ia_archiver', '');
 
 INSERT INTO {$db_prefix}spiders (id_spider, spider_name, user_agent, ip_info) VALUES (18, 'Omgili', 'omgilibot', '');
 
 INSERT INTO {$db_prefix}spiders (id_spider, spider_name, user_agent, ip_info) VALUES (19, 'EntireWeb', 'Speedy Spider', '');
 
+INSERT INTO {$db_prefix}spiders (id_spider, spider_name, user_agent, ip_info) VALUES (20, 'Yandex', 'yandex', '');
 
 
 #
 
 # Table structure for table `subscriptions`

+ 2 - 1
other/upgrade_2-0_mysql.sql
View File 

@@ -476,7 +476,8 @@ VALUES
 
 	(16, 'InternetArchive', 'ia_archiver-web.archive.org', ''),
 
 	(17, 'Alexa', 'ia_archiver', ''),
 
 	(18, 'Omgili', 'omgilibot', ''),
 
-	(19, 'EntireWeb', 'Speedy Spider', '');
 
+	(19, 'EntireWeb', 'Speedy Spider', ''),
 
+	(20, 'Yandex', 'yandex', '');
 
 ---#
 
 
 ---# Removing a spider.

+ 1 - 0
other/upgrade_2-0_postgresql.sql
View File 

@@ -158,6 +158,7 @@ INSERT INTO {$db_prefix}spiders	(id_spider, spider_name, user_agent, ip_info) VA
 
 INSERT INTO {$db_prefix}spiders	(id_spider, spider_name, user_agent, ip_info) VALUES (17, 'Alexa', 'ia_archiver', '');
 
 INSERT INTO {$db_prefix}spiders	(id_spider, spider_name, user_agent, ip_info) VALUES (18, 'Omgili', 'omgilibot', '');
 
 INSERT INTO {$db_prefix}spiders	(id_spider, spider_name, user_agent, ip_info) VALUES (19, 'EntireWeb', 'Speedy Spider', '');
 
+INSERT INTO {$db_prefix}spiders (id_spider, spider_name, user_agent, ip_info) VALUES (20, 'Yandex', 'yandex', '');
 
 ---#
 
 
 ---# Removing a spider.

+ 2 - 1
other/upgrade_2-0_sqlite.sql
View File 

@@ -114,7 +114,8 @@ $smcFunc['db_insert']('ignore',
 
 		array(16, 'InternetArchive', 'ia_archiver-web.archive.org', ''),
 
 		array(17, 'Alexa', 'ia_archiver', ''),
 
 		array(18, 'Omgili', 'omgilibot', ''),
 
-		array(19, 'EntireWeb', 'Speedy Spider', '')
 
+		array(19, 'EntireWeb', 'Speedy Spider', ''),
 
+		array(20, 'Yandex', 'yandex', '')
 
 	),
 
 	array('user_agent')
 
 );