Alex S
|
fa8483cb80
|
Merging develop into feature/770-add-emoji-tags
Conflict test/web/twitter_api/util_controller_test.exs
|
6 years ago |
lambda
|
180b87257c
|
Merge branch 'bugfix/share-mastodon' into 'develop'
[OStatus] adds status to pleroma instance if the url given is a status
See merge request pleroma/pleroma!1002
|
6 years ago |
Alex S
|
9e0567ec52
|
Merge develop into feature/770-add-emoji-tags
|
6 years ago |
Egor Kislitsyn
|
20c619f85f
|
replace `Repo.get_by(User, nickname: nickname)` with `User.get_by_nickname(nickname)` in tests
|
6 years ago |
Egor Kislitsyn
|
9a59c26619
|
replace `Repo.get_by(User, ap_id: ap_id)` with `User.get_by_ap_id(ap_id)`
|
6 years ago |
Egor Kislitsyn
|
11c2d6bdc4
|
change `Repo.get(Activity, id)` => `Activity.get_by_id(id)` in tests
|
6 years ago |
Egor Kislitsyn
|
1b3d921921
|
change `Repo.get(User, id)` => `User.get_by_id(id)`
|
6 years ago |
Sachin Joshi
|
6386c1c9c1
|
fetch url for OStatus to know if it is a/c or status
|
6 years ago |
Sachin Joshi
|
1d01e8e656
|
[OStatus] adds status to pleroma instance if the url given is a status
|
6 years ago |
Alex S
|
3601f03147
|
Adding tag to emoji ets table
changes in apis
|
6 years ago |
rinpatch
|
aacdcac1be
|
Credo is upset about me not remembering the alphabet
|
6 years ago |
rinpatch
|
087662d4fb
|
Fix formatting
|
6 years ago |
rinpatch
|
406d19331f
|
Remove ActivityRepresenter
|
6 years ago |
kaniini
|
1c3d3d0c2b
|
Merge branch 'safe-mentions' into 'develop'
Add safe dm mode option.
See merge request pleroma/pleroma!958
|
6 years ago |
William Pitcock
|
a223e65f35
|
tests: fixup
|
6 years ago |
William Pitcock
|
fea3696799
|
common api: move context functions from twitterapi
|
6 years ago |
lain
|
bf27190f7f
|
UtilController: Return state of safe dm mentions.
|
6 years ago |
Fong-Wan Chau
|
4ed2618f6c
|
Allow 'rel' attribute on `<a>` link with specific values (for hashtag recognition).
|
6 years ago |
eugenijm
|
43fb03be5a
|
Allow to mark a single notification as read
|
6 years ago |
Haelwenn (lanodan) Monnier
|
23960309a0
|
[Credo] Change quoted string with 3+ quotes to sigils
|
6 years ago |
Haelwenn (lanodan) Monnier
|
c42d34b2ec
|
[Credo] fix Credo.Check.Readability.MaxLineLength
|
6 years ago |
Haelwenn (lanodan) Monnier
|
a3a9cec483
|
[Credo] fix Credo.Check.Readability.AliasOrder
|
6 years ago |
Haelwenn (lanodan) Monnier
|
6c8743d0c0
|
[Credo] Fix the warnings
|
6 years ago |
eugenijm
|
86e4b48a5e
|
Fix DM visibility for blocking users
|
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 |
rinpatch
|
9c6abec4d8
|
use commonapi.post instead of activitybulder
|
6 years ago |
rinpatch
|
1341ee650e
|
[#675] Do not show DMs in mentions timeline
|
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 |
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 |
Ivan Tashkinov
|
337367d764
|
[#468] More OAuth scopes-specific tests.
|
6 years ago |
Ivan Tashkinov
|
04ee877a20
|
[#468] Added OAuth scopes-specific tests.
|
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
|
fd17a0cc9b
|
Fix test
|
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 |
Haelwenn (lanodan) Monnier
|
8bb7e19b38
|
test: de-group alias/es
|
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 |
William Pitcock
|
73e6a1f1dd
|
test: twitterapi: fix another possible test failure case
|
6 years ago |
kaniini
|
eb2b1960e0
|
Merge branch 'feature/split-hide-network-v2' into 'develop'
Split hide_network into hide_followers & hide_followings (fixed)
See merge request pleroma/pleroma!765
|
6 years ago |
William Pitcock
|
c4d317ccb6
|
test: twitterapi: fix the test breakage for real
|
6 years ago |
Maxim Filippov
|
16ce129e38
|
Split hide_network into hide_followers & hide_followings (fixed)
|
6 years ago |
lain
|
505a084058
|
Still do caching in tests.
|
6 years ago |