144648de92
Merge branch 'mastoapi/plaintext-statuses' into 'develop'
...
Provide plaintext representations of content/cw in MastoAPI
Closes #787
See merge request pleroma/pleroma!1035
6 years ago
0a02ed7a2f
Merge branch 'bugfix/follower_count' into 'develop'
...
update the follower count when a follower is blocked
See merge request pleroma/pleroma!1033
6 years ago
07afb9b537
update the follower count when a follower is blocked
6 years ago
4977e96fa4
Merge branch 'use-jobs-in-webpush' into 'develop'
...
Use PleromaJobQueue in Pleroma.Web.Push
See merge request pleroma/pleroma!1023
6 years ago
9abf832b03
Merge remote-tracking branch 'pleroma/develop' into use-jobs-in-webpush
6 years ago
e19590c93f
Merge branch 'improve_upgrade_user_from_ap_id' into 'develop'
...
Improve Transmogrifier.upgrade_user_from_ap_id/2
See merge request pleroma/pleroma!1019
6 years ago
fd45cab9ec
Merge branch 'twitter_oauth' into 'develop'
...
OAuth consumer (sign in / sign up with external provider)
See merge request pleroma/pleroma!923
6 years ago
ff9290836b
Merge branch 'feature/697-language-tag-metadata' into 'develop'
...
adding language tag
See merge request pleroma/pleroma!1034
6 years ago
36c0a10fdf
adding language tag
6 years ago
23067908de
Merge branch 'feature/770-add-emoji-tags' into 'develop'
...
Feature/770 add emoji tags
See merge request pleroma/pleroma!998
6 years ago
c3d5c3513a
Merge remote-tracking branch 'pleroma/develop' into use-jobs-in-webpush
6 years ago
44829d9181
AdminApiControllerTest unused variables fix.
6 years ago
a1a854646e
Merge branch 'develop' into use-jobs-in-webpush
6 years ago
bffddf5e31
[ #923 ] Merge remote-tracking branch 'remotes/upstream/develop' into twitter_oauth
...
# Conflicts:
# docs/config.md
# test/support/factory.ex
6 years ago
b4da2bc1d0
Merge branch 'develop' into 'improve_upgrade_user_from_ap_id'
...
# Conflicts:
# config/config.exs
# docs/config.md
6 years ago
b177e1e7f3
Merge branch 'scheduled-activities' into 'develop'
...
Scheduled activities
See merge request pleroma/pleroma!989
6 years ago
e3328bc138
[ #923 ] Removed <br> elements from auth forms, adjusted docs, minor auth settings refactoring.
6 years ago
fb2040d061
Merge branch 'fix/deactivated-user-error' into 'develop'
...
Return 403 for deactivated user on token request
Closes #785
See merge request pleroma/pleroma!1031
6 years ago
2056efa714
Add scheduler for sending scheduled activities to the queue
6 years ago
fc92a0fd8d
Added limits and media attachments for scheduled activities.
6 years ago
b3870df51f
Handle `scheduled_at` on status creation.
6 years ago
7bf622ce73
Add scheduled activities
6 years ago
7aa53d52bd
Return 403 on oauth token exchange for a deactivated user
6 years ago
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
9aeac7dcca
Merge branch 'feature/prometheus' into 'develop'
...
Upstream: Metrics and debugging
See merge request pleroma/pleroma!1020
6 years ago
b395aebf24
Pin recon dependency to 2.4.0
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
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
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
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
rinpatch