summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2018-12-17don't re-use buildlain
2018-12-17Fix tagging problems for existing instances.lain
2018-12-17Merge branch 'testfix/webfinger-jrd' into 'develop'lambda
WebFinger: Sends a 400 when resource param is missing, fix XRD typo in test See merge request pleroma/pleroma!554
2018-12-16Merge branch 'netbsd-script' into 'develop'scarlett
Add an rc.d script for NetBSD. See merge request pleroma/pleroma!558
2018-12-16Simplify the NetBSD rc script.scarlett
2018-12-16Add an rc.d script for NetBSD.scarlett
2018-12-16Merge branch 'develop' into 'develop'Haelwenn
Added init file for OpenBSD See merge request pleroma/pleroma!549
2018-12-16Merge branch 'fix/masto-put-settings' into 'develop'eal
Mastodon API: Fix PUT /api/web/settings See merge request pleroma/pleroma!557
2018-12-16Mastodon API: Fix PUT /api/web/settingseal
2018-12-16Merge branch 'fix/dev-exs-enable-unsecure-cookies-by-default' into 'develop'eal
Enable unsecure cookies by default in dev.exs See merge request pleroma/pleroma!556
2018-12-16Enable unsecure cookies by default in dev.exsRin Toshaka
2018-12-15Update/add OpenBSD config filesnonlinear
2018-12-15WebFinger: Sends a 400 when resource param is missing, fix XRD typo in testHaelwenn (lanodan) Monnier
2018-12-15Merge branch 'bugfix/webfinger-jrd' into 'develop'lambda
Fix requesting application/jrd+json on webfinger See merge request pleroma/pleroma!553
2018-12-15Merge branch 'fix/views-ignore-unhandled-activites' into 'develop'lambda
TwitterAPI.ActivityView: Ignore unhandled activities See merge request pleroma/pleroma!547
2018-12-15Merge branch 'tests-warning-as-errors' into 'develop'lambda
Enable warnings_as_errors for tests See merge request pleroma/pleroma!548
2018-12-15Merge branch 'feature/mix-task-instance-port-specification' into 'develop'lambda
Allow port specification in `instance.ex` config generator See merge request pleroma/pleroma!552
2018-12-15Web.WebFinger.WebFingerControllerTest: test against XML and JRD webfinger ↵Haelwenn (lanodan) Monnier
endpoints
2018-12-15config/config.exs: Add application/jrd+json => jrd+json to fix webfingerHaelwenn (lanodan) Monnier
Closes: https://git.pleroma.social/pleroma/pleroma/merge_requests/551
2018-12-15Allow port specification in instance.exRin Toshaka
2018-12-14Added init file for OpenBSDnonlinear
2018-12-14Merge branch 'fix/issue_433' into 'develop'href
[#433] fix markdown formatting See merge request pleroma/pleroma!545
2018-12-14Merge branch '114_email_invites' into 'develop'href
[#114] Email invites See merge request pleroma/pleroma!541
2018-12-14Merge branch 'fix/issue_272' into 'develop'href
[#272] fix tags See merge request pleroma/pleroma!540
2018-12-14fix case when tags is invalidMaksim Pechnikov
2018-12-14fix tagsMaksim Pechnikov
2018-12-14Merge branch 'pleroma-feature/compat/push-subscriptions' into 'develop'href
Improve web push Closes #393, #422, and #452 See merge request pleroma/pleroma!524
2018-12-14fixed typoMaksim Pechnikov
2018-12-14Enable warning_as_errors for testshref
2018-12-14TwitterAPI.ActivityView: Ignore unhandled activitieshref
2018-12-14Warn if push is disabled..href
2018-12-14Update config.mdHaelwenn
2018-12-14fix markdown formattingMaksim Pechnikov
2018-12-14Merge branch 'feature/file-size-checking' into 'develop'href
[#36] Add warnings when file upload fails See merge request pleroma/pleroma!523
2018-12-14Fix warninghref
2018-12-14Pleroma.Activity.mastodon_notification_type/1href
2018-12-14Properly disable Web Push if no VAPID key is sethref
2018-12-14Typoshref
2018-12-14Push: respect alerts settingshref
2018-12-14Push: add missing notification_type fieldhref
2018-12-14Push.Subscription: convert base64 to base64 urlsafehref
2018-12-14improve push message format (compatibility with mastodon)Egor Kislitsyn
2018-12-14Update config.mdlambda
2018-12-14fix and improve web push; add configuration docsEgor Kislitsyn
2018-12-14[#114] Added `invitesEnabled` to `metadata` of nodeinfo.Ivan Tashkinov
2018-12-14[#114] Removed `confirm_email` action stub (to be addressed in a separate MR).Ivan Tashkinov
2018-12-14[#114] Improved tests.Ivan Tashkinov
2018-12-14[#114] Readded `invites_enabled` config setting, updated readme.Ivan Tashkinov
2018-12-14[#114] Moved email_invite action to AdminAPIController, adjusted tests.Ivan Tashkinov
2018-12-14[#114] Added UserInviteToken creation, adjusted invitation email link to ↵Ivan Tashkinov
include it.