kaniini
|
10248d86a2
|
Merge branch 'unify-follow' into 'develop'
Unify follow code with CommonAPI
Closes #690
See merge request pleroma/pleroma!889
|
6 years ago |
|
eugenijm
|
86e4b48a5e
|
Fix DM visibility for blocking users
|
6 years ago |
|
eugenijm
|
594694607c
|
Unify Mastodon and Twitter follow implementations using CommonAPI
|
6 years ago |
|
kaniini
|
6c6a2dbfdd
|
Merge branch 'feature/add-pagination-to-users-admin-api' into 'develop'
Add pagination and search to users
See merge request pleroma/pleroma!873
|
6 years ago |
|
eugenijm
|
d5418e9ff7
|
Remove follow_request_count as it's not needed for FE anymore.
MastoFE uses `GET /api/v1/follow_requests` and PleromaFE uses
`GET /api/pleroma/friend_requests` which they query on the initial page
load.
|
6 years ago |
|
lambda
|
9b63fda9c7
|
Merge branch 'fix/dont-show-dms-in-mentions-timeline' into 'develop'
[#675] Do not show DMs in mentions timeline
See merge request pleroma/pleroma!877
|
6 years ago |
|
Maxim Filippov
|
5b08b470f6
|
Add "local" params to users search
|
6 years ago |
|
lambda
|
2f00814475
|
Merge branch 'bugfix/236-ambiguous-route-for-numerical-handles' into 'develop'
Bugfix #236 Prefer user look-up by nickname
See merge request pleroma/pleroma!860
|
6 years ago |
|
rinpatch
|
1341ee650e
|
[#675] Do not show DMs in mentions timeline
|
6 years ago |
|
Maxim Filippov
|
72b7a0797e
|
Use Mastodon API views in Admin API
|
6 years ago |
|
kaniini
|
cf426a719d
|
Merge branch 'with-mutes' into 'develop'
Add `with_muted` param.
Closes #683
See merge request pleroma/pleroma!872
|
6 years ago |
|
eugenijm
|
6b11011039
|
Added deactivated to the user view
|
6 years ago |
|
Maxim Filippov
|
2883f75a3a
|
Add pagination to users admin API
|
6 years ago |
|
lain
|
bbbdbec4fd
|
Remove parts of the old activity view.
Not used anymore.
|
6 years ago |
|
lain
|
9ade1242c2
|
Add user muted status info to twitterapi.
|
6 years ago |
|
Maxim Filippov
|
90d0d055fc
|
Add more admin actions
|
6 years ago |
|
11backslashes
|
efa506b874
|
delegate user retrieval to the User module
|
6 years ago |
|
lain
|
9e0686efa6
|
Move visibility into own module.
|
6 years ago |
|
Egor
|
bff9eb5ef7
|
Reports
|
6 years ago |
|
kaniini
|
7456338ed3
|
Merge branch 'feature/add-oauth-tokens-endpoint' into 'develop'
Add OAuth tokens endpoint
See merge request pleroma/pleroma!805
|
6 years ago |
|
kaniini
|
cd019a5927
|
Merge branch 'follow-request-count' into 'develop'
Follow request count
See merge request pleroma/pleroma!817
|
6 years ago |
|
Maxim Filippov
|
94708d6370
|
Render only "id", "valid_until" and "app_name" in TokenView
|
6 years ago |
|
lain
|
38e15930cb
|
Add option to return all friends in twitter api.
Mainly useful for user export.
|
6 years ago |
|
eugenijm
|
ecdf0657ba
|
Add logic for keeping follow_request_count up-to-date on the `follow`,
`approve_friend_request`, and `deny_friend_request` actions.
Add follow_request_count to the user view.
|
6 years ago |
|
Maxim Filippov
|
62a45bdc11
|
Add revoke token
|
6 years ago |
|
Maxim Filippov
|
61a4bc5095
|
Add OAuth tokens endpoint
|
6 years ago |
|
lambda
|
d53e36bf1e
|
Revert "Merge branch 'object-creation' into 'develop'"
This reverts merge request !802
|
6 years ago |
|
kaniini
|
6c8d15da11
|
Merge branch 'fix/credo-issues' into 'develop'
Fix credo issues
See merge request pleroma/pleroma!786
|
6 years ago |
|
lain
|
f8388be9c6
|
Do object insertion through Cachex
So we don't flood our postgres logs with errors. Should also make things
slightly faster.
|
6 years ago |
|
Haelwenn (lanodan) Monnier
|
6a6a5b3251
|
de-group alias/es
|
6 years ago |
|
Haelwenn (lanodan) Monnier
|
60ea29dfe6
|
Credo fixes: alias grouping/ordering
|
6 years ago |
|
Mark Felder
|
74518d0b60
|
hide_followings was renamed to hide_followers in the FE, but never synced up in the BE
This was a dirty regex replace which worked on my server
|
6 years ago |
|
eugenijm
|
035eaeb9b8
|
Allow to configure visibility for admin and moderator badges
|
6 years ago |
|
eugenijm
|
398c81f9c8
|
Add is_admin and is_moderator boolean fields to the user view
|
6 years ago |
|
Maxim Filippov
|
16ce129e38
|
Split hide_network into hide_followers & hide_followings (fixed)
|
6 years ago |
|
kaniini
|
486749064f
|
Revert "Merge branch 'feature/split-hide-network' into 'develop'"
This reverts merge request !733
|
6 years ago |
|
kaniini
|
0a82a7e6d6
|
Merge branch 'feature/split-hide-network' into 'develop'
Split hide_network into hide_followers & hide_followings
See merge request pleroma/pleroma!733
|
6 years ago |
|
kaniini
|
d03a116654
|
Merge branch 'hj-happiness-improvement' into 'develop'
New frontend configuration mechanism.
Closes #445
See merge request pleroma/pleroma!700
|
6 years ago |
|
Maxim Filippov
|
50d6183893
|
Split hide_network into hide_followers & hide_followings
|
6 years ago |
|
lain
|
8e8a1e1ba8
|
Return new-style config if old-style config is set to false.
This is in preparation for 1.0. We'll be able to switch the config to the new
mechanism on PleromaFE then as well.
|
6 years ago |
|
William Pitcock
|
8e42251e06
|
rich media: add helpers module, use instead of MastodonAPI module
|
6 years ago |
|
William Pitcock
|
07a9a891ad
|
twitter api: fix up activity representer
|
6 years ago |
|
William Pitcock
|
5d895093fd
|
twitter api: embed card in twitterapi posts
|
6 years ago |
|
href
|
f83bae7c22
|
Views: wrap activity rendering in a rescue
this avoids complete timeline breakage when an activity fucks up
rendering.
|
6 years ago |
|
kaniini
|
4c99b6d35a
|
Merge branch 'fix/tusky-dm' into 'develop'
Add actor to recipients list
Closes #390
See merge request pleroma/pleroma!683
|
6 years ago |
|
kaniini
|
4df71cd88b
|
Merge branch 'classic-flakeids' into 'develop'
Flake Ids for Users and Activities
Closes #450
See merge request pleroma/pleroma!645
|
6 years ago |
|
Maxim Filippov
|
9274cabe01
|
Use correct logic to determine "attentions" list
|
6 years ago |
|
Maxim Filippov
|
4333fea1dc
|
Send "hide_network" in user_view
|
6 years ago |
|
lain
|
e221c681dc
|
New frontend configuration mechanism.
|
6 years ago |
|
href
|
973c9eed18
|
Treat User.Info pinned ids as strings
|
6 years ago |
