Merge branch 'master' into master

LorenzoAncora · Oct 15, 2018 · cdfcd13 · cdfcd13
2 parents 4c82df4 + 6302cdd
commit cdfcd13
Show file tree

Hide file tree

Showing 64 changed files with 436 additions and 429 deletions.
diff --git a/.env.example b/.env.example
@@ -94,6 +94,10 @@ SESSION_DRIVER=file
 SESSION_LIFETIME=120
 QUEUE_DRIVER=sync
 
+# Maximum allowed size for uploaded files, in kilobytes.
+# Make sure this is an integer, without commas or spaces.
+DEFAULT_MAX_UPLOAD_SIZE=10240
+
 # Default filesystem to store uploaded files.
 # Possible values: public|s3
 DEFAULT_FILESYSTEM=public

diff --git a/CHANGELOG b/CHANGELOG
@@ -1,14 +1,20 @@
 UNRELEASED CHANGES:
 
+*
+
+RELEASED VERSIONS:
+
+v2.9.0 - 2018-10-14
+-------------------
+
+* Allow to define a max file size for uploaded document in an ENV variable (default to 10240kb)
 * Add description field for a contact
 * Add ability to retrieve all conversations for one contact through the API
 * Add all tasks not yet completed on the dashboard
 * Fix gravatar not displayed on dashboard view
 * Fix errors during PostgreSQL migration
 * Better documentation for PostgreSQL users 
 
-RELEASED VERSIONS:
-
 v2.8.1 - 2018-10-08
 -------------------
 

diff --git a/app/Http/Requests/ImportsRequest.php b/app/Http/Requests/ImportsRequest.php
@@ -24,7 +24,7 @@ public function authorize()
     public function rules()
     {
         return [
-            'vcard' => 'required|max:10240|mimes:vcf,vcard',
+            'vcard' => 'required|max:'.config('monica.max_upload_size').'|mimes:vcf,vcard',
         ];
     }
 }
diff --git a/composer.lock b/composer.lock
diff --git a/config/monica.php b/config/monica.php
@@ -12,7 +12,7 @@
     | bad things will happen.
     |
     */
-    'app_version' => '2.8.1',
+    'app_version' => '2.9.0',
 
    /*
     |--------------------------------------------------------------------------
@@ -192,4 +192,14 @@
     |
      */
     'twitter_account' => env('SUPPORT_TWITTER', 'monicaHQ_app'),
+
+    /*
+    |--------------------------------------------------------------------------
+    | Maximum allowed size for uploaded files, in kilobytes.
+    |--------------------------------------------------------------------------
+    |
+    | This value determines maximum size when uploading a file, in kilobytes.
+    |
+     */
+    'max_upload_size' => env('DEFAULT_MAX_UPLOAD_SIZE', 10240),
 ];
