summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2018-12-15Allow port specification in instance.exRin Toshaka
2018-12-15Add an ability to disabled captchaEkaterina Vaartis
2018-12-15Add base CAPTCHA support (currently only kocaptcha)Ekaterina Vaartis
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-14Remove domain from sample_config templateraeno
2018-12-14Scrub html from activity.content or user.bio for opengraph metaraeno
2018-12-14Merge branch 'develop' into oembed_providerraeno
2018-12-14Fix testsraeno
Notice test has been failing due to missing placeholder in index.html I've tried to use fixtures to substitute that file in test environment but it became too much hassle. Fixtures are not copied to _build directory so I'd need to change file fetching logic. IMO it doesn't worth it since pleroma-fe already has this placeholder merged and all future updated of index.html will include it.
2018-12-14fix tagsMaksim Pechnikov
2018-12-14Handle "users/:id" links as well. Fix comments in MR.raeno
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.
2018-12-14[#114] Naive implementation of email invitations.Ivan Tashkinov
2018-12-14Merge branch '114_user_registration_emails' into 'develop'href
[#114] User registration emails Closes #114 See merge request pleroma/pleroma!531
2018-12-14[#114] Addressed MR comments. Removed functionality to be extracted to other ↵Ivan Tashkinov
MRs.
2018-12-14Merge branch 'fix/double-rt-or-fav' into 'develop'lambda
Prevent accidental double RTs or favorites See merge request pleroma/pleroma!542
2018-12-14Merge branch 'fix/qvitter-fav-object' into 'develop'lambda
TwitterAPI: Include favorited post in json Closes #405 See merge request pleroma/pleroma!543
2018-12-14Merge branch '2018-12-13-update-frontend' into 'develop'lambda
update frontend See merge request pleroma/pleroma!544
2018-12-14TwitterAPI: Include favorited post in jsoneal
2018-12-14Prevent accidental double RTs or favoriteseal
2018-12-14Fix tests. Remove oembed templateraeno
2018-12-13Remove oembed for now, will submit it in another MR. Fix warningsraeno
2018-12-13Refactor ostatus_controller, extract metatags redirection to Redirector ↵raeno
itself. Set 'html' as default type for ostatus links
2018-12-13Set Pleroma.instance.domain when config is generatedraeno