Merge pull request #92 from exodus4d/develop

v1.0.0RC2
exodus4d · Feb 6, 2016 · 0c0cd84 · 0c0cd84
2 parents 221b108 + 27c0698
commit 0c0cd84
Show file tree

Hide file tree

Showing 89 changed files with 39,035 additions and 170 deletions.
diff --git a/app/environment.ini b/app/environment.ini
@@ -25,7 +25,11 @@ DB_CCP_NAME                 =   eve_parallax_min
 DB_CCP_USER                 =   root
 DB_CCP_PASS                 =
 
-; SMTP settings
+; CCP SSO settings
+SSO_CCP_CLIENT_ID           =
+SSO_CCP_SECRET_KEY          =
+
+; SMTP settings. see: https://developers.eveonline.com/applications
 SMTP_HOST                   =   localhost
 SMTP_PORT                   =   25
 SMTP_SCHEME                 =   ""
@@ -53,6 +57,10 @@ DB_CCP_NAME                 =
 DB_CCP_USER                 =
 DB_CCP_PASS                 =
 
+; CCP SSO settings
+SSO_CCP_CLIENT_ID           =
+SSO_CCP_SECRET_KEY          =
+
 ; SMTP settings
 SMTP_HOST                   =   localhost
 SMTP_PORT                   =   25

diff --git a/app/main/controller/api/github.php b/app/main/controller/api/github.php
@@ -40,7 +40,7 @@ protected function getRequestOptions(){
     public function releases($f3){
         $cacheKey = 'CACHE_GITHUB_RELEASES';
         $ttl = 60 * 30; // 30min
-        $releaseCount = 5;
+        $releaseCount = 3;
 
         if( !$f3->exists($cacheKey) ){
             $apiPath = $this->getF3()->get('PATHFINDER.API.GIT_HUB') . '/repos/exodus4d/pathfinder/releases';
@@ -62,7 +62,11 @@ public function releases($f3){
                 $md = \Markdown::instance();
                 foreach($releasesData as &$releaseData){
                     if(isset($releaseData->body)){
-                        $releaseData->body = $md->convert( $releaseData->body );
+
+                        // convert list style
+                        $body = str_replace(' - ', '* ', $releaseData->body );
+
+                        $releaseData->body = $md->convert( $body );
                     }
                 }
                 $f3->set($cacheKey, $releasesData, $ttl);

diff --git a/app/main/controller/appcontroller.php b/app/main/controller/appcontroller.php
@@ -12,15 +12,15 @@
 class AppController extends Controller {
 
     /**
-     * show the main landing page
+     * show main login (index) page
      * @param $f3
      */
-    public function showLandingpage($f3) {
+    public function init($f3) {
         // page title
         $f3->set('pageTitle', 'Login');
 
         // main page content
-        $f3->set('pageContent', $f3->get('PATHFINDER.VIEW.LANDINGPAGE'));
+        $f3->set('pageContent', $f3->get('PATHFINDER.VIEW.LOGIN'));
 
         // body element class
         $f3->set('bodyClass', 'pf-body pf-landing');
@@ -29,7 +29,7 @@ public function showLandingpage($f3) {
         $f3->set('trusted', 1);
 
         // JS main file
-        $f3->set('jsView', 'landingpage');
+        $f3->set('jsView', 'login');
     }
 
-} 
+}