Merge branch 'main' into fix-sittings-me-contact-issue

CHANGELOG.md

@@ -1,3 +1,40 @@
+## [4.0.0](https://github.com/monicahq/monica/compare/v3.7.0...v4.0.0) (2023-01-30)
+
+
+### ⚠ BREAKING CHANGES
+
+* switch to php 8.1+ dependency (#6250)
+* drop php 7.4 support (#6246)
+
+### Features
+
+* add DB_TESTING_PORT in database config ([#6201](https://github.com/monicahq/monica/issues/6201)) ([fefa799](https://github.com/monicahq/monica/commit/fefa79968cc1257372df433e9234a283b75f5b5a))
+* add disallow in robots.txt ([#6268](https://github.com/monicahq/monica/issues/6268)) ([be2e280](https://github.com/monicahq/monica/commit/be2e28070c4f9eaf65bf260a731b606d0de48010))
+* add name to user resource ([#6174](https://github.com/monicahq/monica/issues/6174)) ([8465803](https://github.com/monicahq/monica/commit/84658036a5dad7fc4e68b3d112b7a5cd9c0c6954))
+* check male translation and fall back to generic ([#6039](https://github.com/monicahq/monica/issues/6039)) ([4ba9062](https://github.com/monicahq/monica/commit/4ba9062f95b4c17bef770eb698bf381f9a1de19b))
+* drop php 7.4 support ([#6246](https://github.com/monicahq/monica/issues/6246)) ([84d0232](https://github.com/monicahq/monica/commit/84d0232095c4178be64076d1c52f7dc2e2a8caeb))
+* focus tags input box ([#6392](https://github.com/monicahq/monica/issues/6392)) ([2d75053](https://github.com/monicahq/monica/commit/2d7505368c9e87cdfb5c9ed2301c705b09a562c7))
+* load more activities ([#5973](https://github.com/monicahq/monica/issues/5973)) ([117fe19](https://github.com/monicahq/monica/commit/117fe19545e433163600e45704ea901935a5aa4a))
+* switch to php 8.1+ dependency ([#6250](https://github.com/monicahq/monica/issues/6250)) ([6a7f49f](https://github.com/monicahq/monica/commit/6a7f49fd90becc39cdf480e38e269a67f5b2215f))
+
+
+### Bug Fixes
+
+* allow configuring port for test database ([#6236](https://github.com/monicahq/monica/issues/6236)) ([aeffb71](https://github.com/monicahq/monica/commit/aeffb7184e95ce6e5a68187b5a8528fbcc95bac6)), closes [#6200](https://github.com/monicahq/monica/issues/6200)
+* allow empty completed_at task date ([#6025](https://github.com/monicahq/monica/issues/6025)) ([d4504e3](https://github.com/monicahq/monica/commit/d4504e3267ceb01e3e46b65a8e09b0d88e461170))
+* change APP_TRUST_PROXIES to APP_TRUSTED_PROXIES  ([#6095](https://github.com/monicahq/monica/issues/6095)) ([5f63bed](https://github.com/monicahq/monica/commit/5f63bed75d53b6f35b9b3fc20a24d449a1bcfebf))
+* Continuously pressing enter shows empty tags ([#6314](https://github.com/monicahq/monica/issues/6314)) ([2386096](https://github.com/monicahq/monica/commit/23860966acb284c8bb46be282668932437070865)), closes [#6235](https://github.com/monicahq/monica/issues/6235)
+* fix avatar not being loaded on dashboard ([#6224](https://github.com/monicahq/monica/issues/6224)) ([7c8105c](https://github.com/monicahq/monica/commit/7c8105c338e4c1f9a3111c2e22b5974cd13e0736))
+* fix blurry modals from sweet-modal-vue ([#6026](https://github.com/monicahq/monica/issues/6026)) ([4cc1d8f](https://github.com/monicahq/monica/commit/4cc1d8f251fcc5fb23c3db0a03cf436389a140d5))
+* fix Journal sidebar width on mobile ([#6027](https://github.com/monicahq/monica/issues/6027)) ([d690bf6](https://github.com/monicahq/monica/commit/d690bf6019fdf21e3ecbbcc7a1fcef34a2b8ab82))
+* fix laravel cloudflare proxy ([#6264](https://github.com/monicahq/monica/issues/6264)) ([d0b50fe](https://github.com/monicahq/monica/commit/d0b50fec143dee5572c814cc8dbbf6eb8ddc6400))
+* life event creation with unknown month/day ([#6046](https://github.com/monicahq/monica/issues/6046)) ([d81123b](https://github.com/monicahq/monica/commit/d81123b5ac8a9ffc70b01967b81013be5c15384d))
+* only include real contacts in carddav sync ([#6014](https://github.com/monicahq/monica/issues/6014)) ([626f078](https://github.com/monicahq/monica/commit/626f078e73ad65b330b5a35156a9d7885e6ce10f))
+* **php8.1:** deprecated trim with null value ([#6374](https://github.com/monicahq/monica/issues/6374)) ([b4c1c03](https://github.com/monicahq/monica/commit/b4c1c0385059068290c501c63b560b7b411f38f9))
+* skip version check if current version is empty ([#6137](https://github.com/monicahq/monica/issues/6137)) ([4e1e4ee](https://github.com/monicahq/monica/commit/4e1e4ee1e9c0bca573e71b447aedcb2cd019d819))
+* typo in french translation of nephew ([#6074](https://github.com/monicahq/monica/issues/6074)) ([ad11e01](https://github.com/monicahq/monica/commit/ad11e01de971b6cc2bf88322437cab1c454263f9))
+* vcard bday export format with unknown year ([#6087](https://github.com/monicahq/monica/issues/6087)) ([f0db671](https://github.com/monicahq/monica/commit/f0db6716d6f2fc0b74705768e1092bd9516136ab))
+
 # [3.7.0](https://github.com/monicahq/monica/compare/v3.6.1...v3.7.0) (2022-02-06)
 
 

docs/installation/providers/ubuntu.md

@@ -2,7 +2,7 @@
 
 <img alt="Ubuntu" src="https://upload.wikimedia.org/wikipedia/commons/thumb/a/ab/Logo-ubuntu_cof-orange-hex.svg/120px-Logo-ubuntu_cof-orange-hex.svg.png" width="120" height="120" />
 
-Monica can run on [Ubuntu 18.04 (Bionic Beaver)](http://releases.ubuntu.com/18.04/).
+Monica can run on [Ubuntu 22.04 (Jammy Jellyfish)](http://releases.ubuntu.com/22.04/).
 
 - [Prerequisites](#prerequisites)
   - [Types of databases](#types-of-databases)
@@ -35,6 +35,13 @@ sudo apt update
 sudo apt install -y git
 ```
 
+**Unzip:** Unzip is required but was not installed by default. Install it with:
+
+```sh
+sudo apt update
+sudo apt install -y unzip
+```
+
 **Apache:** Apache should come pre-installed with your server. If it's not, install it with:
 
 ```sh
@@ -55,9 +62,7 @@ Then install php 8.1 with these extensions:
 
 ```sh
 sudo apt update
-sudo apt install -y php8.1 php8.1-bcmath php8.1-cli php8.1-curl php8.1-common \
-    php8.1-fpm php8.1-gd php8.1-gmp php8.1-intl php-json php8.1-mbstring \
-    php8.1-mysql php8.1-opcache php8.1-redis php8.1-xml php8.1-zip
+sudo apt install -y php8.1-{bcmath,cli,curl,common,fpm,gd,gmp,intl,mbstring,mysql,opcache,redis,xml,zip}
 ```
 
 **Composer:** After you're done installing PHP, you'll need the [Composer](https://getcomposer.org/download/) dependency manager.
@@ -74,7 +79,7 @@ rm -f composer-setup.php
 **Node.js:** Install node.js with package manager.
 
 ```sh
-curl -fsSL https://deb.nodesource.com/setup_16.x | sudo -E bash -
+curl -fsSL https://deb.nodesource.com/setup_18.x | sudo -E bash -
 sudo apt install -y nodejs
 ```
 
@@ -115,7 +120,7 @@ cd /var/www/monica
 # Get latest tags from GitHub
 git fetch
 # Clone the desired version
-git checkout tags/v2.18.0
+git checkout tags/v4.0.0
 ```
 
 ### 2. Setup the database
@@ -157,16 +162,23 @@ exit
 
 1. `cp .env.example .env` to create your own version of all the environment variables needed for the project to work.
 2. Update `.env` to your specific needs
-    - set `DB_USERNAME` and `DB_PASSWORD` with the settings used behind.
+   - Update database information.
+   ```diff
+   - DB_USERNAME=homestead
+   - DB_PASSWORD=secret
+   + DB_USERNAME=monica
+   # Use the password you created.
+   + DB_PASSWORD=strongpassword
+   ```
     - configure a [mailserver](/docs/installation/mail.md) for registration & reminders to work correctly.
     - set the `APP_ENV` variable to `production`, `local` is only used for the development version. Beware: setting `APP_ENV` to `production` will force HTTPS. Skip this if you're running Monica locally.
-3. Run `composer install --no-interaction --no-dev` to install all packages.
-4. Run `yarn install` to install frontend packages, then `yarn run production` to build the assets (js, css).
-5. Run `php artisan key:generate` to generate an application key. This will set `APP_KEY` with the right value automatically.
-6. Run `php artisan setup:production -v` to run the migrations, seed the database and symlink folders.
+4. Run `composer install --no-interaction --no-dev` to install all packages.
+5. Run `yarn install` to install frontend packages, then `yarn run production` to build the assets (js, css).
+6. Run `php artisan key:generate` to generate an application key. This will set `APP_KEY` with the right value automatically.
+7. Run `php artisan setup:production -v` to run the migrations, seed the database and symlink folders.
     - You can use `email` and `password` parameter to setup a first account directly: `php artisan setup:production --email=your@email.com --password=yourpassword -v`
-7. _Optional_: Setup the queues with Redis, Beanstalk or Amazon SQS: see optional instruction of [generic installation](generic.md#setup-queues)
-8. _Optional_: Setup the access tokens to use the API follow optional instruction of [generic installation](generic.md#setup-access-tokens)
+8. _Optional_: Setup the queues with Redis, Beanstalk or Amazon SQS: see optional instruction of [generic installation](generic.md#setup-queues)
+9. _Optional_: Setup the access tokens to use the API follow optional instruction of [generic installation](generic.md#setup-access-tokens)
 
 ### 4. Configure cron job
 
@@ -207,11 +219,11 @@ sudo a2enmod rewrite
 sudo nano /etc/apache2/sites-available/monica.conf
 ```
 
-Then, in the `nano` text editor window you just opened, copy the following - swapping the `**YOUR IP ADDRESS/DOMAIN**` with your server's IP address/associated domain:
+Then, in the `nano` text editor window you just opened, copy the following - swapping the `monica.example.com` with your server's IP address/associated domain:
 
 ```html
 <VirtualHost *:80>
-    ServerName **YOUR IP ADDRESS/DOMAIN**
+    ServerName monica.example.com
 
     ServerAdmin webmaster@localhost
     DocumentRoot /var/www/monica/public