aboutsummaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2020-11-06Move TransmogrifierTest for Note to NoteHandlingTestHaelwenn (lanodan) Monnier
2020-11-05CHANGELOG.md: Add an entry for the spoofing fixrinpatch
2020-11-05Merge branch 'fix/object-attachment-spoof' into 'develop'rinpatch
Fix object spoofing vulnerability in attachments See merge request pleroma/secteam/pleroma!18
2020-11-05Merge branch '2236-no-name' into 'develop'Haelwenn
Resolve "Account cannot be fetched by some instances" Closes #2236 See merge request pleroma/pleroma!3101
2020-11-05phoenix_controller_render_duration is no longer available in telemetry of ↵Mark Felder
Phoenix 1.5+
2020-11-05Merge branch 'ostatus-controller-no-auth-check-on-non-federating-instances' ↵feld
into 'develop' OStatus / Static FE access control fixes See merge request pleroma/pleroma!3053
2020-11-05Merge branch '1668-prometheus-access-restrictions' into 'develop'feld
[#1668] App metrics endpoint (Prometheus) access restrictions Closes #1668 See merge request pleroma/pleroma!3093
2020-11-05Merge branch '2242-nsfw-case' into 'develop'rinpatch
Resolve "Posts tagged with #NSFW from GS aren't marked as sensitive" Closes #2242 See merge request pleroma/pleroma!3094
2020-11-05Merge branch 'issue/2261' into 'develop'feld
[#2261] FrontStatic plug: excluded invalid url See merge request pleroma/pleroma!3106
2020-11-05Merge branch 'feature/expire-mutes' into 'develop'lain
Expiring mutes for users and activities Closes #1817 See merge request pleroma/pleroma!2971
2020-11-05Docs: Add info about expiring mutes.lain
2020-11-04Merge branch 'stats-genserver-fix' into 'develop'lain
don't run Stats GenServer updates in tests See merge request pleroma/pleroma!2976
2020-11-04Changelog: Add info about admin email user link changes.lain
2020-11-04AdminEmail: Use AP id as user url.lain
2020-11-04Merge branch 'default-mrf' into 'develop'lain
Add TagPolicy as default MRF See merge request pleroma/pleroma!2834
2020-11-04Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into ↵lain
stats-genserver-fix
2020-11-04Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into ↵lain
feature/expire-mutes
2020-11-04Merge branch 'ejabberd-pleroma-auth' into 'develop'lain
Add ejabberd auth document See merge request pleroma/pleroma!3074
2020-11-04Merge branch 'features/federation-status' into 'develop'lain
Add a federation_status endpoint showing unreachable instances See merge request pleroma/pleroma!3086
2020-11-04Merge branch 'restrict-domain' into 'develop'lain
View a remote server's timeline See merge request pleroma/pleroma!2713
2020-11-04Merge branch '2284-voters-count' into 'develop'Haelwenn
Always return voters_count in polls See merge request pleroma/pleroma!3120
2020-11-04Changelog: Add info about federation status endpointlain
2020-11-04Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into ↵lain
features/federation-status
2020-11-04TopicsTest: Small addition.lain
2020-11-04Merge branch '2257-self-chat' into 'develop'rinpatch
Resolve "Can't message yourself in a chat (but can start it)" Closes #2257 See merge request pleroma/pleroma!3099
2020-11-04Merge branch 'chore/elixir-1.11' into 'develop'feld
Elixir 1.11 compatibility / Phoenix 1.5+ See merge request pleroma/pleroma!3059
2020-11-04Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into ↵lain
alexgleason/pleroma-restrict-domain
2020-11-04Merge branch 'instance-docs' into 'develop'feld
AdminAPI: Allow to modify Terms of Service and Instance Panel via Admin API Closes #1516 See merge request pleroma/pleroma!2931
2020-11-04Merge branch 'tesla-get-to-pleroma' into 'develop'feld
Use Pleroma.HTTP instead of Tesla Closes #2275 See merge request pleroma/pleroma!3113
2020-11-04Merge branch 'hide-muted-chats' into 'develop'lain
Hide chats from muted users Closes #2230 See merge request pleroma/pleroma!3116
2020-11-04Add `with_muted` param to ChatController.index/2Egor Kislitsyn
2020-11-04Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into ↵lain
frontend-admin-api
2020-11-04Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into ↵lain
feature/local-only-scope
2020-11-04Poll Schema: Update and fix.lain
2020-11-04Changelog: Add info about poll view changeslain
2020-11-04Poll View: Always return `voters_count`.lain
2020-11-03Merge branch 'chores/pleroma-favicon-logo' into 'develop'lain
favicon: Use images/pleroma_logo_vector_bg_32.png from pleroma.social Closes #2270 See merge request pleroma/pleroma!3115
2020-11-03Merge branch 'patch-4' into 'develop'lain
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-03Conversations: A few refactorslain
2020-11-03Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into ↵lain
a1batross/pleroma-patch-4
2020-11-03favicon: Update to pleroma logo, provided by @shpuldHaelwenn (lanodan) Monnier
Closes: https://git.pleroma.social/pleroma/pleroma/-/issues/2270
2020-11-03Merge branch 'fix/get_report_with_notes' into 'develop'Haelwenn
Permit fetching individual reports with notes preloaded See merge request pleroma/pleroma!3118
2020-11-02Merge branch 'chore/deps-from-git' into 'develop'feld
Ensure URLs for git repos end in .git for older git clients like on CentOS 7 See merge request pleroma/pleroma!3119
2020-11-02Ensure URLs for git repos end in .git for older git clients like on CentOS 7Mark Felder
2020-11-02Test the note is returned when fetching a single reportMark Felder
2020-11-02Permit fetching individual reports with notes preloadedMark Felder
2020-11-02Hide chats from muted usersEgor Kislitsyn
2020-11-02Merge branch 'bugfix/poll_replies_count' into 'develop'lain
side_effects: Don’t increase_replies_count when it’s an Answer Closes #2274 See merge request pleroma/pleroma!3114
2020-11-02Merge branch 'develop' into 'frontend-admin-api'minibikini
# Conflicts: # lib/pleroma/web/router.ex
2020-11-02side_effects: Don’t increase_replies_count when it’s an AnswerHaelwenn (lanodan) Monnier
generated by cgit v1.2.3 (git 2.26.2) at 2025-04-23 21:23:37 +0000