lambda
|
7d86c0c53f
|
Merge branch 'fix/gopher-respect-ip' into 'develop'
[#155] Fix Gopher server binding only to default value
See merge request pleroma/pleroma!518
|
6 years ago |
|
lambda
|
94ac0075bf
|
Merge branch 'media-proxy-follow-redirect' into 'develop'
Media proxy: follow HTTP redirects by default
Closes #421
See merge request pleroma/pleroma!519
|
6 years ago |
|
href
|
d8fcf7c5cf
|
Media proxy: follow HTTP redirects by default
|
6 years ago |
|
lambda
|
94d8f1ab30
|
Merge branch '394_user_tags' into 'develop'
[#394] User tags
Closes #394
See merge request pleroma/pleroma!508
|
6 years ago |
|
Rin Toshaka
|
09f20de0d7
|
Make gopher respect ip
|
6 years ago |
|
href
|
3c925e9d88
|
Emojis: Alphabetical ordering
|
6 years ago |
|
Ivan Tashkinov
|
1cea97df64
|
[#394] Refactoring of User.tag and User.untag (removed User.tag_or_untag etc.)
|
6 years ago |
|
Ivan Tashkinov
|
6ed5044c4e
|
[#394] Refactoring (using Ecto.Multi; "untag" route change).
|
6 years ago |
|
Ivan Tashkinov
|
7a2162bbcb
|
[#394] User view (Twitter & Mastadon API): wrapped "tags" in "pleroma" map.
|
6 years ago |
|
Ivan Tashkinov
|
7bcb6a183a
|
[#394] Refactoring.
|
6 years ago |
|
Ivan Tashkinov
|
7b19487389
|
[#394] Added `users.tags` and admin routes to tag and untag users. Added tests.
|
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 |
|
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
|
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 |
|
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 |
|
lain
|
fdac215091
|
TwitterAPI: Show users their own network.
|
6 years ago |
|
Vald
|
3ccfe226c0
|
added data attrs for user and tag
|
6 years ago |
|
Ivan Tashkinov
|
3b5be09f45
|
[#210] Stylistic change.
|
6 years ago |
|
lain
|
839526a913
|
TwitterAPI: Add network hiding.
|
6 years ago |
|
Ivan Tashkinov
|
c4f3c5e939
|
[#210] Stylistic change.
|
6 years ago |
|
Maksim Pechnikov
|
c524c50509
|
fix/273
|
6 years ago |
|
Ivan Tashkinov
|
848151f7cb
|
[#210] [TwitterAPI] Made actor be stored for uploads. Added ownership check
to `update_media` action. Added controller tests for `upload` and `update_media` actions.
Refactoring.
|
6 years ago |
|
Ivan Tashkinov
|
be187f82f7
|
[#210] Further refactoring.
|
6 years ago |
|
hakabahitoyo
|
a418547bdf
|
debug /api/v1/suggestions
|
6 years ago |
|
William Pitcock
|
956f3c75ca
|
user: put default user info when registering a user
|
6 years ago |
|
scarlett
|
8a1df182cf
|
Add a MRF Policy for appending re: to identical subjects in replies.
|
6 years ago |
|
kaniini
|
ec1ec32f20
|
Merge branch 'optional-retry-queue' into 'develop'
Make retry queue optional.
See merge request pleroma/pleroma!498
|
6 years ago |
|
lain
|
925b05054f
|
Make retry queue optional.
At the moment, it can use a lot of memory really fast.
|
6 years ago |
|
kaniini
|
114b95cee2
|
Merge branch 'feature/integration_tesla' into 'develop'
[#354] Move all http interactions to Tesla
See merge request pleroma/pleroma!487
|
6 years ago |
