summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2019-03-11Linting.lain
2019-03-11WebPush: Add activity id to the push messages.lain
Makes it easier to relate the push to a given status.
2019-03-11MastoAPI Accounts: Add fetching by nickname.lain
This is to make it easier for the frontends to handle domain.com/users/nickname urls.
2019-03-11Merge branch 'add-local-field-to-status' into 'develop'lambda
MastoAPI StatusView: Add locality indicator. See merge request pleroma/pleroma!920
2019-03-11Update Differences-in-MastodonAPI-Responses.mdlambda
2019-03-11Merge branch 'feat/style-oauth-login-page' into 'develop'lambda
Style again the OAuth login page to fit pleroma more See merge request pleroma/pleroma!921
2019-03-11Merge branch 'broadcast-activity-id-on-deletion' into 'develop'lambda
Broadcast proper deleted activity id to conform to MastoAPI streaming spec See merge request pleroma/pleroma!917
2019-03-11Merge branch 'fix/roma-links-clients-md' into 'develop'lambda
Update homepages and provide source code links for Roma apps in Clients.md See merge request pleroma/pleroma!919
2019-03-11Remove chromium input hilight that clashes with our ownShpuld Shpuldson
2019-03-11Style again the login page to fit pleroma moreShpuld Shpuldson
2019-03-11MastoAPI StatusView: Add locality indicator.lain
2019-03-11Broadcast deleted activity id on deletion to conform to MastoAPI streamig speceugenijm
2019-03-11Change order of source code to align with platformsrinpatch
2019-03-11Update homepages and provide source code links for Roma apps in Clients.mdrinpatch
2019-03-11Merge branch 'patch-2' into 'develop'rinpatch
[Doc] Rename Mastalab -> Fedilab in Clients.md See merge request pleroma/pleroma!918
2019-03-11Rename Mastalab -> Fedilab in Clients.mdHakaba Hitoyo
2019-03-08Merge branch 'bugfix/tesla-safety' into 'develop'kaniini
tesla hardening Closes #712 and #672 See merge request pleroma/pleroma!912
2019-03-08http: connection: unify adapter configuration and defaultsWilliam Pitcock
2019-03-08http: connection: relax the timeouts a littleWilliam Pitcock
2019-03-08http: rework connection timeouts to match hackney docs, enforce 1 second max ↵William Pitcock
TCP connection timeout
2019-03-08http: actually pass the options list to the Connection factoryWilliam Pitcock
2019-03-08http: connection: merge hackney option lists instead of concatenating themWilliam Pitcock
this ensures the right pools are used
2019-03-08http: safely catch erlang exits and elixir errors from hackney (ref #672)William Pitcock
2019-03-08Merge branch 'fix-tlsv1.3' into 'develop'kaniini
Fix supported TLS versions as TLS 1.3 support seems buggy. Closes #708 See merge request pleroma/pleroma!892
2019-03-08Merge branch 'delete-status' into 'develop'kaniini
Allow an admin to delete a user status #721 (MastoAPI) See merge request pleroma/pleroma!914
2019-03-08Merge branch 'fetch-posts-on-first-federation' into 'develop'kaniini
Fetch user's outbox posts on first federation with that user Closes #131 See merge request pleroma/pleroma!907
2019-03-08Allow an admin to delete a user statuseugenijm
2019-03-08Add tests for fetch_ordered_collectionEkaterina Vaartis
2019-03-08Fetch user's outbox posts on first federation with that userEkaterina Vaartis
2019-03-08priv/static/images: Add pleroma-tanHaelwenn (lanodan) Monnier
Source: https://shitposter.club/objects/9be7c3f4-5a29-45a9-ac40-301312578a02 pleroma-fox-tan-smol.png is pleroma-fox-tan.png but the width got divided by two in The GIMP. All the pleroma*.png got optimised with mat2 and optipng/pngcrush, depending on their best results. [ci skip]
2019-03-08Merge branch 'update-mastofe/glitch-soc-2019-03-07' into 'develop'kaniini
Update Mastodon Frontend to 2019-03-07 bundle See merge request pleroma/pleroma!911
2019-03-08Update Mastodon Frontend to 2019-03-07 bundleHaelwenn (lanodan) Monnier
See: https://git.pleroma.social/pleroma/mastofe/tags/bundle-2019-03-07 [ci skip]
2019-03-07Merge branch 'bugfix/mrf-antifollowbot-nil-bio' into 'develop'rinpatch
MRF: anti followbot: gracefully handle nil display names See merge request pleroma/pleroma!909
2019-03-07Merge branch 'update/pleroma-fe-20190307' into 'develop'kaniini
update pleroma frontend See merge request pleroma/pleroma!910
2019-03-07update pleroma frontendWilliam Pitcock
2019-03-07tests: add regression testWilliam Pitcock
2019-03-07MRF: anti followbot: gracefully handle accounts without a display nameWilliam Pitcock
2019-03-07Merge branch 'bugfix/delete-activity-audience' into 'develop'rinpatch
expand the audience of delete activities to all recipients of the deleted object Closes #682 See merge request pleroma/pleroma!891
2019-03-07Adjust delete activity audience to match the deleted objectKaren Konou
2019-03-07Revert existing object checkKaren Konou
2019-03-07Merge branch 'preserve-link-headers' into 'develop'lambda
Preserves parameters in link headers Closes #716 See merge request pleroma/pleroma!908
2019-03-07Preserve parameters in link headers (Mastodon API)eugenijm
2019-03-06Merge branch 'chore/merge-search-into-list-users' into 'develop'kaniini
Merge search endpoint into /users See merge request pleroma/pleroma!898
2019-03-06Merge branch 'bugfix/connect-src-https' into 'develop'kaniini
Plugs.HTTPSecurityPlug: Add static_url to CSP's connect-src See merge request pleroma/pleroma!900
2019-03-06Merge branch 'bugfix/rel-me_list' into 'develop'kaniini
Web.RelMe: Fix having other values in rel attr See merge request pleroma/pleroma!901
2019-03-06Merge branch 'feature/647' into 'develop'kaniini
[#647] tests for web push See merge request pleroma/pleroma!904
2019-03-06[#647] tests for web pushMaksim
2019-03-06Merge branch 'features/masto_fe-config' into 'develop'kaniini
Add default config for masto_fe See merge request pleroma/pleroma!906
2019-03-06Keep heading shortMaxim Filippov
2019-03-06Merge branch 'fix/escape-reserved-chars-in-filenames' into 'develop'Haelwenn
Properly escape reserved URI charachters in upload urls Closes #700 See merge request pleroma/pleroma!905