merge branch v2 (release 2.0.0-alpha.14)

marcantondahmen · Dec 13, 2024 · 5431d37 · 5431d37
2 parents 53a594f + 687dfb0
commit 5431d37
Show file tree

Hide file tree

Showing 5 changed files with 22 additions and 33 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,8 +1,16 @@
 # Changelog
 
-## [v2.0.0-alpha.13](https://github.com/marcantondahmen/automad/commit/516cfef458a2abc04243e113b948097972b72357)
+## [v2.0.0-alpha.14](https://github.com/marcantondahmen/automad/commit/a9785e611e600c93690cbb435fe8c293891e11b3)
 
-Fri, 13 Dec 2024 17:32:30 +0100
+Fri, 13 Dec 2024 17:49:52 +0100
+
+### Bugfixes
+
+- fix bundle issues ([a9785e611](https://github.com/marcantondahmen/automad/commit/a9785e611e600c93690cbb435fe8c293891e11b3))
+
+## [v2.0.0-alpha.13](https://github.com/marcantondahmen/automad/commit/53a594f06fbc7d169684399b9731a7f34b10a797)
+
+Fri, 13 Dec 2024 17:34:21 +0100
 
 ### Bugfixes
 
@@ -491,29 +499,3 @@ Sat, 7 Aug 2021 23:06:36 +0200
 
 - **ui**: fix breadcrumbs position in safari ([0ed10e20d](https://github.com/marcantondahmen/automad/commit/0ed10e20d8d32f963be4d76c84d79bcf967b77c0))
 - **ui**: fix status badge for outdated packages ([8b53a821f](https://github.com/marcantondahmen/automad/commit/8b53a821fa0d9cdc57af25f0eb122dc0dd312050))
-
-## [v1.8.0](https://github.com/marcantondahmen/automad/commit/cbdd0e59738ad28a6a0e2c6d235d5fa886438b2c)
-
-Sat, 7 Aug 2021 19:45:51 +0200
-
-### New Features
-
-- **blocks**: add option to use an image block as link ([586875ca3](https://github.com/marcantondahmen/automad/commit/586875ca31f9ec5cb273a1d0dc4de24a1c006346))
-- **blocks**: add option to use custom css classes for button blocks ([dd615b97f](https://github.com/marcantondahmen/automad/commit/dd615b97f0dc20b6f440d44d47e7e73e43483bb0))
-- **blocks**: add option to use custom css classes for section blocks ([aea1beec2](https://github.com/marcantondahmen/automad/commit/aea1beec298eacc4317389b8eb913c93a326111c))
-- **console**: add clearcache command ([f72112406](https://github.com/marcantondahmen/automad/commit/f72112406c5a79adb4c7ab26f1a3d87ae1bd87fc))
-- **console**: add purge command ([9f0ca5a83](https://github.com/marcantondahmen/automad/commit/9f0ca5a8324ffd0833161998f9b2b2bb7777f45f))
-- **system**: add check for required PHP version before updating ([c547d52af](https://github.com/marcantondahmen/automad/commit/c547d52afe2b8c5a86d9eebd1cbea1a09986b583))
-- **ui**: add autocompletion for inline link tool ([fb70070ff](https://github.com/marcantondahmen/automad/commit/fb70070ff30ce818463f6421a2f9ae374a8778f9))
-- **ui**: add site wide search and replace ([91e9ad680](https://github.com/marcantondahmen/automad/commit/91e9ad6802e3f9410364a1bed3b9de7fa1ebf023))
-- **ui**: convert search bar in top navigation into a jump bar ([0ab079586](https://github.com/marcantondahmen/automad/commit/0ab07958624b42a8cbe5f22b939483355ea39b5b))
-- **ui**: implement automatic updates of links to moved pages ([0369e52fd](https://github.com/marcantondahmen/automad/commit/0369e52fdc4eb6bacbc87e08e49d73bffc00c97a))
-- **ui**: implement automatic updates of links to renamed files ([3a26c4065](https://github.com/marcantondahmen/automad/commit/3a26c4065095e616db87b2a2df45101e6d2a58fa))
-- **ui**: verify that a given username is valid when adding accounts ([283a41a2f](https://github.com/marcantondahmen/automad/commit/283a41a2f99b59914e81b48935800cd59fbc1b41))
-
-### Bugfixes
-
-- **theme**: fix inline link styles in blocks ([8b89e00f0](https://github.com/marcantondahmen/automad/commit/8b89e00f027372189a5a25ae5b0e7bb9409ac665))
-- **ui**: fix disabled save button after deleting unused variable field ([fe375915e](https://github.com/marcantondahmen/automad/commit/fe375915e5afaa9fb9ec4798df3c466fd0e283a5))
-- **ui**: fix position of block editor toolbar on large devices ([e19b4b983](https://github.com/marcantondahmen/automad/commit/e19b4b98356d22ed475a8f27489c1d65a26e83e2))
-- **ui**: fix switcher tab update on hashchanges ([2a6725d37](https://github.com/marcantondahmen/automad/commit/2a6725d374ffd0b575b8ce98f7a0eb14707d222e))
diff --git a/automad/src/server/App.php b/automad/src/server/App.php
@@ -56,7 +56,7 @@
  * @license MIT license - https://automad.org/license
  */
 class App {
-	const VERSION = '2.0.0-alpha.13';
+	const VERSION = '2.0.0-alpha.14';
 
 	/**
 	 * Required PHP version.

diff --git a/bin/copy-open-graph-fonts.sh b/bin/copy-open-graph-fonts.sh
@@ -0,0 +1,7 @@
+#!/bin/bash
+
+ls ./node_modules/@expo-google-fonts/inter | grep ttf
+
+mkdir -p ./automad/dist/fonts/open-graph/
+cp ./node_modules/@expo-google-fonts/inter/Inter_500Medium.ttf ./automad/dist/fonts/open-graph/
+cp ./node_modules/@expo-google-fonts/inter/Inter_700Bold.ttf ./automad/dist/fonts/open-graph/
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "automad",
-  "version": "2.0.0-alpha.13",
+  "version": "2.0.0-alpha.14",
   "description": "Automad",
   "author": "Marc Anton Dahmen",
   "license": "MIT",
@@ -12,7 +12,7 @@
     "build": "npm run clean && webpack --config webpack.config.js --mode production",
     "bump-year": "bash bin/bump-year.sh",
     "clean": "rm -rf ./automad/dist/*/*",
-    "copy-og-fonts": "mkdir -p ./automad/dist/fonts/open-graph/ && cp node_modules/@expo-google-fonts/inter/Inter_{500Medium,700Bold}.ttf ./automad/dist/fonts/open-graph/",
+    "copy-og-fonts": "bash bin/copy-open-graph-fonts.sh",
     "dev": "npm run clean && npm run copy-og-fonts && webpack --config webpack.config.js --mode development",
     "inbucket": "docker run -d --name inbucket -p 9000:9000 -p 2500:2500 -p 1100:1100 inbucket/inbucket 2&>/dev/null",
     "jest": "jest",