Commit graph

1041 commits

Author SHA1 Message Date
67ac89cd4e Merge pull request 'devel' (#199) from devel into main
Reviewed-on: #199
2023-07-08 15:15:52 +02:00
40ca1951b0 Merge branch 'main' into devel 2023-07-08 15:15:37 +02:00
ca5c0ca1dd Merge branch 'devel' of git.inhji.de:inhji/chiya into devel 2023-07-08 15:15:03 +02:00
09a103083f improve errors 2023-07-08 15:13:33 +02:00
4073626d5f Merge pull request 'devel' (#198) from devel into main
Reviewed-on: #198
2023-07-08 15:07:04 +02:00
de05deda2a Merge branch 'main' into devel 2023-07-08 15:06:47 +02:00
c1478bbde7 new error messages 2023-07-08 15:05:16 +02:00
66f82d53d3 only show hcard if user exists 2023-07-08 14:51:56 +02:00
e92b4fdd45 Merge pull request '„lib/chiya_web/controllers/page_html/note.html.heex“ ändern' (#197) from devel into main
Reviewed-on: #197
2023-07-07 14:33:38 +02:00
b4d3d3ba00 Merge branch 'main' into devel 2023-07-07 14:33:29 +02:00
e13312d308 „lib/chiya_web/controllers/page_html/note.html.heex“ ändern 2023-07-07 14:33:17 +02:00
47a06707f3 Merge pull request 'devel' (#196) from devel into main
Reviewed-on: #196
2023-07-07 14:31:29 +02:00
2774702a31 Merge branch 'main' into devel 2023-07-07 14:31:24 +02:00
a2bc863887 „lib/chiya_web/controllers/page_html/note.html.heex“ ändern 2023-07-07 14:30:57 +02:00
968b565336 „lib/chiya/notes.ex“ ändern 2023-07-07 14:25:05 +02:00
4cd9680adb „lib/chiya_web/controllers/page_html/wiki.html.heex“ ändern 2023-07-07 14:24:13 +02:00
dc6799fd25 Merge pull request 'devel' (#195) from devel into main
Reviewed-on: #195
2023-07-07 14:06:06 +02:00
9c4ca2def4 Merge branch 'main' into devel 2023-07-07 14:05:58 +02:00
d57a05666e „lib/chiya_web/components/layouts/root_public.html.heex“ ändern 2023-07-07 14:05:38 +02:00
bf76a2964c „lib/chiya_web/controllers/page_html/wiki.html.heex“ ändern 2023-07-07 14:05:16 +02:00
77248138b3 Merge pull request 'devel' (#194) from devel into main
Reviewed-on: #194
2023-07-07 14:03:19 +02:00
92263ff48f Merge branch 'main' into devel 2023-07-07 14:03:13 +02:00
8fcb5a1858 „lib/chiya_web/controllers/page_html/wiki.html.heex“ ändern 2023-07-07 14:01:59 +02:00
b54fa62675 „lib/chiya_web/controllers/page_html/wiki.html.heex“ ändern 2023-07-07 13:59:56 +02:00
8f1c14ad23 Merge pull request 'devel' (#193) from devel into main
Reviewed-on: #193
2023-07-07 13:55:58 +02:00
354ffe0582 Merge branch 'main' into devel 2023-07-07 13:55:40 +02:00
cf25e90918 „lib/chiya_web/controllers/page_html/wiki.html.heex“ ändern 2023-07-07 13:55:22 +02:00
1afbcca83b „lib/chiya_web/controllers/page_html/tag.html.heex“ ändern 2023-07-07 13:53:55 +02:00
4c4cb83bf0 „lib/chiya_web/controllers/page_html/note.html.heex“ ändern 2023-07-07 13:49:32 +02:00
672aff2d52 „lib/chiya_web/controllers/page_html/home.html.heex“ ändern 2023-07-07 13:49:06 +02:00
1d13b9d494 „lib/chiya_web/controllers/page_html/channel.html.heex“ ändern 2023-07-07 13:48:41 +02:00
feee72b9d2 „lib/chiya_web/controllers/page_html/about.html.heex“ ändern 2023-07-07 13:48:21 +02:00
939dbfb569 „lib/chiya_web/components/layouts/root_public.html.heex“ ändern 2023-07-07 13:47:22 +02:00
9c5f858694 „lib/chiya_web/components/public_components.ex“ ändern 2023-07-07 13:08:35 +02:00
79ffa14b2b Merge pull request 'devel' (#192) from devel into main
Reviewed-on: #192
2023-07-07 13:04:24 +02:00
1983512a20 Merge branch 'main' into devel 2023-07-07 13:04:15 +02:00
9bc2b66658 „lib/chiya_web/components/public_components.ex“ ändern 2023-07-07 13:04:02 +02:00
6eb862d546 „lib/chiya_web/controllers/page_html/note.html.heex“ ändern 2023-07-07 13:03:10 +02:00
87d98c9869 „lib/chiya_web/components/public_components.ex“ ändern 2023-07-07 13:02:31 +02:00
10db0086c6 Merge pull request '„lib/chiya/notes.ex“ ändern' (#191) from devel into main
Reviewed-on: #191
2023-07-07 12:50:19 +02:00
4ca131a749 Merge branch 'main' into devel 2023-07-07 12:50:12 +02:00
74479648e7 „lib/chiya/notes.ex“ ändern 2023-07-07 12:49:59 +02:00
2fa25beda2 Merge pull request '„lib/chiya_web/controllers/page_controller.ex“ ändern' (#190) from devel into main
Reviewed-on: #190
2023-07-07 12:43:54 +02:00
2383cc502b Merge branch 'main' into devel 2023-07-07 12:43:48 +02:00
0d46a0f5c8 „lib/chiya_web/controllers/page_controller.ex“ ändern 2023-07-07 12:43:33 +02:00
f8813d1186 Merge pull request 'devel' (#189) from devel into main
Reviewed-on: #189
2023-07-07 12:04:35 +02:00
8e0b5fff40 „lib/chiya_web/controllers/page_html/wiki.html.heex“ ändern 2023-07-07 12:04:26 +02:00
68c6ddcced „lib/chiya_web/controllers/page_html/wiki.html.heex“ ändern 2023-07-07 12:02:47 +02:00
bc751dc603 „lib/chiya_web/controllers/page_controller.ex“ ändern 2023-07-07 12:00:06 +02:00
bfae64d397 „lib/chiya/notes.ex“ ändern 2023-07-07 11:56:42 +02:00