aboutsummaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2019-01-28Don't run warnings in a task.lain
2019-01-28Change default bg image in new config.lain
2019-01-28Merge branch 'safe-render-activities' into 'develop'Haelwenn
remove unnecessary filter (re !723) See merge request pleroma/pleroma!729
2019-01-28re f83bae7c: remove unnecessary filterhref
2019-01-28Add deprecation warning mechanism.lain
2019-01-28Merge branch 'oauth-login-failure-bug' into 'develop'href
Correctly handle invalid credentials on auth login. Closes #407 See merge request pleroma/pleroma!728
2019-01-28Correctly handle invalid credentials on auth login.lain
Closes #407
2019-01-28Merge branch 'patch-2' into 'develop'Haelwenn
Update the openrc service's retry with the correct format See merge request pleroma/pleroma!727
2019-01-28Update the openrc service's retry with the correct formatvaartis
2019-01-28[#534] Refactoring / tweaks per MR review.Ivan Tashkinov
2019-01-28mastodon api: card: force OGP images through mediaproxyWilliam Pitcock
2019-01-28test: add status posting with OGP link preview testWilliam Pitcock
2019-01-28rich media: helpers: clean up unused aliasesWilliam Pitcock
2019-01-28activitypub: prime OGP crawler cache when new messages are inserted into the ↵William Pitcock
database
2019-01-28rich media: add helpers module, use instead of MastodonAPI moduleWilliam Pitcock
2019-01-28mastodon api: formattingWilliam Pitcock
2019-01-28API: kill /api/rich_media/parse endpointWilliam Pitcock
2019-01-28test: update twitterapi testsWilliam Pitcock
2019-01-28twitter api: fix up activity representerWilliam Pitcock
2019-01-28test: update mastodon status view testsWilliam Pitcock
2019-01-28rich media: add try/rescue to ensure we catch parsing and fetching failuresWilliam Pitcock
2019-01-28twitter api: embed card in twitterapi postsWilliam Pitcock
2019-01-28mastodon api: embed card in status objectWilliam Pitcock
2019-01-28mastodon api: factor out status card fetching, move status card rendering to ↵William Pitcock
statusview, add opengraph extended data
2019-01-28[MastoAPI][GlitchAPI] Add bookmarksHaelwenn (lanodan) Monnier
2019-01-28/web/index template: Modify for glitch-socHaelwenn (lanodan) Monnier
2019-01-27Merge branch 'notice-404-to-fe' into 'develop'rinpatch
/notice/:id - send the FE index even if 404 See merge request pleroma/pleroma!725
2019-01-27/notice/:id - send the FE index even if 404href
this allows to open private activities by URL when you are logged in, and to let the FE display a 404 page
2019-01-27Merge branch 'safe-render-activities' into 'develop'lambda
Views: wrap activity rendering in a rescue See merge request pleroma/pleroma!723
2019-01-27Fix objects.lain
2019-01-27Merge branch 'discard-invalid-likes' into 'develop'kaniini
Transmogrifier: fix incoming objects with invalid likes See merge request pleroma/pleroma!724
2019-01-27Transmogrifier: fix incoming objects with invalid likeshref
2019-01-27Views: wrap activity rendering in a rescuehref
this avoids complete timeline breakage when an activity fucks up rendering.
2019-01-27Merge branch 'hotfix/favorites-index' into 'develop'kaniini
add activities likes index, fixes favorites API call See merge request pleroma/pleroma!722
2019-01-27Merge branch 'flake-random-worker-id' into 'develop'kaniini
Flake: random worker id See merge request pleroma/pleroma!721
2019-01-27add activities likes index, fixes favorites API callWilliam Pitcock
2019-01-27Flake: random worker idhref
2019-01-27Merge branch 'docs/emoji-endpoint-similarities' into 'develop'rinpatch
docs/Pleroma-API.md: Add note about emoji endpoints similarities See merge request pleroma/pleroma!720
2019-01-27docs/Pleroma-API.md: Add note about emoji endpoints similaritiesHaelwenn (lanodan) Monnier
[ci skip]
2019-01-27Merge branch 'features/mastoapi-multi-hashtag' into 'develop'kaniini
MastodonAPI multi-hashtag See merge request pleroma/pleroma!652
2019-01-27Merge branch 'features/masto-account-view-rights' into 'develop'Haelwenn
Web.MastodonAPI.AccountView: Add is_moderator and is_admin Closes #557 See merge request pleroma/pleroma!718
2019-01-27Web.MastodonAPI.AccountView: Add is_moderator and is_adminHaelwenn (lanodan) Monnier
Closes: https://git.pleroma.social/pleroma/pleroma/issues/557
2019-01-26Merge branch 'hardening/mastodon-rich-media' into 'develop'Haelwenn
rich media: minor hardening See merge request pleroma/pleroma!717
2019-01-26Merge branch 'webpush-endpoint-size' into 'develop'kaniini
Change webpush endpoint to unlimited varchar Closes #552 See merge request pleroma/pleroma!716
2019-01-26rich media: gracefully handle fetching nil URIsWilliam Pitcock
2019-01-26Change webpush endpoint to unlimited varcharhref
Fixes #552
2019-01-26Merge branch 'flake-from-int' into 'develop'kaniini
Flake: support integers in from_string/1 See merge request pleroma/pleroma!715
2019-01-26Flake: support integers in from_string/1href
Some previously issued stateless tokens have integer ids in them.
2019-01-26Merge branch 'join-in-preloads' into 'develop'kaniini
Join on preloads to avoid N+1 queries See merge request pleroma/pleroma!714
2019-01-26Merge branch 'features/mastoapi-cards' into 'develop'kaniini
MastoAPI: Add Rich-Media support See merge request pleroma/pleroma!664