limepotato/akkoma
1
0
Fork 0
Code Pull requests Activity
14578 commits 27 branches 107 tags 315 MiB
Commit graph

204 commits

Author SHA1 Message Date
floatingghost
1f6deb0ef4 include local instance in bubble timeline (#117) 
Reviewed-on: https://akkoma.dev/AkkomaGang/akkoma/pulls/117
 2022-07-26 12:22:49 +00:00
floatingghost
1419eee5df Quote posting (#113) 
Reviewed-on: https://akkoma.dev/AkkomaGang/akkoma/pulls/113
 2022-07-25 16:30:06 +00:00
floatingghost
cb6e7359af add bubble timeline (#100) 
Reviewed-on: https://akkoma.dev/AkkomaGang/akkoma/pulls/100
 2022-07-22 14:55:38 +00:00
FloatingGhost
0f132b802d purge chat and shout endpoints 2022-07-21 11:29:28 +01:00
floatingghost
dc9f66749c remove all endpoints marked as deprecated (#91) 
Reviewed-on: https://akkoma.dev/AkkomaGang/akkoma/pulls/91
 2022-07-20 12:00:58 +00:00
floatingghost
54ed8760ff Merge branch 'from/upstream-develop/tusooa/server-announcements' into 'develop' (#85) 
Reviewed-on: https://akkoma.dev/AkkomaGang/akkoma/pulls/85
 2022-07-18 13:08:36 +00:00
floatingghost
5b4d77eaa7 maintenance: dependency upgrade (#81) 
Reviewed-on: https://akkoma.dev/AkkomaGang/akkoma/pulls/81
 2022-07-18 00:56:35 +00:00
Tusooa Zhu
72bdb0640f Allow user to register with custom language 2022-06-29 20:46:51 +01:00
floatingghost
2342fface1 Add visibility check in context path (#26) 
Reviewed-on: https://akkoma.dev/AkkomaGang/akkoma/pulls/26
 2022-06-29 09:33:57 +00:00
FloatingGhost
cad4ba2ab3 mix format 2022-06-22 17:20:55 +01:00
sn0w
f2f8b81fc4
Use mediaproxy for emoji notifications if enabled 2022-06-17 14:27:22 +02:00
FloatingGhost
abefbcec64 Merge branch 'mfm' into develop 2022-06-14 16:25:47 +01:00
FloatingGhost
829ae13572 ensure tests pass 2022-06-14 16:24:03 +01:00
sn0w
60bfaed368
Allow reacting with emojis containing a number 2022-06-14 11:47:09 +02:00
FloatingGhost
0f5bea2465 Add emoji_url to notifications to allow rendering 
Ref #5
 2022-06-12 13:35:14 +01:00
FloatingGhost
24bf8c3977 mix format 2022-06-11 16:14:31 +01:00
FloatingGhost
32fbd2e4e3 fix all tests 2022-06-11 16:14:22 +01:00
FloatingGhost
0d012ebea1 Revert "Merge branch 'remove/mastofe' into 'develop'" 
This reverts commit 6b3842cf50, reversing
changes made to 6b1282a829.
 2022-01-08 21:44:37 +00:00
marcin mikołajczak
746c9daa62 Merge remote-tracking branch 'pleroma/develop' into mastodon-lookup 
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
 2021-12-28 16:27:27 +01:00
marcin mikołajczak
f734579965 MastoAPI: Add GET /api/v1/accounts/lookup 
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
 2021-12-28 16:11:17 +01:00
Alex Gleason
2e4a1c56c3
AppController: test creating with and without a user 2021-12-27 18:14:15 -06:00
marcin mikołajczak
de006443f0 MastoAPI: Profile directory 2021-12-26 02:35:17 +00:00
Alex Gleason
73609211a4 Merge branch 'account-notes' into 'develop' 
MastoAPI: Add user notes on accounts

See merge request pleroma/pleroma!3540
 2021-12-25 01:41:12 +00:00
Alex Gleason
b96a58ff28 Merge branch 'account-subscriptions' into 'develop' 
MastoAPI: accept notify param in follow request

See merge request pleroma/pleroma!3555
 2021-12-25 01:34:27 +00:00
Alex Gleason
bd853199d9 Merge branch 'v2-suggestions' into 'develop' 
V2 suggestions

See merge request pleroma/pleroma!3547
 2021-12-19 17:31:17 +00:00
marcin mikołajczak
c96e52b88c Add 'notifying' to relationship for compatibility with Mastodon 
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
 2021-12-06 21:24:12 +01:00
marcin mikołajczak
3892bd353b Add test for following with subscription 
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
 2021-12-06 21:15:03 +01:00
Alex Gleason
6519f59d91
v2 Suggestions: return is_suggested through the API 2021-11-26 23:10:01 -06:00
Alex Gleason
e5a7547fbe
v2 Suggestions: also filter out users you follow 2021-11-26 21:46:08 -06:00
Alex Gleason
437c1a5a52
v2 Suggestions: actually flter out dismissed suggestions 2021-11-26 21:09:37 -06:00
Alex Gleason
aee55b9a8b
v2 Suggestions: dismiss a suggestion 2021-11-26 20:19:29 -06:00
Alex Gleason
b17360cd7c
v2 Suggestions: rudimentary API response 2021-11-26 14:34:10 -06:00
Alex Gleason
7e1caddc58
v2 Suggestions: return empty array 2021-11-25 14:57:36 -06:00
marcin mikołajczak
cb76faece9 Update test 
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
 2021-11-21 17:51:00 +01:00
marcin mikołajczak
40414bf177 MastoAPI: Add user notes on accounts 
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
 2021-11-21 16:56:26 +01:00
lain
e2772d6bf1 Merge branch 'block-behavior' into 'develop' 
Configurable block visibility, fixes #2123

Closes #2123

See merge request pleroma/pleroma!3242
 2021-11-15 14:27:59 +00:00
Haelwenn (lanodan) Monnier
a17910a6c6
CI: Bump lint stage to elixir-1.12 
Elixir 1.12 changed formatting rules, this allows to avoid having to rollback to run `mix format`
 2021-10-06 08:11:05 +02:00
Haelwenn
6b3842cf50 Merge branch 'remove/mastofe' into 'develop' 
Remove MastoFE from Pleroma, fixes #2625

Closes #2625

See merge request pleroma/pleroma!3392
 2021-09-07 16:41:53 +00:00
Alex Gleason
62bf6d67e3
Merge remote-tracking branch 'pleroma/develop' into poll-notification-fixes 2021-07-18 11:49:22 -05:00
Alex Gleason
0114754db2
MastodonAPI: Support poll notification 2021-07-17 22:19:38 -05:00
Sean King
9758f636b2 Delete MastoFE Controller Test 2021-07-10 11:13:25 -06:00
Sean King
5d279a22b1 Merge develop branch upstream 2021-07-10 11:04:16 -06:00
Haelwenn (lanodan) Monnier
fc6ab78a84
Add test on changing [:instance, :upload_limit] 2021-06-22 12:25:25 +02:00
Sean King
dc4814f0cd
Fix merge conflicts with upstream 2021-06-04 14:42:44 -06:00
Haelwenn
0c56f9de0d Merge branch 'tests/openapi-everywhere' into 'develop' 
Put OpenAPI ~everywhere in tests

See merge request pleroma/pleroma!3324
 2021-06-04 18:53:09 +00:00
Mark Felder
ff00b354fa Rename the non-federating Chat feature to Shout 2021-06-01 11:49:14 -05:00
Alex Gleason
c435de426d
Merge remote-tracking branch 'pleroma/develop' into cycles-constants 2021-06-01 11:33:11 -05:00
Alex Gleason
f2134e605b
Merge remote-tracking branch 'pleroma/develop' into cycles-base-url 2021-05-31 16:49:46 -05:00
Alex Gleason
51a9f97e87
Deprecate Pleroma.Web.base_url/0 
Use Pleroma.Web.Endpoint.url/0 directly instead. Reduces compiler cycles.
 2021-05-31 16:48:03 -05:00
Alex Gleason
10dfe81479
Pleroma.Constants.as_local_public/0 --> Pleroma.Web.ActivityPub.Utils.as_local_public/0 
Move as_local_public/0 to stop making modules depend on Web at compile-time
 2021-05-31 13:39:15 -05:00