lain
|
36ec8d9694
|
ActivityPub: Fix specs.
|
6 years ago |
|
lain
|
d115d2a27e
|
Conversations: Tidying up.
|
6 years ago |
|
lain
|
c352a0aba6
|
Conversations: Make tests run.
|
6 years ago |
|
lain
|
de57094fca
|
Participations: Add sort index.
|
6 years ago |
|
lain
|
cf353514fe
|
Participations: Add last activity.
|
6 years ago |
|
lain
|
20d9b90760
|
Participation: Get for a user.
|
6 years ago |
|
lain
|
280172f6f6
|
Conversations: Create or bump on inserting a dm.
|
6 years ago |
|
lain
|
64c1c3a407
|
Participations: Add marking as read and unread.
|
6 years ago |
|
lain
|
d1da6b155a
|
Conversation: Add Conversations and Participations.
|
6 years ago |
|
lain
|
b5cecebbc1
|
Conversations: Fix specs.
|
6 years ago |
|
lain
|
a9f805c871
|
Merge remote-tracking branch 'origin/develop' into features/mastoapi/2.6.0-conversations
|
6 years ago |
|
lain
|
5d871173d1
|
Merge branch 'features/mastoapi/2.6.0-conversations' of git.pleroma.social:pleroma/pleroma into features/mastoapi/2.6.0-conversations
|
6 years ago |
|
lambda
|
4977e96fa4
|
Merge branch 'use-jobs-in-webpush' into 'develop'
Use PleromaJobQueue in Pleroma.Web.Push
See merge request pleroma/pleroma!1023
|
6 years ago |
|
Egor Kislitsyn
|
9abf832b03
|
Merge remote-tracking branch 'pleroma/develop' into use-jobs-in-webpush
|
6 years ago |
|
lambda
|
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 |
|
lambda
|
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 |
|
lambda
|
ff9290836b
|
Merge branch 'feature/697-language-tag-metadata' into 'develop'
adding language tag
See merge request pleroma/pleroma!1034
|
6 years ago |
|
Alexander Strizhakov
|
36c0a10fdf
|
adding language tag
|
6 years ago |
|
lambda
|
23067908de
|
Merge branch 'feature/770-add-emoji-tags' into 'develop'
Feature/770 add emoji tags
See merge request pleroma/pleroma!998
|
6 years ago |
|
Egor Kislitsyn
|
c3d5c3513a
|
Merge remote-tracking branch 'pleroma/develop' into use-jobs-in-webpush
|
6 years ago |
|
Ivan Tashkinov
|
44829d9181
|
AdminApiControllerTest unused variables fix.
|
6 years ago |
|
Egor Kislitsyn
|
a1a854646e
|
Merge branch 'develop' into use-jobs-in-webpush
|
6 years ago |
|
Ivan Tashkinov
|
bffddf5e31
|
[#923] Merge remote-tracking branch 'remotes/upstream/develop' into twitter_oauth
# Conflicts:
# docs/config.md
# test/support/factory.ex
|
6 years ago |
|
lambda
|
b4da2bc1d0
|
Merge branch 'develop' into 'improve_upgrade_user_from_ap_id'
# Conflicts:
# config/config.exs
# docs/config.md
|
6 years ago |
|
lambda
|
b177e1e7f3
|
Merge branch 'scheduled-activities' into 'develop'
Scheduled activities
See merge request pleroma/pleroma!989
|
6 years ago |
|
Ivan Tashkinov
|
e3328bc138
|
[#923] Removed <br> elements from auth forms, adjusted docs, minor auth settings refactoring.
|
6 years ago |
|
feld
|
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 |
|
eugenijm
|
2056efa714
|
Add scheduler for sending scheduled activities to the queue
|
6 years ago |
|
eugenijm
|
fc92a0fd8d
|
Added limits and media attachments for scheduled activities.
|
6 years ago |
|
eugenijm
|
b3870df51f
|
Handle `scheduled_at` on status creation.
|
6 years ago |
|
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 |
|
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
|
7410aee886
|
Merge develop to 770-add-emoji-tags
Merge conflict in test/web/mastodon_api/mastodon_api_controller_test.exs
|
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 |
|
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 |
|
Egor Kislitsyn
|
1c2e4f88d1
|
fix credo
|
6 years ago |