diff --git a/public/js/app.js b/public/js/app.js
diff --git a/public/js/langs/ar.json b/public/js/langs/ar.json
diff --git a/public/js/langs/cs.json b/public/js/langs/cs.json
diff --git a/public/js/langs/de.json b/public/js/langs/de.json
diff --git a/public/js/langs/en.json b/public/js/langs/en.json
diff --git a/public/js/langs/es.json b/public/js/langs/es.json
diff --git a/public/js/langs/fr.json b/public/js/langs/fr.json
diff --git a/public/js/langs/he.json b/public/js/langs/he.json
diff --git a/public/js/langs/hr.json b/public/js/langs/hr.json
diff --git a/public/js/langs/it.json b/public/js/langs/it.json
diff --git a/public/js/langs/nl.json b/public/js/langs/nl.json
diff --git a/public/js/langs/pt.json b/public/js/langs/pt.json
diff --git a/public/js/langs/ru.json b/public/js/langs/ru.json
diff --git a/public/js/langs/tr.json b/public/js/langs/tr.json
diff --git a/public/js/langs/zh.json b/public/js/langs/zh.json
diff --git a/public/mix-manifest.json b/public/mix-manifest.json
@@ -1,5 +1,5 @@
 {
-    "/js/app.js": "/js/app.js?id=c0839f080a1ef94ce457",
+    "/js/app.js": "/js/app.js?id=464ed60abd73a777832e",
     "/css/app-ltr.css": "/css/app-ltr.css?id=aeed1bc1277811d4283c",
     "/css/app-rtl.css": "/css/app-rtl.css?id=ebbe907f4e5cf0c8bd1a",
     "/css/stripe.css": "/css/stripe.css?id=64c68c04c4e475fcc7c6",

diff --git a/resources/lang/ar/dashboard.php b/resources/lang/ar/dashboard.php
@@ -13,6 +13,8 @@
     'tab_calls_blank' => 'لم تقم بتسجيل أي مكالمة بعد.',
     'tab_debts' => 'الديون',
     'tab_debts_blank' => 'لم تقم بتسجيل أي دَين بعد.',
+    'tab_tasks' => 'Tasks',
+    'tab_tasks_blank' => 'You haven’t any task yet.',
 
     'debts_you_owe' => 'أنت مدين',
 

diff --git a/resources/lang/ar/people.php b/resources/lang/ar/people.php
@@ -112,19 +112,15 @@
     'age_exact_in_years' => ':age سنوات',
     'age_exact_birthdate' => 'ولد في :date',
 
-    // Last called
-    'last_called' => 'آخر مكالمة: :date',
-    'last_called_empty' => 'آخر مكالمة: غير معلوم',
-    'last_activity_date' => 'آخر نشاط معا: :date',
-    'last_activity_date_empty' => 'آخر نشاط معا: غير معروف',
-
     // additional information
     'information_edit_success' => 'تم تحديث الملف الشخصي بنجاح',
     'information_edit_title' => 'تعديل معلومات :name الشخصية',
     'information_edit_avatar' => 'صورة شخصية لجهة الاتصال',
-    'information_edit_max_size' => 'الحد الأقصى :size ميغابايت.',
+    'information_edit_max_size' => 'Max :size Kb.',
     'information_edit_firstname' => 'الاسم الأول',
     'information_edit_lastname' => 'اسم العائلة (اختياري)',
+    'information_edit_description' => 'Description (Optional)',
+    'information_edit_description_help' => 'Used on the contact list to add some context, if necessary.',
     'information_edit_linkedin' => 'ملف LinkedIn (اختياري)',
     'information_edit_unknown' => 'أنا لا أعرف عمر هذا الشخص',
     'information_edit_probably' => 'هذا الشخص قد يكون...',
@@ -383,6 +379,7 @@
     'life_event_create_default_story' => 'Story (optional)',
     'life_event_create_date' => 'You do not need to indicate a month or a day - only the year is mandatory.',
     'life_event_create_default_description' => 'Add information about what you know',
+    'life_event_create_add_yearly_reminder' => 'Add a yearly reminder for this event',
     'life_event_create_success' => 'The life event has been added',
     'life_event_delete_title' => 'Delete a life event',
     'life_event_delete_description' => 'Are you sure you want to delete this life event? Deletion is permanent.',
@@ -409,7 +406,7 @@
     'life_event_sentence_bought_a_home' => 'Bought a home',
     'life_event_sentence_home_improvement' => 'Made a home improvement',
     'life_event_sentence_holidays' => 'Went on holidays',
-    'life_event_sentence_new_vehicule' => 'Got a new vehicule',
+    'life_event_sentence_new_vehicle' => 'Got a new vehicle',
     'life_event_sentence_new_roommate' => 'Got a roomate',
     'life_event_sentence_overcame_an_illness' => 'Overcam an illness',
     'life_event_sentence_quit_a_habit' => 'Quit a habit',

diff --git a/resources/lang/ar/settings.php b/resources/lang/ar/settings.php
@@ -367,7 +367,7 @@
     'personalization_life_event_type_bought_a_home' => 'Bought a home',
     'personalization_life_event_type_home_improvement' => 'Home improvement',
     'personalization_life_event_type_holidays' => 'Holidays',
-    'personalization_life_event_type_new_vehicule' => 'New vehicule',
+    'personalization_life_event_type_new_vehicle' => 'New vehicle',
     'personalization_life_event_type_new_roommate' => 'New roommate',
     'personalization_life_event_type_overcame_an_illness' => 'Overcame an illness',
     'personalization_life_event_type_quit_a_habit' => 'Quit a habit',

diff --git a/resources/lang/cs/dashboard.php b/resources/lang/cs/dashboard.php
@@ -13,6 +13,8 @@
     'tab_calls_blank' => 'You haven’t logged a call yet.',
     'tab_debts' => 'Debts',
     'tab_debts_blank' => 'You haven’t logged any debt yet.',
+    'tab_tasks' => 'Tasks',
+    'tab_tasks_blank' => 'You haven’t any task yet.',
 
     'debts_you_owe' => 'You owe',
 

diff --git a/resources/lang/cs/people.php b/resources/lang/cs/people.php
@@ -112,19 +112,15 @@
     'age_exact_in_years' => ':age let',
     'age_exact_birthdate' => 'narozeniny :date',
 
-    // Last called
-    'last_called' => 'Poslední telefonát: :date',
-    'last_called_empty' => 'Poslední telefonát: neznámo',
-    'last_activity_date' => 'Poslední společná aktivita: :date',
-    'last_activity_date_empty' => 'Poslední společná aktivita: neznámo',
-
     // additional information
     'information_edit_success' => 'Profil byl úspěšně aktualizován',
     'information_edit_title' => 'Upravit osobní informace o :name',
     'information_edit_avatar' => 'Fotografie/avatar kontaktu',
-    'information_edit_max_size' => 'Max :size Mb.',
+    'information_edit_max_size' => 'Max :size Kb.',
     'information_edit_firstname' => 'Jméno',
     'information_edit_lastname' => 'Příjmení (volitelné)',
+    'information_edit_description' => 'Description (Optional)',
+    'information_edit_description_help' => 'Used on the contact list to add some context, if necessary.',
     'information_edit_linkedin' => 'LinkedIn profil (volitelné)',
     'information_edit_unknown' => 'Neznám věk této osoby',
     'information_edit_probably' => 'Tato osoba je přibližně',
@@ -383,6 +379,7 @@
     'life_event_create_default_story' => 'Story (optional)',
     'life_event_create_date' => 'You do not need to indicate a month or a day - only the year is mandatory.',
     'life_event_create_default_description' => 'Add information about what you know',
+    'life_event_create_add_yearly_reminder' => 'Add a yearly reminder for this event',
     'life_event_create_success' => 'The life event has been added',
     'life_event_delete_title' => 'Delete a life event',
     'life_event_delete_description' => 'Are you sure you want to delete this life event? Deletion is permanent.',
@@ -409,7 +406,7 @@
     'life_event_sentence_bought_a_home' => 'Bought a home',
     'life_event_sentence_home_improvement' => 'Made a home improvement',
     'life_event_sentence_holidays' => 'Went on holidays',
-    'life_event_sentence_new_vehicule' => 'Got a new vehicule',
+    'life_event_sentence_new_vehicle' => 'Got a new vehicle',
     'life_event_sentence_new_roommate' => 'Got a roomate',
     'life_event_sentence_overcame_an_illness' => 'Overcam an illness',
     'life_event_sentence_quit_a_habit' => 'Quit a habit',

diff --git a/resources/lang/cs/settings.php b/resources/lang/cs/settings.php
@@ -367,7 +367,7 @@
     'personalization_life_event_type_bought_a_home' => 'Bought a home',
     'personalization_life_event_type_home_improvement' => 'Home improvement',
     'personalization_life_event_type_holidays' => 'Holidays',
-    'personalization_life_event_type_new_vehicule' => 'New vehicule',
+    'personalization_life_event_type_new_vehicle' => 'New vehicle',
     'personalization_life_event_type_new_roommate' => 'New roommate',
     'personalization_life_event_type_overcame_an_illness' => 'Overcame an illness',
     'personalization_life_event_type_quit_a_habit' => 'Quit a habit',

diff --git a/resources/lang/de/dashboard.php b/resources/lang/de/dashboard.php
@@ -13,6 +13,8 @@
     'tab_calls_blank' => 'Du hast noch keine Telefonate protokolliert.',
     'tab_debts' => 'Schulden',
     'tab_debts_blank' => 'Du hast noch keine Schulden protokolliert.',
+    'tab_tasks' => 'Tasks',
+    'tab_tasks_blank' => 'You haven’t any task yet.',
 
     'debts_you_owe' => 'Du schuldest',
 

diff --git a/resources/lang/de/people.php b/resources/lang/de/people.php
@@ -112,19 +112,15 @@
     'age_exact_in_years' => ':age Jahre alt',
     'age_exact_birthdate' => 'geboren am :date',
 
-    // Last called
-    'last_called' => 'Letztes Telefonat: :date',
-    'last_called_empty' => 'Letztes Telefonat: unbekannt',
-    'last_activity_date' => 'Letzte gemeinsame Aktivität: :date',
-    'last_activity_date_empty' => 'Letzte gemeinsame Aktivität: unbekannt',
-
     // additional information
     'information_edit_success' => 'Das Profil wurde erfolgreich aktualisiert',
     'information_edit_title' => 'Ändere :name\'s persönliche Daten',
     'information_edit_avatar' => 'Foto/Avatar des Kontakts',
-    'information_edit_max_size' => 'Max :size Mb.',
+    'information_edit_max_size' => 'Max :size Kb.',
     'information_edit_firstname' => 'Vorname',
     'information_edit_lastname' => 'Nachname (Optional)',
+    'information_edit_description' => 'Description (Optional)',
+    'information_edit_description_help' => 'Used on the contact list to add some context, if necessary.',
     'information_edit_linkedin' => 'LinkedIn-Profile (optional)',
     'information_edit_unknown' => 'Ich kenne das Alter dieser Person nicht',
     'information_edit_probably' => 'Diese Person ist wahrscheinlich',
@@ -383,6 +379,7 @@
     'life_event_create_default_story' => 'Story (optional)',
     'life_event_create_date' => 'You do not need to indicate a month or a day - only the year is mandatory.',
     'life_event_create_default_description' => 'Add information about what you know',
+    'life_event_create_add_yearly_reminder' => 'Add a yearly reminder for this event',
     'life_event_create_success' => 'The life event has been added',
     'life_event_delete_title' => 'Delete a life event',
     'life_event_delete_description' => 'Are you sure you want to delete this life event? Deletion is permanent.',
@@ -409,7 +406,7 @@
     'life_event_sentence_bought_a_home' => 'Bought a home',
     'life_event_sentence_home_improvement' => 'Made a home improvement',
     'life_event_sentence_holidays' => 'Went on holidays',
-    'life_event_sentence_new_vehicule' => 'Got a new vehicule',
+    'life_event_sentence_new_vehicle' => 'Got a new vehicle',
     'life_event_sentence_new_roommate' => 'Got a roomate',
     'life_event_sentence_overcame_an_illness' => 'Overcam an illness',
     'life_event_sentence_quit_a_habit' => 'Quit a habit',

diff --git a/resources/lang/de/settings.php b/resources/lang/de/settings.php
@@ -367,7 +367,7 @@
     'personalization_life_event_type_bought_a_home' => 'Bought a home',
     'personalization_life_event_type_home_improvement' => 'Home improvement',
     'personalization_life_event_type_holidays' => 'Holidays',
-    'personalization_life_event_type_new_vehicule' => 'New vehicule',
+    'personalization_life_event_type_new_vehicle' => 'New vehicle',
     'personalization_life_event_type_new_roommate' => 'New roommate',
     'personalization_life_event_type_overcame_an_illness' => 'Overcame an illness',
     'personalization_life_event_type_quit_a_habit' => 'Quit a habit',

diff --git a/resources/lang/en/people.php b/resources/lang/en/people.php
@@ -116,7 +116,7 @@
     'information_edit_success' => 'The profile has been updated successfully',
     'information_edit_title' => 'Edit :name’s personal information',
     'information_edit_avatar' => 'Photo/avatar of the contact',
-    'information_edit_max_size' => 'Max :size Mb.',
+    'information_edit_max_size' => 'Max :size Kb.',
     'information_edit_firstname' => 'First name',
     'information_edit_lastname' => 'Last name (Optional)',
     'information_edit_description' => 'Description (Optional)',

diff --git a/resources/lang/es/dashboard.php b/resources/lang/es/dashboard.php
@@ -13,6 +13,8 @@
     'tab_calls_blank' => 'Todavía no has registrado una llamada.',
     'tab_debts' => 'Deudas',
     'tab_debts_blank' => 'Todavía no has registrado una deuda.',
+    'tab_tasks' => 'Tasks',
+    'tab_tasks_blank' => 'You haven’t any task yet.',
 
     'debts_you_owe' => 'Le debes a',
 

diff --git a/resources/lang/es/people.php b/resources/lang/es/people.php
@@ -112,19 +112,15 @@
     'age_exact_in_years' => ':age años de edad',
     'age_exact_birthdate' => 'nació el :date',
 
-    // Last called
-    'last_called' => 'Última llamada: :date',
-    'last_called_empty' => 'Última llamada: desconocida',
-    'last_activity_date' => 'Última actividad juntos: :date',
-    'last_activity_date_empty' => 'Última actividad juntos: desconocida',
-
     // additional information
     'information_edit_success' => 'El perfil ha sido actualizado exitosamente',
     'information_edit_title' => 'Editar la información personal de :name',
     'information_edit_avatar' => 'Foto/avatar del contacto',
-    'information_edit_max_size' => 'Máximo :size MB.',
+    'information_edit_max_size' => 'Max :size Kb.',
     'information_edit_firstname' => 'Nombre',
     'information_edit_lastname' => 'Apellido (Opcional)',
+    'information_edit_description' => 'Description (Optional)',
+    'information_edit_description_help' => 'Used on the contact list to add some context, if necessary.',
     'information_edit_linkedin' => 'Perfil de LinkedIn (opcional)',
     'information_edit_unknown' => 'No sé la edad de esta persona',
     'information_edit_probably' => 'Esta persona probablemente tiene...',
@@ -383,6 +379,7 @@
     'life_event_create_default_story' => 'Story (optional)',
     'life_event_create_date' => 'You do not need to indicate a month or a day - only the year is mandatory.',
     'life_event_create_default_description' => 'Add information about what you know',
+    'life_event_create_add_yearly_reminder' => 'Add a yearly reminder for this event',
     'life_event_create_success' => 'The life event has been added',
     'life_event_delete_title' => 'Delete a life event',
     'life_event_delete_description' => 'Are you sure you want to delete this life event? Deletion is permanent.',
@@ -409,7 +406,7 @@
     'life_event_sentence_bought_a_home' => 'Bought a home',
     'life_event_sentence_home_improvement' => 'Made a home improvement',
     'life_event_sentence_holidays' => 'Went on holidays',
-    'life_event_sentence_new_vehicule' => 'Got a new vehicule',
+    'life_event_sentence_new_vehicle' => 'Got a new vehicle',
     'life_event_sentence_new_roommate' => 'Got a roomate',
     'life_event_sentence_overcame_an_illness' => 'Overcam an illness',
     'life_event_sentence_quit_a_habit' => 'Quit a habit',

diff --git a/resources/lang/es/settings.php b/resources/lang/es/settings.php
@@ -367,7 +367,7 @@
     'personalization_life_event_type_bought_a_home' => 'Bought a home',
     'personalization_life_event_type_home_improvement' => 'Home improvement',
     'personalization_life_event_type_holidays' => 'Holidays',
-    'personalization_life_event_type_new_vehicule' => 'New vehicule',
+    'personalization_life_event_type_new_vehicle' => 'New vehicle',
     'personalization_life_event_type_new_roommate' => 'New roommate',
     'personalization_life_event_type_overcame_an_illness' => 'Overcame an illness',
     'personalization_life_event_type_quit_a_habit' => 'Quit a habit',

diff --git a/resources/lang/fr/dashboard.php b/resources/lang/fr/dashboard.php
@@ -13,6 +13,8 @@
     'tab_calls_blank' => 'Vous n’avez encore enregistré aucun appel.',
     'tab_debts' => 'Dettes',
     'tab_debts_blank' => 'Vous n’avez encore enregistré aucune dette.',
+    'tab_tasks' => 'Tâches',
+    'tab_tasks_blank' => 'Vous n’avez encore aucune tâche.',
 
     'debts_you_owe' => 'Vous devez',