projects
/
akkoma
/ history
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
first
⋅
prev
⋅
next
Fix merge conflict
[akkoma]
/
lib
/
pleroma
/
2018-12-16
Haelwenn
Merge branch 'develop' into 'develop'
tree
|
commitdiff
2018-12-16
eal
Merge branch 'fix/masto-put-settings' into 'develop'
tree
|
commitdiff
2018-12-16
eal
Mastodon API: Fix PUT /api/web/settings
tree
|
commitdiff
2018-12-15
Ekaterina Vaartis
Replace HTTPoison with Tesla for kocaptha
tree
|
commitdiff
2018-12-15
Ekaterina Vaartis
Formatting fixes
tree
|
commitdiff
2018-12-15
Ekaterina Vaartis
Separate captcha implementation into a behaviour and...
tree
|
commitdiff
2018-12-15
Haelwenn (lanodan...
WebFinger: Sends a 400 when resource param is missing...
tree
|
commitdiff
2018-12-15
lambda
Merge branch 'bugfix/webfinger-jrd' into 'develop'
tree
|
commitdiff
2018-12-15
lambda
Merge branch 'fix/views-ignore-unhandled-activites...
tree
|
commitdiff
2018-12-15
lambda
Merge branch 'tests-warning-as-errors' into 'develop'
tree
|
commitdiff
2018-12-15
Ekaterina Vaartis
Add an ability to disabled captcha
tree
|
commitdiff
2018-12-15
Ekaterina Vaartis
Add base CAPTCHA support (currently only kocaptcha)
tree
|
commitdiff
2018-12-14
href
Merge branch 'fix/issue_433' into 'develop'
tree
|
commitdiff
2018-12-14
href
Merge branch '114_email_invites' into 'develop'
tree
|
commitdiff
2018-12-14
href
Merge branch 'fix/issue_272' into 'develop'
tree
|
commitdiff
2018-12-14
Maksim Pechnikov
fix case when tags is invalid
tree
|
commitdiff
2018-12-14
raeno
Scrub html from activity.content or user.bio for opengr...
tree
|
commitdiff
2018-12-14
raeno
Merge branch 'develop' into oembed_provider
tree
|
commitdiff
2018-12-14
Maksim Pechnikov
fix tags
tree
|
commitdiff
2018-12-14
raeno
Handle "users/:id" links as well. Fix comments in MR.
tree
|
commitdiff
2018-12-14
href
Merge branch 'pleroma-feature/compat/push-subscriptions...
tree
|
commitdiff
2018-12-14
Maksim Pechnikov
fixed typo
tree
|
commitdiff
2018-12-14
href
TwitterAPI.ActivityView: Ignore unhandled activities
tree
|
commitdiff
2018-12-14
href
Warn if push is disabled..
tree
|
commitdiff
2018-12-14
Maksim Pechnikov
fix markdown formatting
tree
|
commitdiff
2018-12-14
href
Merge branch 'feature/file-size-checking' into 'develop'
tree
|
commitdiff
2018-12-14
href
Fix warning
tree
|
commitdiff
2018-12-14
href
Pleroma.Activity.mastodon_notification_type/1
tree
|
commitdiff
2018-12-14
href
Properly disable Web Push if no VAPID key is set
tree
|
commitdiff
2018-12-14
href
Typos
tree
|
commitdiff
2018-12-14
href
Push: respect alerts settings
tree
|
commitdiff
2018-12-14
href
Push: add missing notification_type field
tree
|
commitdiff
2018-12-14
href
Push.Subscription: convert base64 to base64 urlsafe
tree
|
commitdiff
2018-12-14
Egor Kislitsyn
improve push message format (compatibility with mastodon)
tree
|
commitdiff
2018-12-14
Egor Kislitsyn
fix and improve web push; add configuration docs
tree
|
commitdiff
2018-12-14
Ivan Tashkinov
[#114] Added `invitesEnabled` to `metadata` of nodeinfo.
tree
|
commitdiff
2018-12-14
Ivan Tashkinov
[#114] Removed `confirm_email` action stub (to be addre...
tree
|
commitdiff
2018-12-14
Ivan Tashkinov
[#114] Improved tests.
tree
|
commitdiff
2018-12-14
Ivan Tashkinov
[#114] Readded `invites_enabled` config setting, update...
tree
|
commitdiff
2018-12-14
Ivan Tashkinov
[#114] Moved email_invite action to AdminAPIController...
tree
|
commitdiff
2018-12-14
Ivan Tashkinov
[#114] Added UserInviteToken creation, adjusted invitat...
tree
|
commitdiff
2018-12-14
Ivan Tashkinov
[#114] Naive implementation of email invitations.
tree
|
commitdiff
2018-12-14
href
Merge branch '114_user_registration_emails' into 'develop'
tree
|
commitdiff
2018-12-14
Ivan Tashkinov
[#114] Addressed MR comments. Removed functionality...
tree
|
commitdiff
2018-12-14
lambda
Merge branch 'fix/double-rt-or-fav' into 'develop'
tree
|
commitdiff
2018-12-14
lambda
Merge branch 'fix/qvitter-fav-object' into 'develop'
tree
|
commitdiff
2018-12-14
eal
TwitterAPI: Include favorited post in json
tree
|
commitdiff
2018-12-14
eal
Prevent accidental double RTs or favorites
tree
|
commitdiff
2018-12-14
raeno
Fix tests. Remove oembed template
tree
|
commitdiff
2018-12-13
raeno
Remove oembed for now, will submit it in another MR...
tree
|
commitdiff
2018-12-13
raeno
Refactor ostatus_controller, extract metatags redirecti...
tree
|
commitdiff
2018-12-13
raeno
Extract opengraph/oembed into separate module
tree
|
commitdiff
2018-12-13
raeno
Add opengraph/twitter_card:summary support. Add config...
tree
|
commitdiff
2018-12-13
raeno
WIP. Implement oembed route and handle both json/xml...
tree
|
commitdiff
2018-12-13
raeno
Insert meta tags into static index.html on the fly...
tree
|
commitdiff
2018-12-13
lambda
Merge branch 'username-underscores' into 'develop'
tree
|
commitdiff
2018-12-13
Ivan Tashkinov
[#114] Removed `email_invite` implementation (to be...
tree
|
commitdiff
2018-12-13
Ivan Tashkinov
[#114] Removed `email_invite` implementation (to be...
tree
|
commitdiff
2018-12-13
Ivan Tashkinov
[#114] Initial implementation of user email invitations.
tree
|
commitdiff
2018-12-13
Ivan Tashkinov
[#114] Refactored `password_reset` (moved to TwitterAPI...
tree
|
commitdiff
2018-12-12
href
Extended nicknames: allow dashes.
tree
|
commitdiff
2018-12-12
href
Allow underscores in usernames.
tree
|
commitdiff
2018-12-12
Ivan Tashkinov
[#114] Routes and config for `confirm_email` and `email...
tree
|
commitdiff
2018-12-12
Ivan Tashkinov
[#114] Addressed warnings. Fix of `with` statement...
tree
|
commitdiff
2018-12-12
Ivan Tashkinov
[#114] Initial implementation of user password reset...
tree
|
commitdiff
2018-12-12
Ivan Tashkinov
[#114] Added /dev/mailbox dev-only route (emails previe...
tree
|
commitdiff
2018-12-12
Ivan Tashkinov
[#114] SMTP deps and config.
tree
|
commitdiff
2018-12-12
kaniini
Merge branch 'support/issue_442' into 'develop'
tree
|
commitdiff
2018-12-12
Maksim Pechnikov
fix warnings
tree
|
commitdiff
2018-12-10
scarlett
Merge branch 'new-fe-options' into 'develop'
tree
|
commitdiff
2018-12-10
scarlett
Add new frontend options to server-side config.
tree
|
commitdiff
2018-12-10
lambda
Merge branch '2018-12-10-update-frontend' into 'develop'
tree
|
commitdiff
2018-12-10
lain
Fix warnings.
tree
|
commitdiff
2018-12-10
lambda
Merge branch 'fix_empty_bio_crash' into 'develop'
tree
|
commitdiff
2018-12-10
lambda
Merge branch 'fix/mix-task-uploads-moduledoc' into...
tree
|
commitdiff
2018-12-10
lambda
Merge branch 'fix/config-md-typos' into 'develop'
tree
|
commitdiff
2018-12-10
lambda
Merge branch 'support/bugfix_272' into 'develop'
tree
|
commitdiff
2018-12-10
lambda
Merge branch 'fix/theora-detection-read-bytes' into...
tree
|
commitdiff
2018-12-10
lambda
Merge branch 'anonymize-filter-text' into 'develop'
tree
|
commitdiff
2018-12-10
lambda
Merge branch 'develop' into 'fix/mix-task-uploads-modul...
tree
|
commitdiff
2018-12-10
lambda
Merge branch 'parallel588/pleroma-support/compile_warni...
tree
|
commitdiff
2018-12-10
lain
Treat warnings as errors outside of tests.
tree
|
commitdiff
2018-12-10
Maksim Pechnikov
updates
tree
|
commitdiff
2018-12-09
raeno
Fixes #415. Properly handle nil and empty string by...
tree
|
commitdiff
2018-12-09
Maksim Pechnikov
fix compile warnings
tree
|
commitdiff
2018-12-09
Maksim Pechnikov
formatting
tree
|
commitdiff
2018-12-09
Maksim Pechnikov
fix hashtags in api response
tree
|
commitdiff
2018-12-08
Rin Toshaka
Make uploadlimit an object that stores upload limits...
tree
|
commitdiff
2018-12-08
lambda
Merge branch 'fix/add-upload.ex' into 'develop'
tree
|
commitdiff
2018-12-08
lambda
Merge branch 'fix/nodeinfo-nil-features' into 'develop'
tree
|
commitdiff
2018-12-08
lambda
Merge branch 'fix/media-proxy-url-encoded' into 'develop'
tree
|
commitdiff
2018-12-08
lambda
Merge branch 'fix/typo-relay-ex' into 'develop'
tree
|
commitdiff
2018-12-07
href
Media proxy: fix url encoding
tree
|
commitdiff
2018-12-07
Rin Toshaka
Add uploadlimit to Twitter API config
tree
|
commitdiff
2018-12-07
lambda
Merge branch 'fix/gopher-respect-ip' into 'develop'
tree
|
commitdiff
2018-12-07
lambda
Merge branch 'media-proxy-follow-redirect' into 'develop'
tree
|
commitdiff
2018-12-07
href
Nodeinfo: remove null features; relay feature.
tree
|
commitdiff
2018-12-07
href
Media proxy: follow HTTP redirects by default
tree
|
commitdiff
2018-12-07
lambda
Merge branch '394_user_tags' into 'develop'
tree
|
commitdiff
2018-12-07
Rin Toshaka
Make gopher respect ip
tree
|
commitdiff
next