Skip to content

Commit

Permalink
merge branch v2 (release 2.0.0-alpha.12)
Browse files Browse the repository at this point in the history
  • Loading branch information
marcantondahmen committed Dec 13, 2024
2 parents 6144934 + 90fc38b commit 810d7bc
Show file tree
Hide file tree
Showing 6 changed files with 15 additions and 19 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/dist.sh
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ cd $srcDir

echo '---------------------------------------------------------------------------'
echo "Building from source ..."
npm --loglevel=error ci
npm install
npm run build

echo '---------------------------------------------------------------------------'
Expand Down
24 changes: 10 additions & 14 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,8 +1,16 @@
# Changelog

## [v2.0.0-alpha.11](https://github.com/marcantondahmen/automad/commit/9d1bf6b82d2f83c4c08905920067151e4bdfa186)
## [v2.0.0-alpha.12](https://github.com/marcantondahmen/automad/commit/73e34b55e8a8b646141cd84ccdc796afb29242f7)

Fri, 13 Dec 2024 16:07:28 +0100
Fri, 13 Dec 2024 16:53:24 +0100

### Bugfixes

- fix missing fonts in dist bundle ([73e34b55e](https://github.com/marcantondahmen/automad/commit/73e34b55e8a8b646141cd84ccdc796afb29242f7))

## [v2.0.0-alpha.11](https://github.com/marcantondahmen/automad/commit/61449346db3c0b70109892daa2f987e3a913b2de)

Fri, 13 Dec 2024 16:10:26 +0100

### New Features

Expand Down Expand Up @@ -441,15 +449,3 @@ Thu, 12 Aug 2021 22:24:51 +0200

- **ui**: fix typo in text modules ([ba8702a87](https://github.com/marcantondahmen/automad/commit/ba8702a87d26afd0172294d541c1573925f77f56))
- **ui**: fix updating links that are wrapped in quotes ([4417468d6](https://github.com/marcantondahmen/automad/commit/4417468d659c1e71e9b76698e377a19a1e209b5a))

## [v1.8.3](https://github.com/marcantondahmen/automad/commit/aa72e82f0192571f5ae1a8b032720fd9b3fb8645)

Mon, 9 Aug 2021 23:21:36 +0200

### New Features

- **core**: use a shortened md5 hash as directory slug in case a sanitized title is too short ([d6d5e57cd](https://github.com/marcantondahmen/automad/commit/d6d5e57cd663bcf0eed7c8697b7b454fac1064fb))

### Bugfixes

- **ui**: fix updating links to images that belong to the page they are used on ([723a6be37](https://github.com/marcantondahmen/automad/commit/723a6be37fb283fdcd42a5a365e6089509a25139))
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

A flat-file content management system and template engine.

![Tag](https://img.shields.io/github/v/tag/marcantondahmen/automad?include_prereleases&sort=semver&color=151619&labelColor=1c1d20)
![Tag](https://img.shields.io/github/v/tag/marcantondahmen/automad?include_prereleases&color=151619&labelColor=1c1d20)
![PHP](https://img.shields.io/packagist/dependency-v/automad/automad/php?version=dev-master&color=151619&labelColor=1c1d20)
![Language](https://img.shields.io/github/languages/top/marcantondahmen/automad?color=151619&labelColor=1c1d20)
![Size](https://img.shields.io/github/languages/code-size/marcantondahmen/automad?color=151619&labelColor=1c1d20)
Expand Down
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.11';
const VERSION = '2.0.0-alpha.12';

/**
* Required PHP version.
Expand Down
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.

2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "automad",
"version": "2.0.0-alpha.11",
"version": "2.0.0-alpha.12",
"description": "Automad",
"author": "Marc Anton Dahmen",
"license": "MIT",
Expand Down

0 comments on commit 810d7bc

Please sign in to comment.