resolve merge conflicts

Author: jeremykenedy

README.md

@@ -912,13 +912,16 @@ laravel-auth
 
 ### Opening an Issue
 Before opening an issue there are a couple of considerations:
-* Read the instructions and make sure all steps were followed correctly.
-* Check that the issue is not specific to your development environment setup.
-* Provide duplication steps.
-* Attempt to look into the issue, and if you have a solution, make a pull request.
-* Show that you have made an attempt to look into the issue.
-* Check to see if the issue you are reporting is a duplicate of a previous reported issue.
-* If you did not star this repo I will close your issue immediatly without consideration. My time is valuable.
+* If you did not **star this repo** *I will close your issue immediatly without consideration.* **My time is valuable**.
+* **Read the instructions** and make sure all steps were *followed correctly*.
+* **Check** that the issue is not *specific to your development environment* setup.
+* **Provide** *duplication steps*.
+* **Attempt to look into the issue**, and if you *have a solution, make a pull request*.
+* **Show that you have made an attempt** to *look into the issue*.
+* **Check** to see if the issue you are *reporting is a duplicate* of a previous reported issue.
+* **Following these instructions show me that you have tried.**
+* If you have a questions send me an email to [email protected]
+* Please be considerate that this is an open source project that I provide to the community for FREE when openeing an issue. 
 
 Open source projects are a the community’s responsibility to use, contribute, and debug.
 

app/Http/Controllers/Auth/ActivateController.php

@@ -123,7 +123,7 @@ public function activationRequired()
 
         $data = [
             'email' => $user->email,
-            'date'  => $lastActivation->created_at->format('m/d/Y'), //
+            'date'  => $lastActivation ? $lastActivation->created_at->format('m/d/Y') : null, //
         ];
 
         return view($this->getActivationView())->with($data);

app/Traits/CaptchaTrait.php

@@ -11,7 +11,7 @@ public function captchaCheck()
     {
         $response = Input::get('g-recaptcha-response');
         $remoteip = $_SERVER['REMOTE_ADDR'];
-        $secret = env('RE_CAP_SECRET');
+        $secret = config('settings.reCaptchSecret');
 
         $recaptcha = new ReCaptcha($secret);
         $resp = $recaptcha->verify($response, $remoteip);

config/settings.php

@@ -32,6 +32,11 @@
      */
     'restoreUserCutoff' => env('USER_RESTORE_CUTOFF_DAYS', 31),
 
+    /*
+     * User list pagination size
+     */
+    'userListPaginationSize' => env('USER_LIST_PAGINATION_SIZE', 50),
+
     /*
      * User restore encryption key
      */
@@ -42,9 +47,24 @@
      */
     'reCaptchStatus' => env('ENABLE_RECAPTCHA', false),
 
+    /*
+     * ReCaptcha Site Key
+     */
+    'reCaptchSite'   => env('RE_CAP_SITE', 'YOURGOOGLECAPTCHAsitekeyHERE'),
+
+    /*
+     * ReCaptcha Secret
+     */
+    'reCaptchSecret' => env('RE_CAP_SECRET', 'YOURGOOGLECAPTCHAsecretHERE'),
+
     /*
      * Google Maps API V3 Status
      */
     'googleMapsAPIStatus' => env('GOOGLEMAPS_API_STATUS', false),
 
+    /*
+     * Google Maps API Key
+     */
+    'googleMapsAPIKey'    => env('GOOGLEMAPS_API_KEY', 'YOURGOOGLEMAPSkeyHERE'),
+
 ];

resources/views/auth/register.blade.php

@@ -93,7 +93,7 @@
                         @if(config('settings.reCaptchStatus'))
                             <div class="form-group">
                                 <div class="col-sm-6 col-sm-offset-4">
-                                    <div class="g-recaptcha" data-sitekey="{{ env('RE_CAP_SITE') }}"></div>
+                                    <div class="g-recaptcha" data-sitekey="{{ config('settings.reCaptchSite') }}"></div>
                                 </div>
                             </div>
                         @endif

resources/views/layouts/app.blade.php

@@ -78,7 +78,7 @@
         <script src="{{ mix('/js/app.js') }}"></script>
 
         @if(config('settings.googleMapsAPIStatus'))
-            {!! HTML::script('//maps.googleapis.com/maps/api/js?key='.env("GOOGLEMAPS_API_KEY").'&libraries=places&dummy=.js', array('type' => 'text/javascript')) !!}
+            {!! HTML::script('//maps.googleapis.com/maps/api/js?key='.config("settings.googleMapsAPIKey").'&libraries=places&dummy=.js', array('type' => 'text/javascript')) !!}
         @endif
 
         @yield('footer_scripts')