Mark Felder
|
80c21100db
|
Merge branch 'develop' into refactor/notification_settings
|
2020-07-13 13:32:21 -05:00 |
|
|
|
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 |
|
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 |
|
lain
|
c8dd973af5
|
AccountController: Remove unused update_? routes.
These were not documented and are also not used anymore.
|
2020-07-07 16:53:20 +02:00 |
|
lain
|
59cf78e412
|
AccountController: Allow removal / reset of user images.
|
2020-07-07 16:53:03 +02:00 |
|
lain
|
9ad305209a
|
Merge branch 'bugfix/peertube-videos' into 'develop'
Fix getting videos from peertube
See merge request pleroma/pleroma!2728
|
2020-07-07 09:14:50 +00:00 |
|
Haelwenn
|
fa0fa4552f
|
Merge branch 'feature/1392-support-irreversible-filters' into 'develop'
Updates for Feature/1392 support irreversible filters
Closes #1392
See merge request pleroma/pleroma!2186
|
2020-07-07 08:23:49 +00:00 |
|
Haelwenn (lanodan) Monnier
|
fbb9743a70
|
Fix getting videos from peertube
|
2020-07-07 09:38:38 +02:00 |
|
Haelwenn
|
d81acb5f62
|
Merge branch 'description-limits' into 'develop'
Add limits to image descriptions
See merge request pleroma/pleroma!2724
|
2020-07-07 03:00:52 +00:00 |
|
lain
|
a6a12b241f
|
FollowValidator: Add basic validation.
|
2020-07-06 15:57:19 +02:00 |
|
lain
|
28feba8af4
|
Preloaders: Remove status_net preloader
|
2020-07-06 12:24:45 +02:00 |
|
lain
|
1963e143c5
|
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into remove-twitter-api
|
2020-07-06 12:15:59 +02:00 |
|
lain
|
208baf157a
|
ActivityPub: Add new 'capabilities' to user.
|
2020-07-06 11:38:40 +02:00 |
|
lain
|
74b88c0a8b
|
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into chat-federation-information
|
2020-07-06 11:27:06 +02:00 |
|
lain
|
cc8b4e48d9
|
InstanceView: Add chat limit, description limit
|
2020-07-06 11:12:37 +02:00 |
|
Alexander Strizhakov
|
20c27bef40
|
renaming back and reject nil on create
|
2020-07-06 09:30:42 +03:00 |
|
Sergey Suprunenko
|
8277b29790
|
Restrict thread statuses that contain user's irreversible filters
|
2020-07-06 09:30:39 +03:00 |
|
Sergey Suprunenko
|
4a8c26654e
|
Restrict statuses that contain user's irreversible filters
|
2020-07-06 09:28:21 +03:00 |
|
Roman Chvanikov
|
fc1f34b851
|
Delete activity before sending response to client
|
2020-07-06 00:01:25 +03:00 |
|
lain
|
cf56655614
|
Streamer: Don't filter out announce notifications.
|
2020-07-04 17:11:37 +02:00 |
|
