kaniini
ef3c23d40e
Merge branch 'bugfix/migration-less_replies_count' into 'develop'
Revert awfully long migration from 568e34858
See merge request pleroma/pleroma!991
5 vuotta sitten
Haelwenn (lanodan) Monnier
b2f3a40e53
Revert awfully long migration from 568e34858
5 vuotta sitten
rinpatch
634e09e1a8
Remove duplicated header from i2p.md
5 vuotta sitten
rinpatch
9bd80e6044
did it really take me 4 commits to fix this?
5 vuotta sitten
rinpatch
d16e2a2e04
Remove duplicated header from admin_api.md
5 vuotta sitten
rinpatch
e4601b2c1d
remove admin tasks as they have their page in mix tasks category already
5 vuotta sitten
rinpatch
d0026761b7
cringe
5 vuotta sitten
rinpatch
dfae0050af
Move out of Gitlab Wiki
I understand that this change is quite unreadable and hard to review, sorry for forgetting to do atomic commits. This patch does not change too much content wise, it just
* Gets everything from gitlab wiki
* Removes some specific gitlab hacks
* Formats all documentation file names to be in snake case so they look the same way as our code does
5 vuotta sitten
eugenijm
cd90695a34
Add PUT /api/pleroma/notification_settings endpoint
5 vuotta sitten
lambda
a71831d1c2
Merge branch 'admin-api-user-show' into 'develop'
Admin API user show
Closes #766
See merge request pleroma/pleroma!987
5 vuotta sitten
eugenijm
55d086b520
Notification controls
Allow users to configure whether they want to receive notifications from people they follow / who follow them, people from remote / local instances
5 vuotta sitten
eugenijm
10c81fc902
Add user show endpoint for Pleroma admin API
5 vuotta sitten
Ivan Tashkinov
642075b1a9
[ #923 ] Enabled binding of multiple OAuth provider accounts to single user.
5 vuotta sitten
Ivan Tashkinov
20e0f36605
Merge remote-tracking branch 'remotes/origin/develop' into twitter_oauth
5 vuotta sitten
Ivan Tashkinov
2a95014b9d
[ #923 ] OAuth consumer improvements, fixes, refactoring.
5 vuotta sitten
lambda
926bf114b7
Merge branch 'feature/more-user-filters' into 'develop'
Add more user filters + move search to its own module
See merge request pleroma/pleroma!982
5 vuotta sitten
lambda
a5f141d9d5
Merge branch 'fix-reblog-tests' into 'develop'
Fix muting reblogs tests
See merge request pleroma/pleroma!984
5 vuotta sitten
rinpatch
776bb5137f
Fix muting reblogs tests
5 vuotta sitten
rinpatch
6da1999fc8
Merge branch 'hotfix/missing-announce-mastoapi' into 'develop'
Fix missing announces in MastoAPI home timeline
Closes #762
See merge request pleroma/pleroma!983
5 vuotta sitten
rinpatch
ce6d64bbd8
Fix missing announces in MastoAPI home timeline
Closes #762
5 vuotta sitten
lambda
b2e163ec57
Merge branch 'apps-verify-credentials' into 'develop'
MastodonAPI: Add GET /api/v1/apps/verify_credentials
See merge request pleroma/pleroma!981
5 vuotta sitten
Maxim Filippov
3cf7539bca
Add more user filters + move search to its own module
5 vuotta sitten
eugenijm
a4ab60ac54
Add vapid_key to the `POST /api/v1/apps` response
5 vuotta sitten
eugenijm
691d1208b5
Add GET /api/v1/apps/verify_credentials
5 vuotta sitten
lambda
ff3b09f6b3
Merge branch 'fix/ap-icon' into 'develop'
Do not federate instance avatar
Closes #759
See merge request pleroma/pleroma!977
5 vuotta sitten
lambda
c6ab5ebe7c
Merge branch 'features/mastoapi/2.7.2-instance-attributes' into 'develop'
Mastodon 2.7.2 instance attributes (registrations, languages)
See merge request pleroma/pleroma!979
5 vuotta sitten
lain
10a7a4a868
AP UserView: Refactor banner / avatar display code, add test.
5 vuotta sitten
Ivan Tashkinov
47b49ab1a1
Test for MastoAPI /api/v1/instance response structure (formatting fix).
5 vuotta sitten
lambda
9e3899bf36
Merge branch 'features/mastoapi/2.7.0-auth-error-messages' into 'develop'
Mastodon-based auth error messages. User#auth_active?/1 refactoring.
See merge request pleroma/pleroma!978
5 vuotta sitten
Ivan Tashkinov
caf0e9cf33
Test for MastoAPI /api/v1/instance response structure.
5 vuotta sitten
lambda
21ff78cd40
Merge branch 'replies-count' into 'develop'
Increment replies_count (MastoAPI)
Closes #756
See merge request pleroma/pleroma!974
5 vuotta sitten
lambda
3f44433ebd
Merge branch 'refactor/remove-activity-representer' into 'develop'
Remove ActivityRepresenter
See merge request pleroma/pleroma!980
5 vuotta sitten
rinpatch
aacdcac1be
Credo is upset about me not remembering the alphabet
5 vuotta sitten
rinpatch
087662d4fb
Fix formatting
5 vuotta sitten
rinpatch
406d19331f
Remove ActivityRepresenter
5 vuotta sitten
Ivan Tashkinov
eef1042b16
Mastodon 2.7.2 instance attributes (registrations, languages).
5 vuotta sitten
eugenijm
568e348588
Increment replies_count on replies (MastoAPI)
5 vuotta sitten
Ivan Tashkinov
b0759f821b
Comments split.
5 vuotta sitten
Ivan Tashkinov
263ca3dea2
Mastodon-based auth error messages. Defaulted User#auth_active?/1 to `true`.
5 vuotta sitten
Mark Felder
c410296120
Try sending an empty map
5 vuotta sitten
Mark Felder
6f090f981b
Attempt to fix incorrect federation of default instance avatars
5 vuotta sitten
rinpatch
15aa94f40f
Merge branch 'fix/notification-id-index' into 'develop'
Add an `id desc nulls last` index to notifications
See merge request pleroma/pleroma!975
5 vuotta sitten
rinpatch
9725c93cea
Add an id index to notifications
5 vuotta sitten
rinpatch
b028b0f97d
Merge branch 'bugfix/missing-announces' into 'develop'
fix up missing announcements with preloads
See merge request pleroma/pleroma!972
5 vuotta sitten
William Pitcock
26b0c802c3
fix up missing announcements with preloads
5 vuotta sitten
kaniini
bc14c98de1
Merge branch 'features/s3-uploader-digital-ocean' into 'develop'
add overriding truncated_namespace condition for truncating paths for digital ocean
See merge request pleroma/pleroma!969
5 vuotta sitten
kaniini
63ffa4842c
Merge branch 'fix/mastoapi-liked' into 'develop'
Serve non-public activities in /api/v1/favourites
Closes #648
See merge request pleroma/pleroma!970
5 vuotta sitten
rinpatch
a7f58b3c13
Serve non-public activities in /api/v1/favourites
Fixes #648
5 vuotta sitten
Austin Lanari
6c96d68f77
add overriding truncated_namespace condition for truncating paths for digital ocean
5 vuotta sitten
rinpatch
750de7d842
Merge branch 'features/mrf-keyword-nil-summary' into 'develop'
mrf/keyword_policy.ex: Fix when summary == nil, do not whitelist content == nil
See merge request pleroma/pleroma!968
5 vuotta sitten