Haelwenn
|
f95a2b2cda
|
Merge branch 'issue/733' into 'develop'
[#733] added test for Ostatus
See merge request pleroma/pleroma!1657
|
5 years ago |
|
rinpatch
|
b0ec82d24a
|
Merge branch 'chores/bump-copyright-year' into 'develop'
Bump copyright years of files changed in 2019
See merge request pleroma/pleroma!1698
|
5 years ago |
|
Haelwenn (lanodan) Monnier
|
447514dfa2
|
Bump copyright years of files changed in 2019
Done via the following command:
git diff 1e6c102bfc --stat --name-only | cat - | xargs sed -i 's/2017-2018 Pleroma Authors/2017-2019 Pleroma Authors/'
|
5 years ago |
|
feld
|
ab2ca3038f
|
Merge branch 'hide-follower-following-count' into 'develop'
Add a setting to hide follows/followers stats from the user profile
See merge request pleroma/pleroma!1663
|
5 years ago |
|
feld
|
25b4365656
|
Merge branch 'admin_api_invite_tokens' into 'develop'
POST for creating invite tokens in admin api
See merge request pleroma/pleroma!1637
|
5 years ago |
|
feld
|
220afadc55
|
Merge branch 'restore-tests' into 'develop'
Restore tests for `change_password` and `delete_account`
See merge request pleroma/pleroma!1658
|
5 years ago |
|
Alex S
|
4faf2b1555
|
post for creating invite tokens in admin api
|
5 years ago |
|
Maksim Pechnikov
|
0447c42715
|
Merge branch 'develop' into issue/733
|
5 years ago |
|
rinpatch
|
ef2e2c5e12
|
Merge branch 'feature/return-total-for-reports' into 'develop'
Admin API: Return total for reports
See merge request pleroma/pleroma!1628
|
5 years ago |
|
Maksim Pechnikov
|
7dd51652f9
|
Merge branch 'develop' into issue/733
|
5 years ago |
|
rinpatch
|
95a4a19417
|
Merge branch 'support/tests' into 'develop'
add tests for activity_pub/utils.ex
See merge request pleroma/pleroma!1627
|
5 years ago |
|
eugenijm
|
450bf7a63c
|
Mastodon API: Add a setting to hide follow/follower count from the user view (`hide_follows_count` and `hide_followers_count`)
|
5 years ago |
|
Maxim Filippov
|
219dca1b00
|
Merge branch 'develop' into feature/return-total-for-reports
|
5 years ago |
|
Egor Kislitsyn
|
96816ceaa2
|
Revert "Merge branch 'revert-4fabf83a' into 'develop'"
This reverts commit fe7fd33126, reversing
changes made to 4fabf83ad0.
|
5 years ago |
|
rinpatch
|
e8120944d8
|
Fix signed fetch inclusion publisher test
Oban branch changed `actor` to `actor_id` and this test was not adjusted for that
|
5 years ago |
|
kaniini
|
c623b4324d
|
Revert "Merge branch 'streamer-refactoring' into 'develop'"
This reverts merge request !1653
|
5 years ago |
|
Steven Fuchs
|
aab264db82
|
Streamer refactoring
|
5 years ago |
|
kaniini
|
17142a3720
|
Merge branch 'feature/delivery-tracking' into 'develop'
Track signed fetches of objects and use them for delete federation
See merge request pleroma/pleroma!1661
|
5 years ago |
|
Egor Kislitsyn
|
ca88e37a8f
|
Fix a race condition in tests
|
5 years ago |
|
Egor Kislitsyn
|
43f17c2e67
|
Restore tests for `change_password` and `delete_account`
|
5 years ago |
|
Maksim Pechnikov
|
d75bc728e7
|
Merge branch 'develop' into issue/733
|
5 years ago |
|
Maksim Pechnikov
|
8751809e1e
|
Merge branch 'develop' into support/tests
|
5 years ago |
|
Ivan Tashkinov
|
610236d6be
|
[#1149] Merge remote-tracking branch 'remotes/upstream/develop' into 1149-oban-job-queue
# Conflicts:
# docs/config.md
|
5 years ago |
|
Ivan Tashkinov
|
6bcedb693c
|
[#1149] Merge remote-tracking branch 'remotes/upstream/develop' into 1149-oban-job-queue
# Conflicts:
# docs/config.md
# mix.lock
|
5 years ago |
|
rinpatch
|
a78a7ee455
|
Apply suggestion to test/web/mastodon_api/mastodon_api_controller_test.exs
|
5 years ago |
|
rinpatch
|
85b6144ffd
|
Apply suggestion to test/web/mastodon_api/mastodon_api_controller_test.exs
|
5 years ago |
|
rinpatch
|
5c5ebd3861
|
Mastodon API: Respect post privacy in favourited/reblogged endpoints
|
5 years ago |
|
lain
|
a9b78f55e3
|
Merge branch 'capture-test-errors' into 'develop'
Capture test error messages where appropriate
See merge request pleroma/pleroma!1665
|
5 years ago |
|
rinpatch
|
ba70a8cae6
|
Merge branch 'develop' into feature/delivery-tracking
|
5 years ago |
|
stwf
|
25a64a4aa0
|
Capture test error messages where appropriate
|
5 years ago |
|
Haelwenn
|
0d9609894f
|
Merge branch 'feature/change-email' into 'develop'
Add email change endpoint
Closes #1156
See merge request pleroma/pleroma!1580
|
5 years ago |
|
rinpatch
|
f884987ace
|
Merge branch 'admin-config-description' into 'develop'
Admin config description
Closes #1178 and #1209
See merge request pleroma/pleroma!1611
|
5 years ago |
|
rinpatch
|
fb96facc32
|
Remove unused functions and fix credo issues
|
5 years ago |
|
rinpatch
|
ce23529d91
|
Use delivery info when federating deletes
|
5 years ago |
|
Egor Kislitsyn
|
25d8216804
|
Add email change endpoint
|
5 years ago |
|
rinpatch
|
769fb778d4
|
Track object/create activity fetches
|
5 years ago |
|
Mark Felder
|
102eb4455c
|
Fix associated test as well
|
5 years ago |
|
Maksim Pechnikov
|
4f548cb2b7
|
added test for Ostatus
|
5 years ago |
|
Alex S
|
a1f2dfb10a
|
expanding regex sigils to use modifiers
|
5 years ago |
|
Egor Kislitsyn
|
b40b10b53d
|
Add an endpoint to get multiple statuses by IDs
|
5 years ago |
|
minibikini
|
11e12b5761
|
Add Pleroma.Plugs.Cache
|
5 years ago |
|
Egor Kislitsyn
|
e0f84d0043
|
Fix `ActivityPubController.read_inbox/2`
|
5 years ago |
|
Maksim Pechnikov
|
39f99dc6cd
|
Merge branch 'develop' into support/tests
|
5 years ago |
|
Ivan Tashkinov
|
ca1ba1e272
|
[#1149] Merge remote-tracking branch 'remotes/upstream/develop' into 1149-oban-job-queue
# Conflicts:
# test/web/twitter_api/twitter_api_controller_test.exs
|
5 years ago |
|
rinpatch
|
896ffabe37
|
Merge branch 'so-long-twitterapi' into 'develop'
Removing TwitterAPI
See merge request pleroma/pleroma!1605
|
5 years ago |
|
Haelwenn
|
fe7cf44c40
|
Merge branch 'feature/mastoapi-accounts-external' into 'develop'
Mastdon API: Add ability to get a remote account by nickname to `/api/v1/accounts/:id`
See merge request pleroma/pleroma!1622
|
5 years ago |
|
rinpatch
|
b312ca3d52
|
Mastodon API Poll view: Fix handling of polls without an end date
|
5 years ago |
|
Ivan Tashkinov
|
79cf629e1a
|
Merge remote-tracking branch 'remotes/upstream/develop' into 1149-oban-job-queue
|
5 years ago |
|
Maxim Filippov
|
af746fa4a8
|
Return total for reports
|
5 years ago |
|
Maksim Pechnikov
|
8cbad5500c
|
add tests for activity_pub/utils.ex
|
5 years ago |
