Commit graph

1249 commits

Author SHA1 Message Date
62d1502901 Merge pull request 'fix styles' (#298) from devel into main
Reviewed-on: #298
2023-09-09 13:56:33 +02:00
0b6ce9685f Merge branch 'main' into devel 2023-09-09 13:56:27 +02:00
cd17769668 fix styles 2023-09-09 13:56:11 +02:00
60f27620da Merge pull request 'devel' (#297) from devel into main
Reviewed-on: #297
2023-09-09 13:49:39 +02:00
087f0f35f8 Merge branch 'main' into devel 2023-09-09 13:49:32 +02:00
82dfecd0ad Merge remote-tracking branch 'origin/devel' into devel 2023-09-09 13:49:17 +02:00
0d47ecce00 rip and tear 2023-09-09 13:49:08 +02:00
01846f6b8f Merge pull request 'devel' (#296) from devel into main
Reviewed-on: #296
2023-09-09 13:15:01 +02:00
c8a7d1943f Merge branch 'main' into devel 2023-09-09 13:14:56 +02:00
cd3b1dae94 Merge remote-tracking branch 'origin/devel' into devel 2023-09-09 13:14:15 +02:00
a4feb8bba5 react 2023-09-09 13:14:07 +02:00
881679d338 Merge pull request 'lol' (#294) from devel into main
Reviewed-on: #294
2023-09-09 13:06:53 +02:00
fce64036a2 Merge branch 'main' into devel 2023-09-09 13:06:47 +02:00
4c4daf9e28 lol 2023-09-09 13:06:27 +02:00
0c8e62e770 Merge pull request 'devel' (#293) from devel into main
Reviewed-on: #293
2023-09-09 12:55:10 +02:00
8f8ed7568b color 2023-09-09 12:54:47 +02:00
0f83288d63 add nesting 2023-09-09 12:54:42 +02:00
0e10385ee6 Merge pull request 'fix' (#292) from devel into main
Reviewed-on: #292
2023-09-09 12:47:47 +02:00
e4bd324be4 fix 2023-09-09 12:47:25 +02:00
02f9c4f4c4 Merge pull request 'devel' (#291) from devel into main
Reviewed-on: #291
2023-09-09 10:59:23 +02:00
2833407c21 Merge branch 'main' into devel 2023-09-09 10:59:19 +02:00
50266b3052 Merge remote-tracking branch 'origin/devel' into devel 2023-09-09 10:58:53 +02:00
a8e3e4acb5 fix 2023-09-09 10:58:44 +02:00
9fafc54df5 Merge pull request 'yay' (#290) from devel into main
Reviewed-on: #290
2023-09-09 10:25:25 +02:00
3da13d2eb1 Merge branch 'main' into devel 2023-09-09 10:24:54 +02:00
c595b20668 yay 2023-09-09 10:24:22 +02:00
3377daadda Merge pull request 'devel' (#289) from devel into main
Reviewed-on: #289
2023-09-08 23:08:05 +02:00
dcf1cb96cf Merge branch 'main' into devel 2023-09-08 23:07:52 +02:00
b33a9f786d fix slfdsivj 2023-09-08 23:01:39 +02:00
38f1a61ac8 Merge pull request 'lib/chiya_web/controllers/page_html/note_list_microblog.html.heex aktualisiert' (#288) from devel into main
Reviewed-on: #288
2023-09-08 14:37:28 +02:00
aed924f2a8 Merge branch 'main' into devel 2023-09-08 14:37:22 +02:00
f5bc59d5f1 lib/chiya_web/controllers/page_html/note_list_microblog.html.heex aktualisiert 2023-09-08 14:36:59 +02:00
0d0bfc3913 Merge pull request 'devel' (#287) from devel into main
Reviewed-on: #287
2023-09-08 13:32:17 +02:00
813b63acd5 Merge branch 'main' into devel 2023-09-08 13:32:10 +02:00
552046f802 assets/css/app.css aktualisiert 2023-09-08 13:25:48 +02:00
3184796829 lib/chiya_web/components/layouts/root_public.html.heex aktualisiert 2023-09-08 13:24:30 +02:00
128f876c48 lib/chiya_web/controllers/page_html/note.html.heex aktualisiert 2023-09-08 13:21:16 +02:00
98adac2114 Merge pull request 'lib/chiya_web/controllers/page_html/note.html.heex aktualisiert' (#286) from devel into main
Reviewed-on: #286
2023-09-08 13:18:46 +02:00
a38047b0f7 Merge branch 'main' into devel 2023-09-08 13:18:39 +02:00
33f4ff56f3 lib/chiya_web/controllers/page_html/note.html.heex aktualisiert 2023-09-08 13:18:29 +02:00
bc4afebb3c Merge pull request 'lib/chiya_web/controllers/page_html/note.html.heex aktualisiert' (#285) from devel into main
Reviewed-on: #285
2023-09-08 13:01:41 +02:00
4eb76f679f Merge branch 'main' into devel 2023-09-08 13:01:35 +02:00
17382a449e lib/chiya_web/controllers/page_html/note.html.heex aktualisiert 2023-09-08 13:01:26 +02:00
07fd0849a5 Merge pull request 'devel' (#284) from devel into main
Reviewed-on: #284
2023-09-08 12:46:44 +02:00
ca4d2ca05a Merge branch 'main' into devel 2023-09-08 12:46:35 +02:00
50ea3397f5 lib/chiya_web/controllers/page_html.ex aktualisiert 2023-09-08 12:46:19 +02:00
8d33ce80e8 lib/chiya_web/controllers/page_html.ex aktualisiert 2023-09-08 12:44:57 +02:00
a6c0224688 Merge pull request 'devel' (#283) from devel into main
Reviewed-on: #283
2023-09-08 12:41:04 +02:00
4bfb8bbd8f Merge branch 'main' into devel 2023-09-08 12:40:56 +02:00
5f7be6aca1 lib/chiya_web/controllers/page_html/bookmarks.html.heex aktualisiert 2023-09-08 12:40:46 +02:00