itepechi/akkoma
1
0
Fork 0
Code Issues Pull requests Releases Activity
12461 commits 3 branches 2 tags 277 MiB
Commit graph

12461 commits

This branch
This branch
All branches
Author SHA1 Message Date
feld
86b4149a13 Merge branch '1668-prometheus-access-restrictions' into 'develop' 
[#1668] App metrics endpoint (Prometheus) access restrictions

Closes #1668

See merge request pleroma/pleroma!3093
 2020-11-05 16:22:35 +03:00
rinpatch
5f27a39152 Merge branch '2242-nsfw-case' into 'develop' 
Resolve "Posts tagged with #NSFW from GS aren't marked as sensitive"

Closes #2242

See merge request pleroma/pleroma!3094
 2020-11-05 16:19:44 +03:00
feld
88dc1d24b9 Merge branch 'issue/2261' into 'develop' 
[#2261] FrontStatic plug: excluded invalid url

See merge request pleroma/pleroma!3106
 2020-11-05 16:18:56 +03:00
lain
294628d981 Merge branch 'feature/expire-mutes' into 'develop' 
Expiring mutes for users and activities

Closes #1817

See merge request pleroma/pleroma!2971
 2020-11-05 12:44:16 +00:00
lain
9b2ed14277 Docs: Add info about expiring mutes. 2020-11-05 13:23:58 +01:00
lain
4e7418d963 Merge branch 'stats-genserver-fix' into 'develop' 
don't run  Stats GenServer updates in tests

See merge request pleroma/pleroma!2976
 2020-11-04 16:15:04 +00:00
lain
5ddf0be208 Changelog: Add info about admin email user link changes. 2020-11-04 17:13:34 +01:00
lain
6d850c46dc AdminEmail: Use AP id as user url. 2020-11-04 17:12:47 +01:00
lain
d8d4e96230 Merge branch 'default-mrf' into 'develop' 
Add TagPolicy as default MRF

See merge request pleroma/pleroma!2834
 2020-11-04 15:54:12 +00:00
lain
7bbc328d66 Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into stats-genserver-fix 2020-11-04 16:52:30 +01:00
lain
dd2b3a8da9 Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into feature/expire-mutes 2020-11-04 16:51:42 +01:00
lain
78cea44553 Merge branch 'ejabberd-pleroma-auth' into 'develop' 
Add ejabberd auth document

See merge request pleroma/pleroma!3074
 2020-11-04 15:42:48 +00:00
lain
4800ee656b Merge branch 'features/federation-status' into 'develop' 
Add a federation_status endpoint showing unreachable instances

See merge request pleroma/pleroma!3086
 2020-11-04 15:00:52 +00:00
lain
5db4c823b2 Merge branch 'restrict-domain' into 'develop' 
View a remote server's timeline

See merge request pleroma/pleroma!2713
 2020-11-04 14:54:53 +00:00
Ivan Tashkinov
73e66fd31f Merge remote-tracking branch 'remotes/origin/develop' into auth-improvements 2020-11-04 17:48:10 +03:00
Haelwenn
9c09ea01aa Merge branch '2284-voters-count' into 'develop' 
Always return voters_count in polls

See merge request pleroma/pleroma!3120
 2020-11-04 14:44:45 +00:00
lain
eb1e1e7494 Changelog: Add info about federation status endpoint 2020-11-04 15:39:32 +01:00
lain
504a829edb Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into features/federation-status 2020-11-04 15:38:10 +01:00
lain
cb3cd3a761 TopicsTest: Small addition. 2020-11-04 15:24:10 +01:00
rinpatch
7058cac1c2 Merge branch '2257-self-chat' into 'develop' 
Resolve "Can't message yourself in a chat (but can start it)"

Closes #2257

See merge request pleroma/pleroma!3099
 2020-11-04 17:12:37 +03:00
feld
6c8469664a Merge branch 'chore/elixir-1.11' into 'develop' 
Elixir 1.11 compatibility / Phoenix 1.5+

See merge request pleroma/pleroma!3059
 2020-11-04 17:05:21 +03:00
lain
329aa19c9f Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into alexgleason/pleroma-restrict-domain 2020-11-04 15:05:01 +01:00
feld
49b43e668e Merge branch 'instance-docs' into 'develop' 
AdminAPI: Allow to modify Terms of Service and Instance Panel via Admin API

Closes #1516

See merge request pleroma/pleroma!2931
 2020-11-04 17:00:50 +03:00
feld
fa6ad67397 Merge branch 'tesla-get-to-pleroma' into 'develop' 
Use Pleroma.HTTP instead of Tesla

Closes #2275

See merge request pleroma/pleroma!3113
 2020-11-04 16:57:37 +03:00
lain
bc4d9c4ffc Merge branch 'hide-muted-chats' into 'develop' 
Hide chats from muted users

Closes #2230

See merge request pleroma/pleroma!3116
 2020-11-04 13:48:15 +00:00
Egor Kislitsyn
ca95cbe0b4
Add with_muted param to ChatController.index/2 2020-11-04 16:40:12 +04:00
lain
e46c95b826 Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into frontend-admin-api 2020-11-04 13:23:18 +01:00
lain
c7bcbfbc1d Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into feature/local-only-scope 2020-11-04 11:47:41 +01:00
lain
92d252f364 Poll Schema: Update and fix. 2020-11-04 10:20:09 +01:00
lain
f09bb814a9 Changelog: Add info about poll view changes 2020-11-04 10:14:48 +01:00
lain
1cfc3278c0 Poll View: Always return voters_count. 2020-11-04 10:14:00 +01:00
lain
ba3f3a5a56 Merge branch 'chores/pleroma-favicon-logo' into 'develop' 
favicon: Use images/pleroma_logo_vector_bg_32.png from pleroma.social

Closes #2270

See merge request pleroma/pleroma!3115
 2020-11-03 13:12:39 +00:00
lain
f7a3dcd320 Merge branch 'patch-4' into 'develop' 
ConversationView: add current user to conversations, according to Mastodon behaviour, fix last_status.account being not filled

Closes #2217

See merge request pleroma/pleroma!3089
 2020-11-03 13:11:36 +00:00
lain
c37118e6f2 Conversations: A few refactors 2020-11-03 13:56:12 +01:00
lain
91f6c32430 Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into a1batross/pleroma-patch-4 2020-11-03 13:45:09 +01:00
Haelwenn (lanodan) Monnier
179936609f
favicon: Update to pleroma logo, provided by @shpuld 
Closes: https://git.pleroma.social/pleroma/pleroma/-/issues/2270
 2020-11-03 09:52:17 +01:00
Haelwenn
0d8cc0905a Merge branch 'fix/get_report_with_notes' into 'develop' 
Permit fetching individual reports with notes preloaded

See merge request pleroma/pleroma!3118
 2020-11-03 01:00:12 +00:00
feld
0fd2830fe1 Merge branch 'chore/deps-from-git' into 'develop' 
Ensure URLs for git repos end in .git for older git clients like on CentOS 7

See merge request pleroma/pleroma!3119
 2020-11-02 23:28:16 +00:00
Mark Felder
2f2281fdf1 Ensure URLs for git repos end in .git for older git clients like on CentOS 7 2020-11-02 17:09:56 -06:00
Mark Felder
53dd048590 Test the note is returned when fetching a single report 2020-11-02 15:49:07 -06:00
Mark Felder
7efc074ead Permit fetching individual reports with notes preloaded 2020-11-02 13:06:59 -06:00
Egor Kislitsyn
be52819a11
Hide chats from muted users 2020-11-02 17:51:54 +04:00
lain
24ce324973 Merge branch 'bugfix/poll_replies_count' into 'develop' 
side_effects: Don’t increase_replies_count when it’s an Answer

Closes #2274

See merge request pleroma/pleroma!3114
 2020-11-02 12:08:20 +00:00
minibikini
6163fbf553 Merge branch 'develop' into 'frontend-admin-api' 
# Conflicts:
#   lib/pleroma/web/router.ex
 2020-11-02 10:43:45 +00:00
Haelwenn (lanodan) Monnier
4caad4e910
side_effects: Don’t increase_replies_count when it’s an Answer 2020-11-02 05:56:17 +01:00
feld
9fbe9ef774 Merge branch 'tesla-get-to-pleroma' into 'develop' 
Use Pleroma.HTTP instead of Tesla

Closes #2275

See merge request pleroma/pleroma!3113
 2020-11-01 19:31:17 +00:00
Ekaterina Vaartis
8f00d90f91 Use Pleroma.HTTP instead of Tesla 
Closes #2275

As discovered in the issue, captcha used Tesla.get instead of
Pleroma.HTTP. I've also grep'ed the repo and changed the other place
where this was used.
 2020-11-01 12:05:39 +03:00
feld
38b481d112 Merge branch 'feature/account-export' into 'develop' 
Add account export

Closes #847

See merge request pleroma/pleroma!2918
 2020-10-31 17:03:40 +00:00
feld
37e8e8bf8e Merge branch 'idempotency-key-optimistic-posting' into 'develop' 
Add `idempotency_key` to the chat message entity

Closes #2126

See merge request pleroma/pleroma!3015
 2020-10-31 17:01:29 +00:00
Ivan Tashkinov
04f6b48ac1 Auth subsystem refactoring and tweaks. 
Added proper OAuth skipping for SessionAuthenticationPlug. Integrated LegacyAuthenticationPlug into AuthenticationPlug. Adjusted tests & docs.
 2020-10-31 13:38:35 +03:00