Skip to content

Commit

Permalink
merge branch v2 (release 2.0.0-alpha.15)
Browse files Browse the repository at this point in the history
  • Loading branch information
marcantondahmen committed Dec 13, 2024
2 parents 5431d37 + b94b61e commit 5a52e1f
Show file tree
Hide file tree
Showing 5 changed files with 15 additions and 19 deletions.
21 changes: 10 additions & 11 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,8 +1,16 @@
# Changelog

## [v2.0.0-alpha.14](https://github.com/marcantondahmen/automad/commit/a9785e611e600c93690cbb435fe8c293891e11b3)
## [v2.0.0-alpha.15](https://github.com/marcantondahmen/automad/commit/fbfbc70581742ea47055fb1a287d43355b6c5e69)

Fri, 13 Dec 2024 17:49:52 +0100
Fri, 13 Dec 2024 17:59:31 +0100

### Bugfixes

- refactor build script ([fbfbc7058](https://github.com/marcantondahmen/automad/commit/fbfbc70581742ea47055fb1a287d43355b6c5e69))

## [v2.0.0-alpha.14](https://github.com/marcantondahmen/automad/commit/5431d379fb67c94a30eb1a0a4f50a9b7753ad4ab)

Fri, 13 Dec 2024 17:51:44 +0100

### Bugfixes

Expand Down Expand Up @@ -490,12 +498,3 @@ Sun, 8 Aug 2021 22:25:34 +0200
### Bugfixes

- **themes**: fix thumbnail visibility ([45ed2eee5](https://github.com/marcantondahmen/automad/commit/45ed2eee5f1cf0b81148678820b6a796bf4791e2))

## [v1.8.1](https://github.com/marcantondahmen/automad/commit/8be976c0215c549d3ac27016b8c9fee02c052cca)

Sat, 7 Aug 2021 23:06:36 +0200

### Bugfixes

- **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))
2 changes: 1 addition & 1 deletion automad/src/server/App.php
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@
* @license MIT license - https://automad.org/license
*/
class App {
const VERSION = '2.0.0-alpha.14';
const VERSION = '2.0.0-alpha.15';

/**
* Required PHP version.
Expand Down
2 changes: 0 additions & 2 deletions bin/copy-open-graph-fonts.sh
Original file line number Diff line number Diff line change
@@ -1,7 +1,5 @@
#!/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/
2 changes: 1 addition & 1 deletion package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

7 changes: 3 additions & 4 deletions package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "automad",
"version": "2.0.0-alpha.14",
"version": "2.0.0-alpha.15",
"description": "Automad",
"author": "Marc Anton Dahmen",
"license": "MIT",
Expand All @@ -9,7 +9,7 @@
"trailingComma": "es5"
},
"scripts": {
"build": "npm run clean && webpack --config webpack.config.js --mode production",
"build": "npm run clean && npm run copy-og-fonts && webpack --config webpack.config.js --mode production",
"bump-year": "bash bin/bump-year.sh",
"clean": "rm -rf ./automad/dist/*/*",
"copy-og-fonts": "bash bin/copy-open-graph-fonts.sh",
Expand All @@ -19,8 +19,7 @@
"jest:watch": "jest --watch",
"phpunit": "phpunit && phpunit -c phpunit-i18n.xml",
"psalm": "psalm --clear-global-cache && psalm --no-cache --threads=1",
"test": "npm run phpunit && npm run psalm && npm run jest",
"postinstall": "npm run copy-og-fonts"
"test": "npm run phpunit && npm run psalm && npm run jest"
},
"devDependencies": {
"@editorjs/embed": "^2.6.0",
Expand Down

0 comments on commit 5a52e1f

Please sign in to comment.