eugenijm
7bf622ce73
Add scheduled activities
6 years ago
eugenijm
7aa53d52bd
Return 403 on oauth token exchange for a deactivated user
6 years ago
feld
876965a7e7
Merge branch 'fix/failed-legacy-test' into 'develop'
...
Mock :crypt.crypt/2 to pass LegacyAuthenticationPlugTest on Mac OS
See merge request pleroma/pleroma!1030
6 years ago
Alex S
ce8d457132
little channges
6 years ago
Sadposter
e6778003ab
JSON need quotes!
6 years ago
Sadposter
c05fe4da0a
Document subscription endpoints, fix typos
...
Also adds a quick error case on the subscription endpoints
to avoid 500s
6 years ago
feld
9aeac7dcca
Merge branch 'feature/prometheus' into 'develop'
...
Upstream: Metrics and debugging
See merge request pleroma/pleroma!1020
6 years ago
Mark Felder
b395aebf24
Pin recon dependency to 2.4.0
6 years ago
Alex S
76d8928cf1
fix for field name
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
dcc54f8cfa
admin api endpoints for invites
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
Alex S
0484f3a8b1
generating tokens with mix
6 years ago
Haelwenn
3c5daa0235
Merge branch 'feature/mastofe-redurect-to-referer-after-login' into 'develop'
...
Redirect to the referer url after mastofe authorization
Closes #717
See merge request pleroma/pleroma!1025
6 years ago
Sergey Suprunenko
325a268017
Redirect to the referer url after mastofe authorization
6 years ago
Sergey Suprunenko
e9c075d05c
Mock :crypt.crypt/2 because otherwise the test fails on Mac OS
6 years ago
rinpatch
e3ca9f708f
Merge branch 'revert-8607ae68' into 'develop'
...
Revert "Merge branch 'test-coverage' into 'develop'"
See merge request pleroma/pleroma!1028
6 years ago
rinpatch
e5df8cadea
Revert "Merge branch 'test-coverage' into 'develop'"
...
This reverts merge request !1027
6 years ago
rinpatch
8607ae6841
Merge branch 'test-coverage' into 'develop'
...
Use --cover option when running CI tests
See merge request pleroma/pleroma!1027
6 years ago
optikfluffel
fb1be1d798
Use --cover option when running CI tests
6 years ago
feld
3fb3f42e77
Merge branch 'feature/admin-api-follow' into 'develop'
...
Feature/admin api follow
See merge request pleroma/pleroma!1026
6 years ago
Mark Felder
fac76bfa35
We actually want the user id not nickname in the test...
6 years ago
Mark Felder
c746087f57
Also remove Repo functions in the tests
6 years ago
Mark Felder
b5a2d384f7
Redundant Repo.get_by usage was recently removed from the codebase
6 years ago
Sadposter
ffac2593ea
Add index on subscribers
6 years ago
Mark Felder
da64a5aece
Document the admin API endpoints for controlling follow/unfollow
6 years ago
Roger Braun
7895ee37fa
Add user following / unfollowing to the admin api.
6 years ago
Sadposter
a270e7a191
Mix format everything
6 years ago
Sadposter
f6e131eeb9
Don't use twitterAPI for subscription tests
6 years ago
Sadposter
9ca91cbb87
Change relationship direction of subscriptions
6 years ago
Sadposter
d35f6551c1
Move subscriptions endpoint to be under /pleroma
6 years ago
Sadposter
73afd13c21
Add subscription key to one test I forgot about
6 years ago
Sadposter
06cd547fc6
Format subscriptions related stuff
6 years ago
Sadposter
d56866c824
Add subscribed status to user view
...
Added in pleroma extensions, but can be moved whenever
6 years ago
Sadposter
75c4ceb4a2
Add tests for subscriptions
6 years ago
Sadposter
316fe20d86
Make subscriptions the same direction as blocks
...
That being, user - subscribes to -> users, rather than
user - has subscribers -> users
6 years ago
Sadposter
23c4f49494
Fix subscription endpoint return formats
6 years ago
Sadposter
007762e767
Add notification checks
6 years ago
Sadposter
79910ce5cc
Add API endpoints and user column for subscription
6 years ago
Egor Kislitsyn
1c2e4f88d1
fix credo
6 years ago
lambda
5499750054
Merge branch 'hotfix/html-sanitization' into 'develop'
...
Refactor html caching functions to use a key instead of a module, use more correct terminology and fix summaries in mastoapi
See merge request pleroma/pleroma!1022
6 years ago
Egor Kislitsyn
f1712cd2f1
Use PleromaJobQueue in Pleroma.Web.Push
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
Ivan Tashkinov
47a236f753
[ #923 ] OAuth consumer mode refactoring, new tests, tests adjustments, readme.
6 years ago
Ivan Tashkinov
3e7f2bfc2f
[ #923 ] OAuthController#callback adjustments (with tests).
6 years ago
Ivan Tashkinov
45765918c3
[ #923 ] Merge remote-tracking branch 'remotes/upstream/develop' into twitter_oauth
...
# Conflicts:
# mix.exs
6 years ago
Mark Felder
66e7b03372
Merge branch 'develop' into feature/prometheus
6 years ago
feld
9c9eec62c2
Merge branch 'feature/quack' into 'develop'
...
Add ability to ship logs to a Slack channel
See merge request pleroma/pleroma!1014
6 years ago