merge branch v2 (release 2.0.0-alpha.4)

marcantondahmen · Apr 12, 2024 · ff40d45 · ff40d45
2 parents 7f5ae35 + 2b4c652
commit ff40d45
Show file tree

Hide file tree

Showing 257 changed files with 1,261 additions and 704 deletions.
diff --git a/.editorconfig b/.editorconfig
@@ -13,7 +13,7 @@ indent_size = 2
 indent_style = space
 indent_size = 4
 
-[*.yml]
+[*.{md,yml}]
 indent_style = space
 indent_size = 2
 
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,8 +1,30 @@
 # Changelog
 
-## [v2.0.0-alpha.3](https://github.com/marcantondahmen/automad/commit/7403a58c8ede73b18b960191f408926901a2f7ad)
+## [v2.0.0-alpha.4](https://github.com/marcantondahmen/automad/commit/3278dc38395cad81068657e12a7893ebd9e02bd6)
 
-Thu, 29 Feb 2024 21:01:04 +0100
+Sat, 13 Apr 2024 00:08:53 +0200
+
+### New Features
+
+- **engine**: add syntax highlighting for code blocks and markdown variables ([e9d14ae1d](https://github.com/marcantondahmen/automad/commit/e9d14ae1dcb2fce4efdd22b262ecc923364fccaa))
+- **migration**: map legacy standard theme to new standard-v1 composer package ([94b3714fb](https://github.com/marcantondahmen/automad/commit/94b3714fb6a8b56a837cd653a20087ef8b669e48))
+- **ui**: add syntax highlighting theme selection field to page and shared settings ([cf85d6ae8](https://github.com/marcantondahmen/automad/commit/cf85d6ae854bf0f0d2ed400fc388589ff02dc524))
+- add line numbers and copy button for code blocks ([ca6c70014](https://github.com/marcantondahmen/automad/commit/ca6c70014ba037a9efcd8cff9dd55a696a2a6f3a))
+- add syntax highlighting for the automad template language ([94aefa355](https://github.com/marcantondahmen/automad/commit/94aefa355e6f150f0a4078c939a51aa8aa11c973))
+
+### Bugfixes
+
+- **blocks**: fix gallery counter and caption color ([9049b750e](https://github.com/marcantondahmen/automad/commit/9049b750e6d281aa687d60b95a79c611255f46a1))
+- **core**: set cookie path to base url ([118bd1642](https://github.com/marcantondahmen/automad/commit/118bd16423030b00dbf295b4ff8185d75af15cf5))
+- **dashboard**: fix image editor color select and modal styles ([aca720b55](https://github.com/marcantondahmen/automad/commit/aca720b5531cd15defa9f80106a8658251548c8a))
+- **dashboard**: fix missing publish button on small devices ([8678ab32e](https://github.com/marcantondahmen/automad/commit/8678ab32e66fc2e5e551e899da3c8317198e2f88))
+- **dashboard**: fix text selection colors ([1d7e3203e](https://github.com/marcantondahmen/automad/commit/1d7e3203e24a92981d3f0289cb08f539be254abf))
+- **dashboard**: open in-page edit mode in same tab ([56e89b839](https://github.com/marcantondahmen/automad/commit/56e89b839c9f01271ca3fc957d72a01ee010c521))
+- **engine**: fix missing strikethrough support in markdown fields ([f700a1be7](https://github.com/marcantondahmen/automad/commit/f700a1be79c8f048b8ebee137c8b11b5e14593fc))
+
+## [v2.0.0-alpha.3](https://github.com/marcantondahmen/automad/commit/7f5ae3584e30a3c4e9c8d3430bf52a7c24e55a5a)
+
+Thu, 29 Feb 2024 21:03:22 +0100
 
 ### New Features
 
@@ -313,29 +335,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/README.md b/README.md
@@ -2,20 +2,28 @@
 
 A flat-file content management system and template engine.
 
-![Tag](https://img.shields.io/github/v/tag/marcantondahmen/automad?include_prereleases&sort=semver&color=222222)
-![PHP](https://img.shields.io/packagist/dependency-v/automad/automad/php?version=dev-master&color=222222)
-![Language](https://img.shields.io/github/languages/top/marcantondahmen/automad?color=222222)
-![Size](https://img.shields.io/github/languages/code-size/marcantondahmen/automad?color=222222)
-![License](https://img.shields.io/github/license/marcantondahmen/automad?color=222222)
+![Tag](https://img.shields.io/github/v/tag/marcantondahmen/automad?include_prereleases&sort=semver&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)
+![License](https://img.shields.io/github/license/marcantondahmen/automad?color=151619&labelColor=1c1d20)
 [![Twitter](https://img.shields.io/twitter/follow/automadcms?label=Follow)](https://twitter.com/automadcms)
 
-![](https://raw.githubusercontent.com/marcantondahmen/media-files/master/automad-v2/readme-light.png)
+[![Screenshot](https://raw.githubusercontent.com/marcantondahmen/media-files/master/automad-v2/readme-light.png)](https://try.automad.org)
 
 ## Links
 
--   [Documentation](https://automad.org)
--   [Changelog](https://github.com/marcantondahmen/automad/blob/-/CHANGELOG.md)
--   [Discussion](https://automad.org/discuss)
+- [Documentation](https://automad.org)
+- [Live Demo](https://try.automad.org)
+- [Changelog](https://github.com/marcantondahmen/automad/blob/-/CHANGELOG.md)
+- [Discussion](https://automad.org/discuss)
+
+## Live Demo
+
+In case you quickly want to try out Automad without setting up a server first, just check out the [live demo](https://try.automad.org) for free. There is no sign-up required and you can start exploring new features right in away in your personal demo instance.
+
+> [!IMPORTANT]
+> Please note that in order to keep hosting costs under control, all demos are running on **minimal hardware** and expire after one hour.
 
 ## Installation
 
@@ -61,6 +69,10 @@ In case you are not able to use Docker or Composer, you can also deploy Automad
 2. Make sure the PHP process has the permissions to write to the document root and its subdirectories including all installed files.
 3. Visit the `/dashboard` route of your site and create the first user.
 
+## Migrating Content
+
+In order to migrate an old Automad installation to the new version 2, please follow the [migration giude](https://automad.org/version-2#migration) in the documentation.
+
 ## Documentation
 
 Take a look at the [documentation](https://automad.org) to get started with Automad.
@@ -77,21 +89,21 @@ Join the community, ask questions or start a discussion on the Automad [discussi
 
 In case you are interested in contributing, the following types of contribution are welcome:
 
--   Improving [language packs](https://github.com/automadcms/automad-language-packs) by fixing translation errors or adding new languages
--   [Publishing packages](https://automad.org/developer-guide/publishing-packages) like themes or extensions to the Automad package [browser](https://packages.automad.org)
--   Giving feedback and helping to grow a [community](https://automad.org/discuss)
--   Reporting bugs or requesting features at [GitHub](https://github.com/marcantondahmen/automad/issues)
+- Improving [language packs](https://github.com/automadcms/automad-language-packs) by fixing translation errors or adding new languages
+- [Publishing packages](https://automad.org/developer-guide/publishing-packages) like themes or extensions to the Automad package [browser](https://packages.automad.org)
+- Giving feedback and helping to grow a [community](https://automad.org/discuss)
+- Reporting bugs or requesting features at [GitHub](https://github.com/marcantondahmen/automad/issues)
 
 However, I do not exclude at this point using parts of Automad's source in future projects under different licenses. In order to avoid having to ask anybody for permission when doing so, I will not accept any contributions to **this** repository. Please understand that pull requests will therefore be ignored.
 
 ## Text Editors Plugins
 
 To make the development of themes more efficient, plugins providing syntax highlighting and snippets for Automad's template language are available for the following editors:
 
--   [Neovim (Tree-Sitter)](https://github.com/automadcms/tree-sitter-automad)
--   [Visual Studio Code](https://marketplace.visualstudio.com/items?itemName=MarcAntonDahmen.automad)
--   [Atom](https://atom.io/packages/language-automad)
--   [Textmate 2](https://github.com/marcantondahmen/automad.tmbundle)
+- [Neovim (Tree-Sitter)](https://github.com/automadcms/tree-sitter-automad)
+- [Visual Studio Code](https://marketplace.visualstudio.com/items?itemName=MarcAntonDahmen.automad)
+- [Atom](https://atom.io/packages/language-automad)
+- [Textmate 2](https://github.com/marcantondahmen/automad.tmbundle)
 
 ---
 

diff --git a/automad/lang/english.json b/automad/lang/english.json
@@ -50,6 +50,7 @@
 	"clickToDelete": "Click to delete",
 	"close": "Close",
 	"code": "Source Code",
+	"codeBlockLineNumbers": "Show line numbers",
 	"color": "Color",
 	"confirmCancelUpload": "Do you want to cancel the upload?",
 	"confirmDeletePage": "Do you want to delete the current page?",
@@ -474,6 +475,7 @@
 	"value": "Value",
 	"vertical": "Vertical",
 	"visit": "Visit",
+	"visitSyntaxGallery": "Visit the syntax theme gallery",
 	"warmthTool": "Warmth",
 	"watermarkTab": "Watermark",
 	"write": "Write",

diff --git a/automad/src/client/admin/components/Alert.ts b/automad/src/client/admin/components/Alert.ts
@@ -32,8 +32,8 @@
  * Licensed under the MIT license.
  */
 
-import { App, Attr, CSS, html } from '@/core';
-import { BaseComponent } from '@/components/Base';
+import { App, Attr, CSS, html } from '@/admin/core';
+import { BaseComponent } from '@/admin/components/Base';
 
 /**
  * A simple alert box component.

diff --git a/automad/src/client/admin/components/Autocomplete.ts b/automad/src/client/admin/components/Autocomplete.ts
@@ -32,8 +32,8 @@
  * Licensed under the MIT license.
  */
 
-import { BaseComponent } from '@/components/Base';
-import { AutocompleteItem, AutocompleteItemData, KeyValueMap } from '@/types';
+import { BaseComponent } from '@/admin/components/Base';
+import { AutocompleteItem, AutocompleteItemData, KeyValueMap } from '@/admin/types';
 import {
 	App,
 	create,
@@ -44,7 +44,7 @@ import {
 	CSS,
 	fire,
 	Attr,
-} from '@/core';
+} from '@/admin/core';
 
 /**
  * An input field with page autocompletion.

diff --git a/automad/src/client/admin/components/AutocompleteUrl.ts b/automad/src/client/admin/components/AutocompleteUrl.ts
@@ -32,8 +32,8 @@
  * Licensed under the MIT license.
  */
 
-import { AutocompleteItemData, KeyValueMap, PageMetaData } from '@/types';
-import { App, create, html, Attr } from '@/core';
+import { AutocompleteItemData, KeyValueMap, PageMetaData } from '@/admin/types';
+import { App, create, html, Attr } from '@/admin/core';
 import { AutocompleteComponent } from './Autocomplete';
 
 /**

diff --git a/automad/src/client/admin/components/Base.ts b/automad/src/client/admin/components/Base.ts
@@ -32,7 +32,7 @@
  * Licensed under the MIT license.
  */
 
-import { KeyValueMap, Listener } from '@/types';
+import { KeyValueMap, Listener } from '@/admin/types';
 
 /**
  * The Automad base component. All Automad components are based on this class.

diff --git a/automad/src/client/admin/components/Breadcrumbs/BaseBreadcrumbs.ts b/automad/src/client/admin/components/Breadcrumbs/BaseBreadcrumbs.ts
@@ -32,8 +32,8 @@
  * Licensed under the MIT license.
  */
 
-import { CSS, listen } from '@/core';
-import { BaseComponent } from '@/components/Base';
+import { CSS, listen } from '@/admin/core';
+import { BaseComponent } from '@/admin/components/Base';
 
 /**
  * A breadcrumbs base component.

diff --git a/automad/src/client/admin/components/Breadcrumbs/BreadcrumbsPage.ts b/automad/src/client/admin/components/Breadcrumbs/BreadcrumbsPage.ts
@@ -43,8 +43,8 @@ import {
 	Attr,
 	PageController,
 	listen,
-} from '@/core';
-import { KeyValueMap } from '@/types';
+} from '@/admin/core';
+import { KeyValueMap } from '@/admin/types';
 import { BaseBreadcrumbsComponent } from './BaseBreadcrumbs';
 
 /**

diff --git a/automad/src/client/admin/components/Breadcrumbs/BreadcrumbsRoute.ts b/automad/src/client/admin/components/Breadcrumbs/BreadcrumbsRoute.ts
@@ -32,7 +32,7 @@
  * Licensed under the MIT license.
  */
 
-import { App, Attr, CSS, html, listen, Route } from '@/core';
+import { App, Attr, CSS, html, listen, Route } from '@/admin/core';
 import { BaseBreadcrumbsComponent } from './BaseBreadcrumbs';
 
 /**

diff --git a/automad/src/client/admin/components/Checkbox.ts b/automad/src/client/admin/components/Checkbox.ts
@@ -32,8 +32,8 @@
  * Licensed under the MIT license.
  */
 
-import { create, CSS, html, listen, query } from '@/core';
-import { BaseComponent } from '@/components/Base';
+import { create, CSS, html, listen, query } from '@/admin/core';
+import { BaseComponent } from '@/admin/components/Base';
 
 /**
  * A simple checkbox component.

diff --git a/automad/src/client/admin/components/Copy.ts b/automad/src/client/admin/components/Copy.ts
@@ -32,8 +32,8 @@
  * Licensed under the MIT license.
  */
 
-import { listen, notifySuccess } from '@/core';
-import { BaseComponent } from '@/components/Base';
+import { listen, notifySuccess } from '@/admin/core';
+import { BaseComponent } from '@/admin/components/Base';
 
 /**
  * A copy to clipboard button component.

diff --git a/automad/src/client/admin/components/CustomIconCheckbox.ts b/automad/src/client/admin/components/CustomIconCheckbox.ts
@@ -32,8 +32,8 @@
  * Licensed under the MIT license.
  */
 
-import { Attr, create, CSS, html, query } from '@/core';
-import { BaseComponent } from '@/components/Base';
+import { Attr, create, CSS, html, query } from '@/admin/core';
+import { BaseComponent } from '@/admin/components/Base';
 
 /**
  * A custom icon checkbox field.

diff --git a/automad/src/client/admin/components/DashboardThemeToggle.ts b/automad/src/client/admin/components/DashboardThemeToggle.ts
@@ -32,9 +32,9 @@
  * Licensed under the MIT license.
  */
 
-import { Attr, create, CSS, EventName, html, listen, titleCase } from '@/core';
-import { DashboardTheme, getTheme, setTheme } from '@/core/theme';
-import { BaseComponent } from '@/components/Base';
+import { Attr, create, CSS, EventName, html, listen, titleCase } from '@/admin/core';
+import { DashboardTheme, getTheme, setTheme } from '@/admin/core/theme';
+import { BaseComponent } from '@/admin/components/Base';
 
 /**
  * A theme toggle component for the dashboard.

diff --git a/automad/src/client/admin/components/Dropdown.ts b/automad/src/client/admin/components/Dropdown.ts
@@ -32,8 +32,8 @@
  * Licensed under the MIT license.
  */
 
-import { Attr, CSS, listen, queryParents } from '@/core';
-import { BaseComponent } from '@/components/Base';
+import { Attr, CSS, listen, queryParents } from '@/admin/core';
+import { BaseComponent } from '@/admin/components/Base';
 
 /**
  * A simple dropdown menu component.