build version 2.0.0-alpha.1

automadcms · Feb 19, 2024 · 91f5720 · 91f5720
1 parent c733ce8
commit 91f5720
Show file tree

Hide file tree

Showing 44 changed files with 226 additions and 110 deletions.
diff --git a/.gitattributes b/.gitattributes
@@ -1,2 +1,3 @@
 .gitattributes export-ignore
+.github export-ignore
 VERSION export-ignore
diff --git a/README.md b/README.md
@@ -12,30 +12,7 @@ A flat-file content management system and template engine
 ![License](https://img.shields.io/github/license/marcantondahmen/automad?color=222222)
 [![Twitter](https://img.shields.io/twitter/follow/automadcms?label=Follow)](https://twitter.com/automadcms)
 
-## :wave: Version 2
-
-Currently, the development of version 2 is _very, very active_. New features and fixes are implemented on a daily basis.
-The version 2 update will essentially be a full rewrite of the entire application, including the _backend_, _frontend_, _standard theme_ and _blocks_.
-The goal is to also include as many open feature requests and resolve as many open issues as possible until the day of the release.
-Existing themes and extensions will continue to work just fine and will be compatible with version 2.
-Minor breaking changes will be communicated with the relase notes.
-
-The new dashboard will be entirely written in _TypeScript_ and will no longer have jQuery and UIkit as dependencies.
-The new backend will require at least _PHP 8.2_ or newer.
-
-Please note that this is an open-source project that is free to use and the maintainer spends a substatial portion of his free time, weekends and nights in
-order to finish the release as soon as possible. That said, there is no fix release date yet. It is done whenever it is done. In the meantime you can
-safely start new website using version 1 and migrate to version 2 afterwards.
-
-**Please also consider the above when opening new issues in order to not waste anybody's time.**
-
-And as always, **pull-request will continue to be ignored** as stated below.
-
-In case you want to help, **please give this repository a star**, consider a small donation or take a look a these other possible ways to [contribute](#contributing) to the project.
-
----
-
-![Mockup](https://raw.githubusercontent.com/marcantondahmen/media-files/master/automad/readme.png)
+![](https://raw.githubusercontent.com/marcantondahmen/media-files/master/automad-v2/readme-light.png)
 
 ## Installation
 
@@ -45,37 +22,43 @@ Automad can be installed using [Docker](https://docker.com), [Composer](https://
 
 The fastest way to get Automad up and running is to use Composer.
 
-    composer create-project automad/automad .
+```bash
+composer create-project automad/automad . v2.x-dev
+```
 
-Follow this [guide](https://automad.org/getting-started#composer) to finish the installation and get started quickly.
+Follow this [guide](https://automad.org/version-2#getting-started) to finish the installation and get started quickly.
 
 ### Docker
 
-It is also possible to run Automad in a [Docker](https://hub.docker.com/r/automad/automad) container including **Nginx** and **PHP 8**.
+It is also possible to run Automad in a [Docker](https://hub.docker.com/r/automad/automad) container including **Nginx** and **PHP 8.3**.
 
-    docker run -dp 80:80 -v ./app:/app --name mysite automad/automad
+```bash
+docker run -dp 80:80 -v ./app:/app --name mysite automad/automad:v2
+```
 
 The first time you run the image, a new user account for the Automad dashboard will be created automatically. The account details will be logged by the running container. You can show these logs using the following command:
 
-    docker logs mysite
+```bash
+docker logs mysite
+```
 
 Your can now navigate to [localhost](http://localhost) to view your new site.
 
 ### Manual Download
 
-Alternatively Automad can also be [installed manually](https://automad.org/getting-started#manual-installation).
+Alternatively Automad can also be [downloaded](https://github.com/automadcms/automad-dist/archive/refs/heads/v2.zip) as a `.zip` file and installed manually. [Read more here.](https://automad.org/version-2#getting-started)
 
 ## Documentation
 
-Take a look at the [documentation](https://automad.org) to get started with [using](https://automad.org/user-guide) Automad or to learn how to [develop](https://automad.org/developer-guide) themes and extensions. In case you are interested in using [plain PHP](https://automad.org/developer-guide/building-themes/plain-php) in your themes or to develop more complex extensions, check out Automad's [API reference](https://api.automad.org).
+Take a look at the [documentation](https://automad.org) to get started with Automad.
 
 ## Packages
 
 Visit the [Automad package browser](https://packages.automad.org) to get free themes and extensions for your Automad site.
 
 ## Community
 
-Join the community, ask questions or start a discussion on the Automad [discussion platform](https://discuss.automad.org).
+Join the community, ask questions or start a discussion on the Automad [discussion platform](https://automad.org/discuss).
 
 ## Contributing
 
@@ -99,5 +82,5 @@ To make the development of themes more efficient, plugins providing syntax highl
 
 ---
 
-© 2013-2023 [Marc Anton Dahmen](https://marcdahmen.de)  
+© 2013-2024 [Marc Anton Dahmen](https://marcdahmen.de)  
 Released under the [MIT license](https://automad.org/license)
diff --git a/composer.json b/composer.json
@@ -27,4 +27,4 @@
             "automad/package-installer": true
         }
     }
-}
+}
diff --git a/composer.lock b/composer.lock
diff --git a/lib/composer.lock b/lib/composer.lock
diff --git a/lib/vendor/automad/language-packs/lang/bulgarian.json b/lib/vendor/automad/language-packs/lang/bulgarian.json
@@ -340,6 +340,7 @@
     "signIn": "Вход",
     "signInError": "Невалидно потребителско име или парола",
     "signOut": "Отписване",
+    "signedInAs": "Регистриран като",
     "signedOut": "Отписани",
     "signedOutSuccess": "Успешно сте изписани.",
     "size": "Размер",

diff --git a/lib/vendor/automad/language-packs/lang/chinese.json b/lib/vendor/automad/language-packs/lang/chinese.json
@@ -340,6 +340,7 @@
     "signIn": "登录",
     "signInError": "用户名或密码无效",
     "signOut": "退出",
+    "signedInAs": "登录为",
     "signedOut": "签出",
     "signedOutSuccess": "您已成功退出。",
     "size": "文字大小",

diff --git a/lib/vendor/automad/language-packs/lang/czech.json b/lib/vendor/automad/language-packs/lang/czech.json
@@ -340,6 +340,7 @@
     "signIn": "Přihlášení",
     "signInError": "Neplatné uživatelské jméno nebo heslo",
     "signOut": "Odhlásit se",
+    "signedInAs": "Přihlášen jako",
     "signedOut": "Odhlášení",
     "signedOutSuccess": "Byli jste úspěšně odhlášení.",
     "size": "Velikost",

diff --git a/lib/vendor/automad/language-packs/lang/danish.json b/lib/vendor/automad/language-packs/lang/danish.json
@@ -340,6 +340,7 @@
     "signIn": "Log ind",
     "signInError": "Ugyldigt brugernavn eller password",
     "signOut": "Log ud",
+    "signedInAs": "Logget på som",
     "signedOut": "Udmeldt",
     "signedOutSuccess": "Du er blevet logget ud med succes.",
     "size": "Størrelse",
@@ -466,5 +467,4 @@
     "write": "Skriv selv",
     "zoomInTitle": "Zoom ind",
     "zoomOutTitle": "Zoom ud"
-}
-
+}
diff --git a/lib/vendor/automad/language-packs/lang/dutch.json b/lib/vendor/automad/language-packs/lang/dutch.json
@@ -340,6 +340,7 @@
     "signIn": "Aanmelden",
     "signInError": "Ongeldige gebruikersnaam of wachtwoord",
     "signOut": "Afmelden",
+    "signedInAs": "Aangemeld als",
     "signedOut": "Uitgetekend",
     "signedOutSuccess": "Je bent succesvol afgemeld.",
     "size": "Grootte",
@@ -466,5 +467,4 @@
     "write": "Schrijf",
     "zoomInTitle": "Inzoomen",
     "zoomOutTitle": "Uitzoomen"
-}
-
+}
diff --git a/lib/vendor/automad/language-packs/lang/estonian.json b/lib/vendor/automad/language-packs/lang/estonian.json
@@ -340,6 +340,7 @@
     "signIn": "Logi sisse",
     "signInError": "Vale kasutajanimi või salasõna",
     "signOut": "Välja logida",
+    "signedInAs": "Registreerunud kui",
     "signedOut": "Allkirjastatud",
     "signedOutSuccess": "Te olete edukalt välja logitud.",
     "size": "Suurus",
@@ -466,5 +467,4 @@
     "write": "Kirjutage",
     "zoomInTitle": "Suurendus",
     "zoomOutTitle": "Suumimine"
-}
-
+}
diff --git a/lib/vendor/automad/language-packs/lang/finnish.json b/lib/vendor/automad/language-packs/lang/finnish.json
@@ -340,6 +340,7 @@
     "signIn": "Kirjaudu sisään",
     "signInError": "Virheellinen käyttäjätunnus tai salasana",
     "signOut": "Kirjaudu ulos",
+    "signedInAs": "Kirjautunut sisään nimellä",
     "signedOut": "Allekirjoitettu",
     "signedOutSuccess": "Olet kirjautunut onnistuneesti ulos.",
     "size": "Koko",
@@ -466,5 +467,4 @@
     "write": "Kirjoita",
     "zoomInTitle": "Suurenna",
     "zoomOutTitle": "Pienennä"
-}
-
+}
diff --git a/lib/vendor/automad/language-packs/lang/french.json b/lib/vendor/automad/language-packs/lang/french.json
@@ -340,6 +340,7 @@
     "signIn": "S'inscrire",
     "signInError": "Nom d'utilisateur ou mot de passe invalide",
     "signOut": "Déconnexion",
+    "signedInAs": "Inscris-toi en tant que",
     "signedOut": "Signé",
     "signedOutSuccess": "Tu as été déconnecté avec succès.",
     "size": "Taille",

diff --git a/lib/vendor/automad/language-packs/lang/german.json b/lib/vendor/automad/language-packs/lang/german.json
@@ -340,6 +340,7 @@
     "signIn": "Anmelden",
     "signInError": "Ungültiger Benutzername oder Passwort",
     "signOut": "Abmelden",
+    "signedInAs": "Eingetragen als",
     "signedOut": "Abgemeldet",
     "signedOutSuccess": "Du wurdest erfolgreich abgemeldet.",
     "size": "Größe",
@@ -466,5 +467,4 @@
     "write": "Schreibe",
     "zoomInTitle": "Vergrößern",
     "zoomOutTitle": "Verkleinern"
-}
-
+}
diff --git a/lib/vendor/automad/language-packs/lang/hungarian.json b/lib/vendor/automad/language-packs/lang/hungarian.json
@@ -340,6 +340,7 @@
     "signIn": "Bejelentkezés",
     "signInError": "Érvénytelen felhasználónév vagy jelszó",
     "signOut": "Kijelentkezés",
+    "signedInAs": "Bejelentkezve mint",
     "signedOut": "Kijelöltek",
     "signedOutSuccess": "Ön sikeresen kijelentkezett.",
     "size": "Méret",

diff --git a/lib/vendor/automad/language-packs/lang/italian.json b/lib/vendor/automad/language-packs/lang/italian.json
@@ -340,6 +340,7 @@
     "signIn": "Accedi",
     "signInError": "Nome utente o password non validi",
     "signOut": "Esci dal sito",
+    "signedInAs": "Accesso come",
     "signedOut": "Firmato",
     "signedOutSuccess": "Sei uscito con successo.",
     "size": "Dimensioni",

diff --git a/lib/vendor/automad/language-packs/lang/japanese.json b/lib/vendor/automad/language-packs/lang/japanese.json
@@ -340,6 +340,7 @@
     "signIn": "サインインする",
     "signInError": "ユーザー名またはパスワードが無効",
     "signOut": "サインアウト",
+    "signedInAs": "サインイン",
     "signedOut": "サインアウト",
     "signedOutSuccess": "サインアウトに成功した。",
     "size": "サイズ",
@@ -466,5 +467,4 @@
     "write": "書く",
     "zoomInTitle": "ズームイン",
     "zoomOutTitle": "ズームアウト"
-}
-
+}
diff --git a/lib/vendor/automad/language-packs/lang/korean.json b/lib/vendor/automad/language-packs/lang/korean.json
@@ -340,6 +340,7 @@
     "signIn": "로그인",
     "signInError": "잘못된 사용자 아이디 또는 비밀번호",
     "signOut": "로그아웃",
+    "signedInAs": "다음 계정으로 로그인",
     "signedOut": "로그아웃",
     "signedOutSuccess": "성공적으로 로그아웃되었습니다.",
     "size": "크기",

diff --git a/lib/vendor/automad/language-packs/lang/latvian.json b/lib/vendor/automad/language-packs/lang/latvian.json
@@ -340,6 +340,7 @@
     "signIn": "Pierakstīties",
     "signInError": "Nederīgs lietotājvārds vai parole",
     "signOut": "Izrakstīties",
+    "signedInAs": "Pierakstījies kā",
     "signedOut": "Izrakstīties",
     "signedOutSuccess": "Jūs esat veiksmīgi izrakstījies.",
     "size": "Izmērs",

diff --git a/lib/vendor/automad/language-packs/lang/lithuanian.json b/lib/vendor/automad/language-packs/lang/lithuanian.json
@@ -340,6 +340,7 @@
     "signIn": "Prisijungti",
     "signInError": "Neteisingas vartotojo vardas arba slaptažodis",
     "signOut": "Pasirašyti",
+    "signedInAs": "Prisijungta kaip",
     "signedOut": "Pasirašyta",
     "signedOutSuccess": "Jūs sėkmingai išsiregistravote.",
     "size": "Dydis",

diff --git a/lib/vendor/automad/language-packs/lang/norwegian.json b/lib/vendor/automad/language-packs/lang/norwegian.json
@@ -340,6 +340,7 @@
     "signIn": "Logg inn",
     "signInError": "Ugyldig brukernavn eller passord",
     "signOut": "Logg av",
+    "signedInAs": "Pålogget som",
     "signedOut": "Signert ut",
     "signedOutSuccess": "Du har blitt logget ut.",
     "size": "Størrelse",
@@ -466,5 +467,4 @@
     "write": "Skrive",
     "zoomInTitle": "Zoom inn",
     "zoomOutTitle": "Zoom ut"
-}
-
+}
diff --git a/lib/vendor/automad/language-packs/lang/polish.json b/lib/vendor/automad/language-packs/lang/polish.json
@@ -340,6 +340,7 @@
     "signIn": "Zaloguj się",
     "signInError": "Nieprawidłowa nazwa użytkownika lub hasło",
     "signOut": "Wyloguj się",
+    "signedInAs": "Zaloguj się jako",
     "signedOut": "Wyloguj się",
     "signedOutSuccess": "Zostałeś pomyślnie wylogowany.",
     "size": "Rozmiar",

diff --git a/lib/vendor/automad/language-packs/lang/portuguese.json b/lib/vendor/automad/language-packs/lang/portuguese.json
@@ -340,6 +340,7 @@
     "signIn": "Inicia sessão",
     "signInError": "Nome de utilizador ou palavra-passe inválidos",
     "signOut": "Assina",
+    "signedInAs": "Iniciou sessão como",
     "signedOut": "Assinou",
     "signedOutSuccess": "A tua sessão foi terminada com sucesso.",
     "size": "Tamanho do texto",

diff --git a/lib/vendor/automad/language-packs/lang/romanian.json b/lib/vendor/automad/language-packs/lang/romanian.json
@@ -340,6 +340,7 @@
     "signIn": "Autentificare",
     "signInError": "Nume de utilizator sau parolă invalidă",
     "signOut": "Ieșire",
+    "signedInAs": "Înregistrat ca",
     "signedOut": "Semnat",
     "signedOutSuccess": "Ați fost deconectat cu succes.",
     "size": "Dimensiune",
-Original file line number
+Diff line change
@@ Expand Up / @@ -27,4 +27,4 @@ @@
                 "automad/package-installer": true
             }
         }
-    }
+    }