Merge Upstream

CHANGELOG

@@ -1,5 +1,12 @@
 UNRELEASED CHANGES:
 
+*
+
+RELEASED VERSIONS:
+
+v1.5.0 - 2018-01-02
+-------------------
+
 * Add Webmanifest to create bookmarks on phones
 * Add pets management
 * Activities made with contact now appears in the Journal
@@ -9,8 +16,6 @@ UNRELEASED CHANGES:
 * Show a user's avatar when searching
 * Fix timezone not being saved in the Settings tab
 
-RELEASED VERSIONS:
-
 v1.4.1 - 2017-12-13
 -------------------
 

app/Http/Controllers/ContactsController.php

@@ -7,6 +7,7 @@
 use App\Tag;
 use Validator;
 use App\Contact;
+use App\ContactFieldType;
 use App\Jobs\ResizeAvatars;
 use Illuminate\Http\Request;
 use Illuminate\Support\Facades\Storage;
@@ -354,7 +355,24 @@ public function search(Request $request)
             return;
         }
 
-        $results = Contact::search($needle, $accountId);
+        if (preg_match('/(.{1,})[:](.{1,})/', $needle, $matches)) {
+            $search_field = $matches[1];
+            $search_term = $matches[2];
+
+            $field = ContactFieldType::where('name', 'LIKE', $search_field)->first();
+
+            $field_id = $field->id;
+
+            $results = Contact::whereHas('contactFields', function ($query) use ($field_id,$search_term) {
+                $query->where([
+                    ['data', 'like', "$search_term%"],
+                    ['contact_field_type_id', $field_id],
+                ]);
+            })->get();
+        } else {
+            $results = Contact::search($needle, $accountId);
+        }
+
         if (count($results) !== 0) {
             return $results;
         } else {

app/Http/ViewComposers/DateSelectViewComposer.php

@@ -23,6 +23,7 @@ public function compose(View $view)
         Carbon::setLocale(auth()->user()->locale);
         $months = [];
         $currentDate = Carbon::now();
+        $currentDate->day = 1;
 
         for ($month = 1; $month < 13; $month++) {
             $currentDate->month = $month;

config/monica.php

@@ -114,5 +114,5 @@
     | bad things will happen.
     |
     */
-    'app_version' => '1.4.1',
+    'app_version' => '1.5.0',
 ];

docs/installation/generic.md

@@ -21,7 +21,7 @@ The official Monica installation uses mySQL as the database system and **this is
 Once the softwares above are installed:
 
 1. Create a database called `monica` in your mySQL instance. This will let you store your data.
-1. Clone the repository: `git clone git@github.com:monicahq/monica.git` in the folder you want to install the software to.
+1. Clone the repository: `git clone https://github.com/monicahq/monica` in the folder you want to install the software to.
 1. Run `cd monica` to go to the root of the newly created folder containing Monica's code.
 1. Run `composer install` at the root of the folder Monica has been cloned.
 1. Run `cp .env.example .env`. This will create the `.env` file that contains all the settings about Monica.

resources/views/people/debt/add.blade.php

@@ -34,7 +34,8 @@
           <div class="col-xs-12 col-sm-6 col-sm-offset-3">
             @include('people.debt.form', [
               'method' => 'POST',
-              'action' => route('people.debt.store', $contact)
+              'action' => route('people.debt.store', $contact),
+              'update_or_add' =>'add'
             ])
           </div>
         </div>

resources/views/people/debt/edit.blade.php

@@ -34,7 +34,8 @@
           <div class="col-xs-12 col-sm-6 col-sm-offset-3">
             @include('people.debt.form', [
               'method' => 'PUT',
-              'action' => route('people.debt.update', [$contact, $debt])
+              'action' => route('people.debt.update', [$contact, $debt]),
+              'update_or_add' =>'edit'
             ])
           </div>
         </div>

resources/views/people/debt/form.blade.php

@@ -32,7 +32,13 @@
     </div>
 
     <div class="form-group actions">
-        <button type="submit" class="btn btn-primary">{{ trans('people.debt_add_add_cta') }}</button>
+        <button type="submit" class="btn btn-primary">
+            @if($update_or_add == 'add')
+            {{ trans('people.debt_add_add_cta') }}
+            @elseif ($update_or_add == 'edit')
+            {{ trans('people.debt_edit_update_cta') }}
+            @endif
+        </button>
         <a href="{{ route('people.show', $contact) }}" class="btn btn-secondary">{{ trans('app.cancel') }}</a>
     </div> <!-- .form-group -->
 </form>

routes/web.php

@@ -11,7 +11,7 @@
 */
 
 if (App::environment('production')) {
-    URL::forceScheme('https');
+    URL::forceSchema('https');
 }
 
 Route::get('/', 'Auth\LoginController@showLoginForm')->name('login');