summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2018-12-07AnonymizeFilename: allow for a pre-defined text instead of random stringhref
Improve docs
2018-12-07Merge branch 'fix/add-user-unsubscribe-to-doc' into 'develop'lambda
Add mix pleroma.user unsubscribe to mix doc See merge request pleroma/pleroma!512
2018-12-07Merge branch 'fix/typo-in-relay-doc' into 'develop'lambda
Mix Tasks: Fix a typo in relay.ex moduledoc See merge request pleroma/pleroma!513
2018-12-07Fix a typo in relay.ex moduledocrinpatch
2018-12-07Oopsrinpatch
2018-12-07Add mix pleroma.user unsubscribe to mix docrinpatch
2018-12-07Merge branch 'fix/add-common.ex' into 'develop'eal
add common.ex See merge request pleroma/pleroma!511
2018-12-07Rename def to defvalrinpatch
2018-12-07add common.exRin Toshaka
2018-12-06Merge branch 'refactor/mix-tasks' into 'develop'kaniini
Rebased !243 See merge request pleroma/pleroma!509
2018-12-06Update README.mdRin Toshaka
2018-12-06Remove unused vars from user.exRin Toshaka
2018-12-06Update instance.ex for web pushRin Toshaka
2018-12-06Merge developRin Toshaka
2018-12-06Refactor common functions to common.exRin Toshaka
2018-12-06Refactor common functions to common.exRin Toshaka
2018-12-06remove migrate_local_uploads.exRin Toshaka
2018-12-06Merge branch 'fix/mastodon-api-settings' into 'develop'kaniini
Fix put_settings and remove info_changeset See merge request pleroma/pleroma!507
2018-12-06Merge branch 'correct-and-improve-http-options' into 'develop'kaniini
Correct and improve http options See merge request pleroma/pleroma!505
2018-12-06Merge branch 're-mrf' into 'develop'kaniini
Add a MRF Policy for appending re: to identical subjects in replies. See merge request pleroma/pleroma!499
2018-12-06Merge branch 'feature/compat/push-subscriptions' into 'develop'kaniini
Web Push Subscriptions See merge request pleroma/pleroma!506
2018-12-06MastoAPI: Fix put_settingsrinpatch
2018-12-06Rename regular expression 'have_re' to 'reply_prefix'.scarlett
2018-12-06use `User.avatar_url`Egor Kislitsyn
2018-12-06cleanupEgor Kislitsyn
2018-12-06Harden re: detection.scarlett
2018-12-06clean upEgor Kislitsyn
2018-12-06add VAPID to test configEgor Kislitsyn
2018-12-06Merge branch 'develop' into feature/compat/push-subscriptionsEgor Kislitsyn
# Conflicts: # lib/pleroma/application.ex # lib/pleroma/plugs/oauth_plug.ex
2018-12-06show warning if VAPID is not setEgor Kislitsyn
2018-12-06Merge branch 'develop' into feature/compat/push-subscriptionsEgor Kislitsyn
# Conflicts: # lib/mix/tasks/sample_config.eex # lib/pleroma/web/twitter_api/controllers/util_controller.ex # mix.exs # mix.lock
2018-12-06Add web push supportEgor Kislitsyn
2018-12-06Use object.normalize.scarlett
2018-12-06avoid mix format bugHakaba Hitoyo
2018-12-06Merge branch '210_twitter_api_uploads_alt_text' into 'develop'kaniini
[#210] TwitterAPI: alt text support for uploaded images. Mastodon API uploads security fix. See merge request pleroma/pleroma!496
2018-12-06[#210] Mastodon: actor storing for media uploads, ownership check to ↵Ivan Tashkinov
update_media. Refactoring.
2018-12-06remove follow_redirect optionsHakaba Hitoyo
2018-12-06remove pool and timeout options which duplicate with the defaultHakaba Hitoyo
2018-12-06Merge remote-tracking branch 'origin/debug-suggestions-api' into ↵Hakaba Hitoyo
correct-and-improve-http-options
2018-12-05Merge branch 'follower-hiding' into 'develop'kaniini
Network hiding Closes #356 See merge request pleroma/pleroma!490
2018-12-05Merge branch 'dev_vald_fe/data_tag' into 'develop'kaniini
added data-user and data-tag attributes Closes #410 See merge request pleroma/pleroma!504
2018-12-06added data attrs to twitter scrubberVald
2018-12-05Fix merge.lain
2018-12-05Merge remote-tracking branch 'origin' into follower-hidinglain
2018-12-05MastodonAPI: Show users their own network.lain
2018-12-06resolved activity view testVald
2018-12-06lintVald
2018-12-06resolved api and controller test failuresVald
2018-12-05TwitterAPI: Show users their own network.lain
2018-12-06lintingVald
generated by cgit v1.2.3 (git 2.25.1) at 2025-07-23 13:57:40 +0000