Ivan Tashkinov
|
bdf57b8ef4
|
Merge remote-tracking branch 'remotes/origin/develop' into 2168-media-preview-proxy
# Conflicts:
# config/config.exs
# lib/pleroma/web/media_proxy/media_proxy.ex
# mix.lock
# test/web/media_proxy/media_proxy_test.exs
|
2020-07-19 20:05:37 +03:00 |
|
Haelwenn
|
10d46235cf
|
Merge branch 'fix-1958' into 'develop'
OpenAPI: Add :id to follower/following endpoints, fixes #1958
Closes #1958
See merge request pleroma/pleroma!2772
|
2020-07-17 18:54:30 +00:00 |
|
Alex Gleason
|
48f8b26c92
|
OpenAPI: Add :id to follower/following endpoints, fixes #1958
|
2020-07-17 12:35:28 -05:00 |
|
Mark Felder
|
20a496d2cb
|
Expose the post formats in /api/v1/instance
|
2020-07-17 10:45:41 -05:00 |
|
Mark Felder
|
62438530e2
|
TOTP length is configurable, so we can't hardcode this here.
|
2020-07-17 08:19:49 -05:00 |
|
Mark Felder
|
3be64556db
|
Improve TOTP token and recovery input fields in OAuth login
|
2020-07-16 13:11:03 -05:00 |
|
Mark Felder
|
9d30bacace
|
Merge branch 'develop' into refactor/notification_settings
|
2020-07-15 09:30:23 -05:00 |
|
rinpatch
|
0fe36b311c
|
Merge branch 'features/mrf-reasons' into 'develop'
Add rejection reason to our MRFs
See merge request pleroma/pleroma!2759
|
2020-07-15 14:00:22 +00:00 |
|
Haelwenn (lanodan) Monnier
|
d29b8997f4
|
MastoAPI: fix & test giving MRF reject reasons
|
2020-07-15 15:25:33 +02:00 |
|
Maksim Pechnikov
|
1dd767b8c7
|
Include port in host for signatures
|
2020-07-14 21:44:08 +03:00 |
|
feld
|
3f65f2ea79
|
Merge branch 'feature/1922-media-proxy-whitelist' into 'develop'
Support for hosts with scheme in MediaProxy whitelist setting
Closes #1922
See merge request pleroma/pleroma!2754
|
2020-07-14 18:07:44 +00:00 |
|
feld
|
2909dc873b
|
Merge branch '1940-admin-token-oauthless-auth' into 'develop'
[#1940] Reinstated OAuth-less `admin_token` authentication
Closes #1940
See merge request pleroma/pleroma!2760
|
2020-07-14 16:48:26 +00:00 |
|
Ivan Tashkinov
|
124b4709dc
|
[#1940] Added admin_token param (as admin_api_params/0) to existing Admin API OpenAPI operations.
|
2020-07-14 19:31:05 +03:00 |
|
feld
|
246f49d685
|
Merge branch '1916-transmogrifier-skipping-oddities-in-address-fields' into 'develop'
Transmogrifier: filtering weirdness in address fields
Closes #1916
See merge request pleroma/pleroma!2762
|
2020-07-14 15:17:25 +00:00 |
|
Haelwenn (lanodan) Monnier
|
858d9fc7e8
|
MRF Policies: Return a {:reject, reason} instead of {:reject, nil}
|
2020-07-14 11:04:16 +02:00 |
|
=
|
b221b640a2
|
Transmogrifier: filtering weirdness in address fields
|
2020-07-13 22:43:21 +03:00 |
|
Mark Felder
|
80c21100db
|
Merge branch 'develop' into refactor/notification_settings
|
2020-07-13 13:32:21 -05:00 |
|
feld
|
5d215fd81f
|
Merge branch 'config-behaviours-runtime' into 'develop'
Config/Docs: Expand behaviour suggestions modules at runtime
Closes #1941
See merge request pleroma/pleroma!2755
|
2020-07-13 15:45:25 +00:00 |
|
href
|
4347d2de5e
|
Config/Docs: Expand behaviour suggestions at runtime
|
2020-07-12 17:23:33 +02:00 |
|
Alexander Strizhakov
|
b376442325
|
MediaProxy whitelist setting now supports hosts with scheme
added deprecation warning about using bare domains
|
2020-07-12 12:41:40 +03:00 |
|
lain
|
93e494ec21
|
ActivityPub: Don't rename a clashing nickname with the same ap id.
|
2020-07-10 14:10:44 +02:00 |
|
lain
|
b39eb6ecc5
|
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into chat-federation-information
|
2020-07-10 12:26:53 +02:00 |
|
Haelwenn
|
4ac6e6283f
|
Merge branch 'develop' into 'admin-api-user-credentials-for-remote-users-fix'
# Conflicts:
# CHANGELOG.md
|
2020-07-10 08:55:15 +00:00 |
|
Mark Felder
|
d23804f191
|
Use the Pleroma.Config alias
|
2020-07-09 10:53:51 -05:00 |
|
lain
|
8ca1f3e8c6
|
Merge branch '1723-token-fixes' into 'develop'
AccountController: Return scope in proper format.
Closes #1723
See merge request pleroma/pleroma!2694
|
2020-07-09 13:10:05 +00:00 |
|
lain
|
f4469dc741
|
Merge branch 'features/favicons' into 'develop'
Add support for remote favicons
See merge request pleroma/pleroma!2261
|
2020-07-09 13:09:31 +00:00 |
|
Haelwenn
|
bdc7b60610
|
Merge branch '1925-muting-reblogs' into 'develop'
AccountController: Fix muting / unmuting reblogs.
Closes #1925
See merge request pleroma/pleroma!2732
|
2020-07-09 12:10:26 +00:00 |
|
eugenijm
|
c2be0da79f
|
Admin API: fix GET /api/pleroma/admin/users/:nickname/credentials returning 404 when getting the credentials of a remote user while :instance, :limit_to_local_content is set to :unauthenticated
|
2020-07-09 14:57:40 +03:00 |
|
Haelwenn
|
68036f5a3b
|
Merge branch 'follow-pipeline' into 'develop'
Handle `Follow` activities with the pipeline
See merge request pleroma/pleroma!2734
|
2020-07-09 10:32:24 +00:00 |
|
lain
|
6d688f14fa
|
Merge branch 'bugfix/status-deletion' into 'develop'
#1920 fix activity deletion
See merge request pleroma/pleroma!2721
|
2020-07-09 09:37:52 +00:00 |
|
lain
|
00e54f8fe7
|
ActivityPub: Remove follow and fix issues.
|
2020-07-08 17:07:24 +02:00 |
|
lain
|
9dda8b5427
|
CommonAPI: Switch to pipeline for following.
|
2020-07-08 15:40:56 +02:00 |
|
lain
|
172f4aff8e
|
Transmogrifier: Move following to the pipeline.
|
2020-07-08 14:30:53 +02:00 |
|
lain
|
7d0e2b3fdd
|
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into follow-pipeline
|
2020-07-08 13:23:07 +02:00 |
|
lain
|
cdc153db31
|
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into issue/1880
|
2020-07-08 13:21:58 +02:00 |
|
lain
|
6335b32aa8
|
Merge branch '1895-hashtag-timeline-restrict-unauthenticated-fix' into 'develop'
[#1895] Made hashtag timeline respect `:restrict_unauthenticated` instance setting
Closes #1895
See merge request pleroma/pleroma!2731
|
2020-07-08 10:55:03 +00:00 |
|
Ivan Tashkinov
|
a6495f4a68
|
[#1895] credo fix.
|
2020-07-08 12:54:23 +03:00 |
|
lain
|
c0385cf47a
|
AccountController: Fix muting / unmuting reblogs.
|
2020-07-08 11:52:29 +02:00 |
|
Ivan Tashkinov
|
3f8370a285
|
[#1895] Applied code review suggestion.
|
2020-07-08 12:36:44 +03:00 |
|
Maksim Pechnikov
|
e341f81785
|
fixed delete Like activity in remove user
|
2020-07-08 09:06:23 +03:00 |
|
Haelwenn (lanodan) Monnier
|
31fef95e35
|
Add changelog and documentation
|
2020-07-08 06:29:24 +02:00 |
|
Haelwenn (lanodan) Monnier
|
312fc55f14
|
Add [:instances_favicons, :enabled] setting, defaults to false
|
2020-07-08 06:28:40 +02:00 |
|
Haelwenn (lanodan) Monnier
|
013e2c5057
|
Use instances table instead of Cachex
|
2020-07-08 06:28:39 +02:00 |
|
Haelwenn (lanodan) Monnier
|
6a679d80c9
|
Move get_favicon to Pleroma.Instances, use /
|
2020-07-08 06:28:39 +02:00 |
|
Haelwenn (lanodan) Monnier
|
f6d09fafee
|
Add support for remote favicons
|
2020-07-08 06:28:39 +02:00 |
|
Haelwenn
|
a8447c3803
|
Merge branch '1918-avatar-background-header-reset-2' into 'develop'
Resolve "Better support for resetting avatar/header/background"
Closes #1918
See merge request pleroma/pleroma!2729
|
2020-07-08 03:25:30 +00:00 |
|
Haelwenn
|
db13acf242
|
Merge branch 'fix/twitter-rich-media-preview' into 'develop'
Add "Bot" to User Agent to coerce Twitter into serving OGP <meta> tags.
Closes #1923
See merge request pleroma/pleroma!2730
|
2020-07-08 03:05:20 +00:00 |
|
lain
|
8939ff39e4
|
Merge branch 'remove-twitter-api' into 'develop'
Remove some TwitterAPI endpoints
See merge request pleroma/pleroma!2327
|
2020-07-07 18:26:07 +00:00 |
|
Ivan Tashkinov
|
3e08e77151
|
[#1895] Made hashtag timeline respect :restrict_unauthenticated instance setting.
|
2020-07-07 20:37:11 +03:00 |
|
Mark Felder
|
18438a9bf0
|
Add "Bot" to User Agent to coerce Twitter into serving OGP <meta> tags.
|
2020-07-07 11:21:05 -05:00 |
|