Commit graph

1249 commits

Author SHA1 Message Date
a7d1615bab Merge pull request 'lib/chiya_web/components/public_components.ex aktualisiert' (#245) from devel into main
Reviewed-on: #245
2023-07-29 18:50:38 +02:00
b0bf7e02f1 Merge branch 'main' into devel 2023-07-29 18:50:27 +02:00
a458dd1749 lib/chiya_web/components/public_components.ex aktualisiert 2023-07-29 18:50:05 +02:00
db8915f805 Merge pull request 'lib/chiya_web/components/public_components.ex aktualisiert' (#244) from devel into main
Reviewed-on: #244
2023-07-29 18:40:26 +02:00
6329eaacf2 Merge branch 'main' into devel 2023-07-29 18:40:15 +02:00
3aa7426a8a lib/chiya_web/components/public_components.ex aktualisiert 2023-07-29 18:39:50 +02:00
61ac5c95a1 Merge pull request 'lib/chiya_web/controllers/page_controller.ex aktualisiert' (#242) from devel into main
Reviewed-on: #242
2023-07-29 18:32:01 +02:00
c0c27107f2 lib/chiya_web/components/public_components.ex aktualisiert 2023-07-29 18:31:34 +02:00
b6084ed0bd lib/chiya_web/controllers/page_html/bookmarks.html.heex aktualisiert 2023-07-29 17:41:31 +02:00
c779fd4c48 Merge branch 'main' into devel 2023-07-29 17:23:56 +02:00
facc243a5c lib/chiya_web/controllers/page_controller.ex aktualisiert 2023-07-29 17:22:59 +02:00
c832f7812c Merge pull request 'devel' (#241) from devel into main
Reviewed-on: #241
2023-07-29 16:59:14 +02:00
8b885534c8 Merge branch 'main' into devel 2023-07-29 16:58:43 +02:00
646c8589b8 lib/chiya/site.ex aktualisiert 2023-07-29 16:58:22 +02:00
0b3f3c7ccd lib/chiya_web/controllers/page_controller.ex aktualisiert 2023-07-29 16:56:50 +02:00
ace9b269c1 Merge pull request 'devel' (#240) from devel into main
Reviewed-on: #240
2023-07-29 16:53:18 +02:00
1ab894b981 Merge branch 'main' into devel 2023-07-29 16:53:08 +02:00
9d9812bc68 lib/chiya_web/controllers/page_controller.ex aktualisiert 2023-07-29 16:52:45 +02:00
3075a9a636 lib/chiya_web/controllers/page_controller.ex aktualisiert 2023-07-29 16:51:01 +02:00
5b629a876c Merge pull request 'devel' (#239) from devel into main
Reviewed-on: #239
2023-07-29 16:44:25 +02:00
3863569151 Merge branch 'main' into devel 2023-07-29 16:44:05 +02:00
bbe29ca084 lib/chiya_web/components/layouts/root_public.html.heex aktualisiert 2023-07-29 16:43:12 +02:00
39fc4fed7d lib/chiya_web/controllers/page_controller.ex aktualisiert 2023-07-29 16:28:35 +02:00
6ad008865e lib/chiya_web/controllers/page_html/bookmarks.html.heex hinzugefügt 2023-07-29 16:10:02 +02:00
1891a82893 lib/chiya_web/router.ex aktualisiert 2023-07-29 16:07:07 +02:00
9fac76be70 lib/chiya/site/setting.ex aktualisiert 2023-07-29 16:05:39 +02:00
10c53690bd priv/repo/migrations/20230729160000_add_bookmark_channel_setting.exs hinzugefügt 2023-07-29 16:04:29 +02:00
0674fd4deb lib/chiya_web/controllers/setting_html/show.html.heex aktualisiert 2023-07-29 16:02:07 +02:00
fb9371a2fd lib/chiya_web/controllers/setting_html/setting_form.html.heex aktualisiert 2023-07-29 16:01:22 +02:00
b2bc2bc041 Merge pull request 'devel' (#238) from devel into main
Reviewed-on: #238
2023-07-27 22:33:55 +02:00
bdd96a0548 Merge branch 'main' into devel 2023-07-27 22:33:45 +02:00
88279ea058 Merge remote-tracking branch 'origin/devel' into devel 2023-07-27 22:33:20 +02:00
d56278e26f improve tags and microblog, add links to footer 2023-07-27 22:33:05 +02:00
3e9a06aa1e print styles 2023-07-27 22:20:48 +02:00
0ddbfece02 Merge pull request 'devel' (#237) from devel into main
Reviewed-on: #237
2023-07-27 20:32:22 +02:00
bed008c714 Merge branch 'main' into devel 2023-07-27 20:31:50 +02:00
a1ca584ea4 Merge remote-tracking branch 'origin/devel' into devel 2023-07-27 20:31:30 +02:00
71545d5a8b improve wiki 2023-07-27 20:31:23 +02:00
6b22726198 Merge pull request 'devel' (#232) from devel into main
Reviewed-on: #232
2023-07-25 07:32:35 +02:00
5a04c41b3f Merge branch 'main' into devel 2023-07-25 07:32:30 +02:00
36a7b3b987 Merge remote-tracking branch 'origin/devel' into devel 2023-07-25 07:32:06 +02:00
9e671e8b46 show header for bookmarks in microblog layout 2023-07-25 07:32:00 +02:00
9a375d2a24 fix url 2023-07-25 07:31:46 +02:00
0f554a0f2d Merge pull request 'devel' (#231) from devel into main
Reviewed-on: #231
2023-07-25 07:05:46 +02:00
e3ff45efb5 Merge branch 'main' into devel 2023-07-25 07:05:40 +02:00
87a8b00bfd Merge remote-tracking branch 'origin/devel' into devel 2023-07-25 07:05:18 +02:00
6ef125baeb add setting show_images_on_home, clean up setting page 2023-07-25 07:05:08 +02:00
8a893a6237 improve featured_image component 2023-07-25 06:55:04 +02:00
23dba2b0fd add images to note page 2023-07-25 06:54:53 +02:00
7151ed9f9d link tags, channels, linked notes in note_show_live 2023-07-25 06:33:46 +02:00