76d8928cf1
fix for field name
6 years ago
a53d591ac5
code style
6 years ago
7410aee886
Merge develop to 770-add-emoji-tags
...
Merge conflict in test/web/mastodon_api/mastodon_api_controller_test.exs
6 years ago
dcc54f8cfa
admin api endpoints for invites
6 years ago
47b07cec49
token -> invite renaming
6 years ago
be54e40890
twitter api registration
...
fix for twitter api tests
6 years ago
0484f3a8b1
generating tokens with mix
6 years ago
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
325a268017
Redirect to the referer url after mastofe authorization
6 years ago
e9c075d05c
Mock :crypt.crypt/2 because otherwise the test fails on Mac OS
6 years ago
e3ca9f708f
Merge branch 'revert-8607ae68' into 'develop'
...
Revert "Merge branch 'test-coverage' into 'develop'"
See merge request pleroma/pleroma!1028
6 years ago
e5df8cadea
Revert "Merge branch 'test-coverage' into 'develop'"
...
This reverts merge request !1027
6 years ago
8607ae6841
Merge branch 'test-coverage' into 'develop'
...
Use --cover option when running CI tests
See merge request pleroma/pleroma!1027
6 years ago
fb1be1d798
Use --cover option when running CI tests
6 years ago
3fb3f42e77
Merge branch 'feature/admin-api-follow' into 'develop'
...
Feature/admin api follow
See merge request pleroma/pleroma!1026
6 years ago
fac76bfa35
We actually want the user id not nickname in the test...
6 years ago
c746087f57
Also remove Repo functions in the tests
6 years ago
b5a2d384f7
Redundant Repo.get_by usage was recently removed from the codebase
6 years ago
ffac2593ea
Add index on subscribers
6 years ago
da64a5aece
Document the admin API endpoints for controlling follow/unfollow
6 years ago
7895ee37fa
Add user following / unfollowing to the admin api.
6 years ago
a270e7a191
Mix format everything
6 years ago
f6e131eeb9
Don't use twitterAPI for subscription tests
6 years ago
9ca91cbb87
Change relationship direction of subscriptions
6 years ago
d35f6551c1
Move subscriptions endpoint to be under /pleroma
6 years ago
73afd13c21
Add subscription key to one test I forgot about
6 years ago
06cd547fc6
Format subscriptions related stuff
6 years ago
d56866c824
Add subscribed status to user view
...
Added in pleroma extensions, but can be moved whenever
6 years ago
75c4ceb4a2
Add tests for subscriptions
6 years ago
316fe20d86
Make subscriptions the same direction as blocks
...
That being, user - subscribes to -> users, rather than
user - has subscribers -> users
6 years ago
23c4f49494
Fix subscription endpoint return formats
6 years ago
007762e767
Add notification checks
6 years ago
79910ce5cc
Add API endpoints and user column for subscription
6 years ago
1c2e4f88d1
fix credo
6 years ago
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
f1712cd2f1
Use PleromaJobQueue in Pleroma.Web.Push
6 years ago
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
47a236f753
[ #923 ] OAuth consumer mode refactoring, new tests, tests adjustments, readme.
6 years ago
3e7f2bfc2f
[ #923 ] OAuthController#callback adjustments (with tests).
6 years ago
45765918c3
[ #923 ] Merge remote-tracking branch 'remotes/upstream/develop' into twitter_oauth
...
# Conflicts:
# mix.exs
6 years ago
66e7b03372
Merge branch 'develop' into feature/prometheus
6 years ago
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
3b12eeda19
Add ability to ship logs to a Slack channel
6 years ago
f7cd9131d4
[ #923 ] OAuth consumer controller tests. Misc. improvements.
6 years ago
69038887b2
Code readability tweak
6 years ago
7222afe01b
Clean merge crumbs
6 years ago
7e930559fe
Serve metrics at `/api/pleroma/app_metrics`
6 years ago
5564cd421d
Document Prometheus
6 years ago
0b5c818cb7
[ #1 ] fix telemetry
6 years ago
bc3618a38d
Set up telemetry and prometheus
6 years ago
Alex S