Merge branch 'release/0.5.6'

ta2edchimp · Jan 27, 2016 · bf39395 · bf39395
2 parents 9c8ed52 + 1d79801
commit bf39395
Show file tree

Hide file tree

Showing 7 changed files with 34 additions and 22 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,11 @@
+# Release 0.5.6
+
+- 019bfa7 Versionbump.
+- 10f8e09 Database update for Frostline.
+- c7ba7ad Fixed miscalculated efficiency in description meta.
+- a9b972c Included a note on theming until v1.0
+- cf0bdff Merge branch 'release/0.5.5' into develop
+
 # Release 0.5.5
 
 - a72e7e2 Versionbump.

diff --git a/README.md b/README.md
@@ -158,6 +158,9 @@ To change the theme used by BattleReporter, just edit the following lines within
 define('BR_THEME', 'default'); // Change 'default' to your theme's folder name
 ```
 
+**Note**  
+Please note, that some placeholder names, structural makeup of objects passed to the templates, the default theme's directory structure, etc. may change until the release of a 1.x version.
+
 ## Contributing
 
 Please [file an issue](https://github.com/ta2edchimp/BattleReporter/issues/new) if you have any feature request, ideas for improvements or found any bugs.

diff --git a/database/invGroups.sql b/database/invGroups.sql
diff --git a/database/invTypes.sql b/database/invTypes.sql
diff --git a/database/mapSolarSystems.sql b/database/mapSolarSystems.sql
@@ -1,6 +1,6 @@
 -- MySQL dump 10.13  Distrib 5.6.12, for Linux (x86_64)
 --
--- Host: localhost    Database: sdevanguard1
+-- Host: localhost    Database: sdeyc1181
 -- ------------------------------------------------------
 -- Server version	5.6.12
 
@@ -50,8 +50,8 @@ CREATE TABLE `mapSolarSystems` (
   `sunTypeID` int(11) DEFAULT NULL,
   `securityClass` varchar(2) DEFAULT NULL,
   PRIMARY KEY (`solarSystemID`),
-  KEY `mapSolarSystems_IX_region` (`regionID`),
   KEY `mapSolarSystems_IX_constellation` (`constellationID`),
+  KEY `mapSolarSystems_IX_region` (`regionID`),
   KEY `mapSolarSystems_IX_security` (`security`),
   KEY `mss_name` (`solarSystemName`(40))
 ) ENGINE=InnoDB AUTO_INCREMENT=31002605 DEFAULT CHARSET=utf8;
@@ -78,4 +78,4 @@ UNLOCK TABLES;
 /*!40101 SET COLLATION_CONNECTION=@OLD_COLLATION_CONNECTION */;
 /*!40111 SET SQL_NOTES=@OLD_SQL_NOTES */;
 
--- Dump completed on 2015-09-29 17:45:33
+-- Dump completed on 2016-01-12 16:56:17
diff --git a/index.php b/index.php
@@ -1,6 +1,6 @@
 <?php
 
-define('BR_VERSION', '0.5.5');
+define('BR_VERSION', '0.5.6');
 
 require_once('vendor/autoload.php');
 

diff --git a/views/show.php b/views/show.php
@@ -15,15 +15,15 @@
 
 // If unpublished and/or no access ... yell "not found"
 if ($battleReport->published === false) {
-	
+
 	// Users with general "edit" permission may see an unpublished battle report
 	if (!User::isLoggedIn() || !User::can("edit")) {
 		$app->render("brNotFound.html");
 		$app->stop();
 	}
-	
+
 }
-	
+
 // ... but only admins and owners may actually edit this one.
 $userIsAdminOrDirector = User::isAdmin() || User::is("Director");
 if (User::isLoggedIn() && ($userIsAdminOrDirector || $battleReport->creatorUserID == User::getUserID())) {
@@ -74,9 +74,9 @@
 }
 
 $previewMeta['title'] = (empty($battleReport->title) ? ("Battle in " . $battleReport->solarSystemName) : $battleReport->title);
-$previewMeta["description"] = $previewNumberOfPilots . ", " . $previewISKdestroyed . " at " . number_format($battleReport->teamA->brEfficiency * 100, 2, ".", ",") . "% efficiency in " . $battleReport->solarSystemName . " on " . date('Y-m-d H:i', $battleReport->startTime) . " - " . date('H:i', $battleReport->endTime);
+$previewMeta["description"] = $previewNumberOfPilots . ", " . $previewISKdestroyed . " at " . number_format($battleReport->teamA->brEfficiency, 2, ".", ",") . "% efficiency in " . $battleReport->solarSystemName . " on " . date('Y-m-d H:i', $battleReport->startTime) . " - " . date('H:i', $battleReport->endTime);
 $previewMeta['image'] = "//image.eveonline.com/corporation/" . BR_OWNERCORP_ID . "_128.png";
-	
+
 
 $app->render("show.html", array(
 	"BR_PAGE_SHOW" => true,