rinpatch
|
dd4d10b275
|
Merge branch 'fix-auto-link-for-profile-fields' into 'develop'
Use Pleroma.Formatter.linkify/2 instead
See merge request pleroma/pleroma!2352
|
5 years ago |
|
kPherox
|
06471940e0
|
Apply suggestion to test/web/mastodon_api/controllers/account_controller/update_credentials_test.exs
|
5 years ago |
|
lain
|
1d4ab06505
|
Merge branch 'featureflag/emoji_reactions' into 'develop'
Add emoji reactions to features in nodeinfo
See merge request pleroma/pleroma!2313
|
5 years ago |
|
lain
|
96ee0aadbf
|
Merge branch 'improving-test-coverage' into 'develop'
Tests for emoji mix task
See merge request pleroma/pleroma!2350
|
5 years ago |
|
lain
|
349b9d86dc
|
Merge branch 'remake-remodel-2' into 'develop'
Ingestion Pipeline Revamp
See merge request pleroma/pleroma!2315
|
5 years ago |
|
Alexander Strizhakov
|
a43e055916
|
using another fn for file deletion
|
5 years ago |
|
Alexander Strizhakov
|
b59ac37b2c
|
tests for emoji mix task
|
5 years ago |
|
Ivan Tashkinov
|
aa78325117
|
[#2323] Fixed a typo causing /accounts/relationships to render default relationships. Improved the tests.
|
5 years ago |
|
feld
|
ef7d2b0f11
|
Merge branch 'gun' into 'develop'
Gun adapter
Closes #945
See merge request pleroma/pleroma!1861
|
5 years ago |
|
rinpatch
|
bfec45bf74
|
Merge branch 'fix/1601-add-new-meta-tag' into 'develop'
Restrict remote users from indexing
Closes #1601
See merge request pleroma/pleroma!2341
|
5 years ago |
|
Alexander Strizhakov
|
94ddbe4098
|
restrict remote users from indexing
|
5 years ago |
|
Haelwenn (lanodan) Monnier
|
185520d1b4
|
Provide known-good user.uri, remove User.profile_url/1
|
5 years ago |
|
Haelwenn (lanodan) Monnier
|
b30fb1f3bb
|
User: Fix use of source_data in profile_url/1
|
5 years ago |
|
Haelwenn (lanodan) Monnier
|
2553400a66
|
Initial failing test statement against funkwhale channels
|
5 years ago |
|
kPherox
|
dbf9d719f9
|
split test for update profile fields
|
5 years ago |
|
lain
|
aebec1bac9
|
Validator Test: Small refactor.
|
5 years ago |
|
Alexander Strizhakov
|
df5f89c0d6
|
test for default features and changelog entry
|
5 years ago |
|
lain
|
643f15e77b
|
Validators: ObjectID is an http uri.
|
5 years ago |
|
Alexander Strizhakov
|
b607ae1a1c
|
removing grouped reports admin api endpoint
|
5 years ago |
|
Alexander Strizhakov
|
f497cf2f7c
|
Merge branch 'develop' into gun
|
5 years ago |
|
Haelwenn
|
e999c67cee
|
Merge branch 'feature/funkwhale-audio' into 'develop'
Add support for funkwhale Audio activity
Closes #764 and #1624
See merge request pleroma/pleroma!2287
|
5 years ago |
|
Ivan Tashkinov
|
dfbc05d496
|
Misc refactoring / tweaks (`ThreadMute.exists?/2`).
|
5 years ago |
|
lain
|
0adaab8e75
|
Bump copyright dates.
|
5 years ago |
|
Ivan Tashkinov
|
112101ca52
|
Merge remote-tracking branch 'remotes/origin/develop' into relations-preloading-for-statuses-rendering
# Conflicts:
# lib/pleroma/thread_mute.ex
|
5 years ago |
|
rinpatch
|
de62e633d3
|
Merge branch '1364-notifications-sending-control' into 'develop'
[#1364] Ability to opt-out of notifications (in all clients)
Closes #1364
See merge request pleroma/pleroma!2301
|
5 years ago |
|
Ivan Tashkinov
|
ff1baae7e9
|
Merge remote-tracking branch 'remotes/origin/develop' into relations-preloading-for-statuses-rendering
|
5 years ago |
|
Ivan Tashkinov
|
460e41585c
|
Further preloading (more endpoints), refactoring, tests.
|
5 years ago |
|
Egor Kislitsyn
|
9081a071ee
|
Add a test for accounts/update_credentials
|
5 years ago |
|
Ivan Tashkinov
|
012d428e1f
|
Merge remote-tracking branch 'remotes/origin/develop' into 1364-notifications-sending-control
|
5 years ago |
|
Ivan Tashkinov
|
e743c22329
|
Fixed incorrect usage of "relations" as a short form of "relationships".
|
5 years ago |
|
Haelwenn (lanodan) Monnier
|
03a18cf037
|
node_info_test: Bump default features list
|
5 years ago |
|
Haelwenn (lanodan) Monnier
|
212c31c637
|
Merge remote-tracking branch 'pleroma/develop' into featureflag/emoji_reactions
|
5 years ago |
|
Haelwenn (lanodan) Monnier
|
64165d1df9
|
node_info_test.exs: Add test on the default feature list
|
5 years ago |
|
Ivan Tashkinov
|
8f1d622b8d
|
Merge remote-tracking branch 'remotes/origin/develop' into relations-preloading-for-statuses-rendering
|
5 years ago |
|
Ivan Tashkinov
|
13cbb9f6ad
|
Implemented preloading of relationships with parent activities' actors for statuses/timeline rendering. Applied preloading for notifications rendering. Fixed announces rendering issue (preloading-related).
|
5 years ago |
|
feld
|
8eebc75c15
|
Merge branch 'fix/activity-deletion' into 'develop'
Fix activity deletion
Closes #1640
See merge request pleroma/pleroma!2328
|
5 years ago |
|
lain
|
1d75d0ed7a
|
Merge branch 'admin-api-change-password' into 'develop'
Admin API: `PATCH /api/pleroma/admin/users/:nickname/update_credentials`
See merge request pleroma/pleroma!2149
|
5 years ago |
|
Egor Kislitsyn
|
d1a9716a98
|
Fix activity deletion
|
5 years ago |
|
lain
|
eec1fcaf55
|
Home timeline tests: Add failing test for relationships
|
5 years ago |
|
Haelwenn (lanodan) Monnier
|
15be6ba9c2
|
AccountView: fix for other forms of <br> in bio
Closes: https://git.pleroma.social/pleroma/pleroma/issues/1643
|
5 years ago |
|
Alexander Strizhakov
|
7f9b5284fa
|
updating clear_config
|
5 years ago |
|
Alexander Strizhakov
|
9bae9b1b1b
|
Merge branch 'develop' into gun
|
5 years ago |
|
lain
|
d74405fc1a
|
Merge branch 'fix-feed-pagination' into 'develop'
Fix for feed page pagination
Closes #1605
See merge request pleroma/pleroma!2281
|
5 years ago |
|
Ivan Tashkinov
|
1c05f539aa
|
Improved in-test `clear_config/n` applicability (setup / setup_all / in-test usage).
|
5 years ago |
|
Ivan Tashkinov
|
0e27c274f4
|
Merge remote-tracking branch 'remotes/origin/develop' into clear-config-test-improvements
# Conflicts:
# test/web/mastodon_api/controllers/account_controller_test.exs
|
5 years ago |
|
lain
|
6c1232b486
|
NotificationController: Fix test.
|
5 years ago |
|
lain
|
1aa8aa7d7f
|
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into remake-remodel-2
|
5 years ago |
|
Alexander Strizhakov
|
fe15f0ba15
|
restrict_unauthenticated setting
|
5 years ago |
|
Alexander Strizhakov
|
98a60df41f
|
include_types parameter in /api/v1/notifications
|
5 years ago |
|
lain
|
3c2c32b460
|
Merge branch 'remake-remodel' into develop
|
5 years ago |
