merge master

.codecov.yml

@@ -1,3 +1,7 @@
 coverage:
+  precision: 1
   round: up
   range: 50..80
+ignore:
+  - bootstrap/cache/*
+  - public/storage/*

.env.example

@@ -48,6 +48,9 @@ APP_EMAIL_NEW_USERS_NOTIFICATION=EmailThatWillSendNotificationsForNewUser
 # https://github.com/monicahq/monica/blob/master/resources/views/settings/index.blade.php#L70
 APP_DEFAULT_TIMEZONE=US/Eastern
 
+# Default locale used in the application.
+APP_DEFAULT_LOCALE=en
+
 # Ability to disable signups on your instance.
 # Can be true or false. Default to false.
 APP_DISABLE_SIGNUP=true

.travis.yml

@@ -50,6 +50,7 @@ install:
   - travis_retry composer install --no-interaction --no-suggest --ignore-platform-reqs
 
   # Build js and css assets
+  - php artisan vue-i18n:generate
   - npm install
   - npm run production
 
@@ -126,6 +127,7 @@ jobs:
         # Get packages without require-dev
         - travis_retry composer install --no-interaction --no-suggest --ignore-platform-reqs --no-dev
         # Build js and css assets
+        - php artisan vue-i18n:generate
         - npm install
         - npm run production
 
@@ -142,14 +144,14 @@ jobs:
       deploy:
         provider: bintray
         file: .travis.deploy.json
+        skip_cleanup: true
         user: $BINTRAY_USER
         key: $BINTRAY_APIKEY
         on:
           all_branches: true
 
     - stage: Deploy
       if: tag IS present
-      skip_cleanup: true
       before_install:
         - cp scripts/tests/.env.mysql.travis .env
         - docker-compose --version
@@ -166,7 +168,6 @@ jobs:
 
     - stage: Deploy
       if: tag IS present
-      skip_cleanup: true
       before_install:
         - scripts/vagrant/install-vagrant.sh
 
@@ -182,6 +183,7 @@ jobs:
       deploy:
         provider: bintray
         file: .travis.deploy.json
+        skip_cleanup: true
         user: $BINTRAY_USER
         key: $BINTRAY_APIKEY
         on:

CHANGELOG

@@ -1,11 +1,26 @@
 UNRELEASED CHANGES:
 
-* Redirect to registration page if there is no account
-* Improve heroku integration
-* Add bullet points to lists in call log
+* Fix called_at field in the Call object returned by the API
+* Add Linkedin URL in the Contact object returned by the API
+* Improve localization: add plural forms, localize every needed messages
 
 RELEASED VERSIONS:
 
+v1.8.2 - 2018-03-20
+-------------------
+
+* Add a Vagrantfile to run Monica on Vagrant
+* Add support for Hebrew and Chinese Simplified
+* Add bullet points to call lists when rendered from markdown
+* Require debugbar on dev only
+* Improve heroku integration
+* Open register page after a clean installation
+* API:  Add ability to sort tasks by completed_at attribute
+* API: Add sorting capabilities to most models
+* Update Czech, Italian, Portuguese, Russian, German, French language files
+* Fix docker image creating wrong storage directories
+* Fix notification messages
+
 v1.8.1 - 2018-03-02
 -------------------
 
@@ -139,7 +154,7 @@ v1.0.0 - 2017-11-09
 * Add a button to `Save and add another contact` straight from the Add contact screen
 * Add the ability to indicate how you've met someone
 * Replace former front-end build system by mix (which is the new default with Laravel 5.5)
-* Add a first part of the API
+* Add the first part of the API
 * Fix the access to upgrade account view
 * Add security.txt file
 * Upgrade codebase to Laravel 5.5

Makefile

@@ -47,12 +47,14 @@ docker_push_bintray: .travis.deploy.json
 build: build-dev
 
 build-prod:
-	composer install --no-interaction --no-suggest --no-dev
+	composer install --no-interaction --no-suggest --ignore-platform-reqs --no-dev
+	php artisan vue-i18n:generate
 	npm install
 	npm run production
 
 build-dev:
-	composer install --no-interaction --no-suggest
+	composer install --no-interaction --no-suggest --ignore-platform-reqs
+	php artisan vue-i18n:generate
 	npm install
 	npm run dev
 

app/Account.php

@@ -393,11 +393,8 @@ public function isSubscribed()
     public function hasInvoices()
     {
         $query = DB::table('subscriptions')->where('account_id', $this->id)->count();
-        if ($query > 0) {
-            return true;
-        }
 
-        return false;
+        return $query > 0;
     }
 
     /**
@@ -677,4 +674,74 @@ public function getRelationshipTypeGroupByType(string $relationshipTypeGroupName
     {
         return $this->relationshipTypeGroups->where('name', $relationshipTypeGroupName)->first();
     }
+
+     /**
+     * Get the statistics of the number of calls grouped by year.
+     *
+     * @return json
+     */
+    public function getYearlyCallStatistics()
+    {
+        $callsStatistics = collect([]);
+        $calls = $this->calls()->latest('called_at')->get();
+        $years = [];
+
+        // Create a table that contains the combo year/number of
+        foreach ($calls as $call) {
+            $yearStatistic = $call->called_at->format('Y');
+            $foundInYear = false;
+
+            foreach ($years as $year => $number) {
+                if ($year == $yearStatistic) {
+                    $years[$year] = $number + 1;
+                    $foundInYear = true;
+                }
+            }
+
+            if (! $foundInYear) {
+                $years[$yearStatistic] = 1;
+            }
+        }
+
+        foreach ($years as $year => $number) {
+            $callsStatistics->put($year, $number);
+        }
+
+        return $callsStatistics;
+    }
+
+    /**
+     * Get the statistics of the number of activities grouped by year.
+     *
+     * @return json
+     */
+    public function getYearlyActivitiesStatistics()
+    {
+        $activitiesStatistics = collect([]);
+        $activities = $this->activities()->latest('date_it_happened')->get();
+        $years = [];
+
+        // Create a table that contains the combo year/number of
+        foreach ($activities as $call) {
+            $yearStatistic = $call->date_it_happened->format('Y');
+            $foundInYear = false;
+
+            foreach ($years as $year => $number) {
+                if ($year == $yearStatistic) {
+                    $years[$year] = $number + 1;
+                    $foundInYear = true;
+                }
+            }
+
+            if (! $foundInYear) {
+                $years[$yearStatistic] = 1;
+            }
+        }
+
+        foreach ($years as $year => $number) {
+            $activitiesStatistics->put($year, $number);
+        }
+
+        return $activitiesStatistics;
+    }
 }