Commit graph

14474 commits

Author SHA1 Message Date
502382da45 cherry-pick security from upstream 2022-06-22 16:25:05 +01:00
de95ee7772 Merge branch 'develop' of akkoma.dev:AkkomaGang/akkoma into develop 2022-06-21 08:35:13 +01:00
d15d55eda2 update changelog 2022-06-21 08:35:05 +01:00
8e3115e87b Merge pull request 'Use mediaproxy for emoji notifications if enabled' (#7) from sn0w/akkoma:patch/emoji-notification-mediaproxy into develop
Reviewed-on: http://akkoma.dev/AkkomaGang/akkoma/pulls/7
2022-06-17 13:19:57 +00:00
f2f8b81fc4
Use mediaproxy for emoji notifications if enabled 2022-06-17 14:27:22 +02:00
f15c9e8b08 format everything 2022-06-15 18:22:30 +01:00
5b11543c96 update pleroma-fe url 2022-06-15 18:18:23 +01:00
f919035664 update adminfe 2022-06-14 19:04:22 +01:00
b98bd66a94 Revert "update adminfe"
This reverts commit 4532f75da3.
2022-06-14 19:00:24 +01:00
4532f75da3 update adminfe 2022-06-14 18:51:33 +01:00
af1bd3af59 mix format 2022-06-14 17:43:45 +01:00
6e1d9c63da allow %{source} dict in no_empty 2022-06-14 17:41:25 +01:00
6ac2822c73 update fe 2022-06-14 17:29:41 +01:00
1f1c7363df update pleroma-fe 2022-06-14 17:10:31 +01:00
3bc4c3baf4 bump version 2022-06-14 16:35:55 +01:00
c7328c438f update pleromaFE 2022-06-14 16:35:32 +01:00
abefbcec64 Merge branch 'mfm' into develop 2022-06-14 16:25:47 +01:00
0627da0027 mix format 2022-06-14 16:25:28 +01:00
829ae13572 ensure tests pass 2022-06-14 16:24:03 +01:00
4fb2251221 Allow authoring MFM 2022-06-14 15:56:12 +01:00
0333dc2c2f Merge pull request 'Allow reacting with emojis containing a number' (#6) from sn0w/akkoma:patch/broaden-emoji-name-scope into develop
Reviewed-on: http://akkoma.dev/AkkomaGang/akkoma/pulls/6
2022-06-14 10:03:49 +00:00
3f06ccc9e3 allow source from misskey 2022-06-14 10:56:18 +01:00
60bfaed368
Allow reacting with emojis containing a number 2022-06-14 11:47:09 +02:00
fd0cb148b9 bump version, 2.5.1 2022-06-12 14:01:23 +01:00
a43859c8f4 update pleroma-fe 2022-06-12 14:00:52 +01:00
0f5bea2465 Add emoji_url to notifications to allow rendering
Ref #5
2022-06-12 13:35:14 +01:00
785209dece fix event triggers 2022-06-11 19:53:36 +01:00
ec42e96225 don't test 2022-06-11 19:38:00 +01:00
6aa81ad716 pls 2022-06-11 19:37:24 +01:00
8cc104648a update musl 2022-06-11 19:22:03 +01:00
0e6f47955d try making it dependent 2022-06-11 19:10:45 +01:00
7bb6317e38 include musl tag 2022-06-11 18:58:36 +01:00
987dd2f97a clean for musl 2022-06-11 18:55:54 +01:00
0ef7f90fd5 fix tag builds 2022-06-11 18:48:26 +01:00
2d3c10e4ff ensure releases don't collide 2022-06-11 18:32:10 +01:00
6ee32cbdc9 bump version 2022-06-11 18:16:34 +01:00
0b907ca861 run on tag 2022-06-11 18:12:48 +01:00
5c1ace64a2 make sure we have zip 2022-06-11 17:57:12 +01:00
0e0376eca4 hex 2022-06-11 17:44:12 +01:00
5ba0eed5ec ensure secrets get passed 2022-06-11 17:42:29 +01:00
ecf2cc7957 just run release instantly for now 2022-06-11 17:40:55 +01:00
081b4b279a only test release 2022-06-11 17:34:13 +01:00
443942e1ea test on push 2022-06-11 17:18:52 +01:00
b21ac6b246 release on tag 2022-06-11 17:17:14 +01:00
40242e185c update pleroma-fe 2022-06-11 17:15:57 +01:00
2abf8c982e fix secret key failure 2022-06-11 16:48:04 +01:00
1b3de39996 lint pipeline 2022-06-11 16:41:15 +01:00
24bf8c3977 mix format 2022-06-11 16:14:31 +01:00
32fbd2e4e3 fix all tests 2022-06-11 16:14:22 +01:00
c3ed86cd1e fix emoji controller tests 2022-06-11 14:21:50 +01:00