Egor Kislitsyn
|
0f2f7d2cec
|
Merge remote-tracking branch 'pleroma/develop' into feature/disable-account
|
6 years ago |
|
lambda
|
e5d553aa45
|
Merge branch 'feature/767-multiple-use-invite-token' into 'develop'
Feature/767 multiple use invite token
See merge request pleroma/pleroma!1032
|
6 years ago |
|
lambda
|
c8440b5e0c
|
Merge branch 'fix/emoji-api-nonsense' into 'develop'
Change response format of /api/pleroma/emoji so it makes sense
See merge request pleroma/pleroma!1038
|
6 years ago |
|
kaniini
|
97395e013e
|
Merge branch 'notification-pleroma-settings' into 'develop'
Notification controls
Closes #738
See merge request pleroma/pleroma!988
|
6 years ago |
|
rinpatch
|
b57b43027c
|
Change response format of /api/pleroma/emoji to the one that actually makes sense
|
6 years ago |
|
Alex S
|
a53d591ac5
|
code style
|
6 years ago |
|
Alex S
|
7410aee886
|
Merge develop to 770-add-emoji-tags
Merge conflict in test/web/mastodon_api/mastodon_api_controller_test.exs
|
6 years ago |
|
Alex S
|
47b07cec49
|
token -> invite renaming
|
6 years ago |
|
Alex S
|
be54e40890
|
twitter api registration
fix for twitter api tests
|
6 years ago |
|
rinpatch
|
f0f30019e1
|
Refactor html caching functions to have a key instead of a module, use more correct terminology and fix summaries in mastoapi
|
6 years ago |
|
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
|
88d3cb44c3
|
replace `Repo.get_by(User, nickname: nickname)` with `User.get_by_nickname(nickname)`
|
6 years ago |
|
Egor Kislitsyn
|
1b3d921921
|
change `Repo.get(User, id)` => `User.get_by_id(id)`
|
6 years ago |
|
Egor Kislitsyn
|
4212527928
|
change `Repo.get(Activity, id)` => `Activity.get_by_id(id)`
|
6 years ago |
|
Sachin Joshi
|
f20e8d28de
|
add support for all status type (ostatus) and replase case with if
|
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 |
|
eugenijm
|
cd90695a34
|
Add PUT /api/pleroma/notification_settings endpoint
|
6 years ago |
|
rinpatch
|
406d19331f
|
Remove ActivityRepresenter
|
6 years ago |
|
rinpatch
|
1b33986bfa
|
Fix text being nullable in TwitterAPI
|
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
|
fea3696799
|
common api: move context functions from twitterapi
|
6 years ago |
|
lain
|
bf27190f7f
|
UtilController: Return state of safe dm mentions.
|
6 years ago |
|
eugenijm
|
43fb03be5a
|
Allow to mark a single notification as read
|
6 years ago |
|
eugenijm
|
e416c344dd
|
Unify unfollow, accept and reject follow requests using CommonAPI
|
6 years ago |
|
Haelwenn (lanodan) Monnier
|
d43b1c0b5d
|
Pleroma.Web.TwitterAPI.Controller: Remove duplicated alias/es
|
6 years ago |
|
Haelwenn (lanodan) Monnier
|
c3d41b2b6e
|
[Credo] make all variables use snake_case
|
6 years ago |
|
Haelwenn (lanodan) Monnier
|
a3a9cec483
|
[Credo] fix Credo.Check.Readability.AliasOrder
|
6 years ago |
|
Haelwenn (lanodan) Monnier
|
4c440f12c3
|
[Credo] Fix the consistency
|
6 years ago |
|
Egor Kislitsyn
|
22ac2288be
|
Merge remote-tracking branch 'pleroma/develop' into feature/disable-account
|
6 years ago |
|
kaniini
|
10248d86a2
|
Merge branch 'unify-follow' into 'develop'
Unify follow code with CommonAPI
Closes #690
See merge request pleroma/pleroma!889
|
6 years ago |
|
Egor Kislitsyn
|
eb84de0143
|
allow users to disable their own account
|
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 |
