summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2019-02-13Merge branch 'doc/mark-streaming-feature-for-apps-2' into 'develop'kaniini
Mark streaming feature for desktop apps in Clients.md See merge request pleroma/pleroma!818
2019-02-13Mark streaming feature for desktop apps in Clients.mdHakaba Hitoyo
2019-02-13Merge branch 'bugfix/mdii-uploader' into 'develop'kaniini
Bugfix for MDII Uploader See merge request pleroma/pleroma!822
2019-02-13bugfix mdii uploaderhakabahitoyo
2019-02-13added checks for public url and follower collectionsKaren Konou
2019-02-12Merge branch 'feature/csp_mastofe-dev' into 'develop'kaniini
Add CSP for mastofe development, remove secure-cookies in MIX_ENV=dev See merge request pleroma/pleroma!820
2019-02-12Plugs.HTTPSecurityPlug: Add webpacker to connect-srcHaelwenn (lanodan) Monnier
2019-02-12Plugs.HTTPSecurityPlug: Add unsafe-eval to script-src when in dev modeHaelwenn (lanodan) Monnier
This is needed to run dev mode mastofe at the same time
2019-02-12config/dev.exs: Don’t put secure cookies on devHaelwenn (lanodan) Monnier
2019-02-12Merge branch 'fix-csp-upgrade-insecure-requests-check' into 'develop'Haelwenn
Fix CSP check for 'upgrade-insecure-requests' See merge request pleroma/pleroma!814
2019-02-12Merge branch 'doc/mark-streaming-feature-for-apps' into 'develop'Haelwenn
Mark streaming feature for mobile/web apps in Clients.md See merge request pleroma/pleroma!816 [ci skip]
2019-02-12Mark streaming feature for mobile/web apps in Clients.mdHakaba Hitoyo
2019-02-12FormattingMark Felder
2019-02-12Fix compileMark Felder
2019-02-11WIP: Fix Twitter CardsMark Felder
Twitter cards were not passing any useful metadata. A few things were being handled on Twitter's end by trying to match OpenGraph tags with their own, but it wasn't working at all for media. This is an attempt to fix that. Common functions have been pulled out of opengraph and put into utils. Twitter's functionality was entirely replaced with a direct copy of Opengraph's and then modified as needed. Profiles are now represented as Summary Cards Posts with images are now represented as Summart with Large Image Cards Posts with video and audio attachments are represented as Player Cards. This now passes the Twitter Card Validator. Validator and Docs are below https://cards-dev.twitter.com/validator https://developer.twitter.com/en/docs/tweets/optimize-with-cards/overview/abouts-cards
2019-02-12Use url[:scheme] instead of protocol to determine if https is enabledshibayashi
2019-02-11Merge branch 'bugfix/keyword-policy-check-summary' into 'develop'kaniini
Filter summary field in KeywordPolicy See merge request pleroma/pleroma!812
2019-02-11Filter summary in keywordpolicyrinpatch
2019-02-11Merge branch 'feature/thread-muting' into 'develop'rinpatch
Feature/thread muting See merge request pleroma/pleroma!796
2019-02-11Merge branch 'feature/rich-media-limits' into 'develop'lambda
rich media: tighten fetching timeouts and size limits See merge request pleroma/pleroma!809
2019-02-11Merge branch 'develop' into feature/thread-mutingKaren Konou
2019-02-11Refactor as per Rin's suggestions, add endpoint testsKaren Konou
2019-02-11Merge branch 'revert-e0de0fcf' into 'develop'lambda
Revert "Merge branch 'object-creation' into 'develop'" See merge request pleroma/pleroma!810
2019-02-11Revert "Merge branch 'object-creation' into 'develop'"lambda
This reverts merge request !802
2019-02-11Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into feature/jobsEgor Kislitsyn
# Conflicts: # lib/pleroma/web/federator/federator.ex # lib/pleroma/web/websub/websub.ex
2019-02-11test: Change `lenght(…) == 0` to `Enum.empty?(…)`Haelwenn (lanodan) Monnier
2019-02-11test: de-group alias/esHaelwenn (lanodan) Monnier
2019-02-10.credo.exs: Add test directory as wellHaelwenn (lanodan) Monnier
2019-02-10rich media: tighten fetching timeouts and size limitsWilliam Pitcock
2019-02-10Merge branch 'update-mastofe/glitch-soc-2019-02-10' into 'develop'kaniini
Update Mastodon Frontend to 2019-02-10 bundle See merge request pleroma/pleroma!806
2019-02-10Merge branch 'feather_mention' into 'develop'kaniini
Add Feather to the clients list See merge request pleroma/pleroma!804
2019-02-10Merge branch 'fix/credo-issues' into 'develop'kaniini
Fix credo issues See merge request pleroma/pleroma!786
2019-02-10Merge branch ↵kaniini
'update-service-files-of-openrc-and-systemd-to-new-recommended-paths' into 'develop' Update service files of OpenRC and systemd to new recommended paths See merge request pleroma/pleroma!798
2019-02-10Update service files of OpenRC and systemd to new recommended pathsshibayashi
2019-02-10Update Mastodon Frontend to 2019-02-10 bundleHaelwenn (lanodan) Monnier
See: https://git.pleroma.social/pleroma/mastofe/tags/bundle-2019-02-10 [ci skip]
2019-02-10add feather to webclientssuccfemboi
2019-02-10Merge branch 'adapt-nginx-acme-path-to-guide-recommendation' into 'develop'lambda
Recommend the acme-challenge path that is used in the installation guides See merge request pleroma/pleroma!803
2019-02-10Merge branch 'docs/pleroma-clients' into 'develop'lambda
docs/Clients.md: Add documentation about clients supporting pleroma See merge request pleroma/pleroma!726
2019-02-10docs/Clients.md: Add NekoniumHaelwenn (lanodan) Monnier
[ci skip]
2019-02-10docs/Clients.md: Add Twidere, Remove SubwayTooter, sort alphabeticallyHaelwenn (lanodan) Monnier
[ci skip]
2019-02-10docs/Clients.md: Add Social (GNOME)Haelwenn (lanodan) Monnier
[ci skip]
2019-02-10docs/Clients.md: Add per-type sectionsHaelwenn (lanodan) Monnier
helps differenciate between Electrons and others like Brutaldon. [ci skip]
2019-02-10docs/Clients.md: Add Brutaldon, Sengi, Halcyon, PinaforeHaelwenn (lanodan) Monnier
2019-02-10WIP: docs/Clients.md: Add documentation about clients supporting pleromaHaelwenn (lanodan) Monnier
[ci skip]
2019-02-10refactor, status view updating, error handlingKaren Konou
2019-02-10Merge branch 'object-creation' into 'develop'rinpatch
Do object insertion through Cachex See merge request pleroma/pleroma!802
2019-02-09Recommend the acme-challenge path that is used in the installation guidesshibayashi
2019-02-09Merge branch 'follow-enhancements' into 'develop'kaniini
Respect blocks in mass follow. See merge request pleroma/pleroma!797
2019-02-09Do object insertion through Cachexlain
So we don't flood our postgres logs with errors. Should also make things slightly faster.
2019-02-09Add unique index and unique constraint check, uniqueness test failsKaren Konou