href
|
d8fcf7c5cf
|
Media proxy: follow HTTP redirects by default
|
6 years ago |
|
lambda
|
8764f64690
|
Merge branch 'fix/add-user-unsubscribe-to-doc' into 'develop'
Add mix pleroma.user unsubscribe to mix doc
See merge request pleroma/pleroma!512
|
6 years ago |
|
lambda
|
4b90c7cc9d
|
Merge branch 'fix/typo-in-relay-doc' into 'develop'
Mix Tasks: Fix a typo in relay.ex moduledoc
See merge request pleroma/pleroma!513
|
6 years ago |
|
rinpatch
|
4e2250b1dd
|
Fix a typo in relay.ex moduledoc
|
6 years ago |
|
rinpatch
|
f7e23aee90
|
Oops
|
6 years ago |
|
rinpatch
|
f661813807
|
Add mix pleroma.user unsubscribe to mix doc
|
6 years ago |
|
eal
|
c88db2c1b1
|
Merge branch 'fix/add-common.ex' into 'develop'
add common.ex
See merge request pleroma/pleroma!511
|
6 years ago |
|
rinpatch
|
08e10a70ec
|
Rename def to defval
|
6 years ago |
|
Rin Toshaka
|
1d11c4cf11
|
add common.ex
|
6 years ago |
|
kaniini
|
220de24002
|
Merge branch 'refactor/mix-tasks' into 'develop'
Rebased !243
See merge request pleroma/pleroma!509
|
6 years ago |
|
Rin Toshaka
|
f5726a2e12
|
Update README.md
|
6 years ago |
|
Rin Toshaka
|
71d5cf9ed8
|
Remove unused vars from user.ex
|
6 years ago |
|
Rin Toshaka
|
66313cda02
|
Update instance.ex for web push
|
6 years ago |
|
Rin Toshaka
|
88f92693f2
|
Merge develop
|
6 years ago |
|
Rin Toshaka
|
ca7b46fb3b
|
Refactor common functions to common.ex
|
6 years ago |
|
Rin Toshaka
|
4a2a7ce636
|
Refactor common functions to common.ex
|
6 years ago |
|
Rin Toshaka
|
3a84511df1
|
remove migrate_local_uploads.ex
|
6 years ago |
|
kaniini
|
1d531fd2f3
|
Merge branch 'fix/mastodon-api-settings' into 'develop'
Fix put_settings and remove info_changeset
See merge request pleroma/pleroma!507
|
6 years ago |
|
kaniini
|
abead01ab6
|
Merge branch 'correct-and-improve-http-options' into 'develop'
Correct and improve http options
See merge request pleroma/pleroma!505
|
6 years ago |
|
kaniini
|
b0adea30b3
|
Merge branch 're-mrf' into 'develop'
Add a MRF Policy for appending re: to identical subjects in replies.
See merge request pleroma/pleroma!499
|
6 years ago |
|
kaniini
|
776179c2ed
|
Merge branch 'feature/compat/push-subscriptions' into 'develop'
Web Push Subscriptions
See merge request pleroma/pleroma!506
|
6 years ago |
|
rinpatch
|
2ae1128d9f
|
MastoAPI: Fix put_settings
|
6 years ago |
|
scarlett
|
d27e3f269f
|
Rename regular expression 'have_re' to 'reply_prefix'.
|
6 years ago |
|
Egor Kislitsyn
|
6f36e903b0
|
use `User.avatar_url`
|
6 years ago |
|
Egor Kislitsyn
|
79668c08fc
|
cleanup
|
6 years ago |
|
scarlett
|
3dff61ebec
|
Harden re: detection.
|
6 years ago |
|
Egor Kislitsyn
|
3d492795b7
|
clean up
|
6 years ago |
|
Egor Kislitsyn
|
0020b22688
|
add VAPID to test config
|
6 years ago |
|
Egor Kislitsyn
|
4944498133
|
Merge branch 'develop' into feature/compat/push-subscriptions
# Conflicts:
# lib/pleroma/application.ex
# lib/pleroma/plugs/oauth_plug.ex
|
6 years ago |
|
Egor Kislitsyn
|
bac58b1524
|
show warning if VAPID is not set
|
6 years ago |
|
Egor Kislitsyn
|
8b4397c704
|
Merge branch 'develop' into feature/compat/push-subscriptions
# Conflicts:
# lib/mix/tasks/sample_config.eex
# lib/pleroma/web/twitter_api/controllers/util_controller.ex
# mix.exs
# mix.lock
|
6 years ago |
|
Egor Kislitsyn
|
04a48286e6
|
Add web push support
|
6 years ago |
|
scarlett
|
6a6aaa0e1a
|
Use object.normalize.
|
6 years ago |
|
Hakaba Hitoyo
|
a09ed0f5af
|
avoid mix format bug
|
6 years ago |
|
kaniini
|
ccf0b46dd6
|
Merge branch '210_twitter_api_uploads_alt_text' into 'develop'
[#210] TwitterAPI: alt text support for uploaded images. Mastodon API uploads security fix.
See merge request pleroma/pleroma!496
|
6 years ago |
|
Ivan Tashkinov
|
3e90f688f1
|
[#210] Mastodon: actor storing for media uploads, ownership check to update_media.
Refactoring.
|
6 years ago |
|
Hakaba Hitoyo
|
96ba95df2e
|
remove follow_redirect options
|
6 years ago |
|
Hakaba Hitoyo
|
27792b2d77
|
remove pool and timeout options which duplicate with the default
|
6 years ago |
|
Hakaba Hitoyo
|
505d820827
|
Merge remote-tracking branch 'origin/debug-suggestions-api' into correct-and-improve-http-options
|
6 years ago |
|
kaniini
|
48a0315646
|
Merge branch 'follower-hiding' into 'develop'
Network hiding
Closes #356
See merge request pleroma/pleroma!490
|
6 years ago |
|
kaniini
|
6ab58fdfa1
|
Merge branch 'dev_vald_fe/data_tag' into 'develop'
added data-user and data-tag attributes
Closes #410
See merge request pleroma/pleroma!504
|
6 years ago |
|
Vald
|
194869c7db
|
added data attrs to twitter scrubber
|
6 years ago |
|
lain
|
7d5720f2e4
|
Fix merge.
|
6 years ago |
|
lain
|
76d6b1c6ab
|
Merge remote-tracking branch 'origin' into follower-hiding
|
6 years ago |
|
lain
|
3ea4476445
|
MastodonAPI: Show users their own network.
|
6 years ago |
|
Vald
|
3c8ffe7ed3
|
resolved activity view test
|
6 years ago |
|
Vald
|
028904c333
|
lint
|
6 years ago |
|
Vald
|
911a877576
|
resolved api and controller test failures
|
6 years ago |
|
lain
|
fdac215091
|
TwitterAPI: Show users their own network.
|
6 years ago |
|
Vald
|
743a09132b
|
linting
|
6 years ago |
