rinpatch
|
8c6d5a6b4d
|
Merge branch 'bugfix/registration-email-pattern' into 'develop'
fix pattern match on user registration
See merge request pleroma/pleroma!1058
|
6 years ago |
|
Sadposter
|
e513504e88
|
Revert "Assert on the success of enqueue before returning"
This reverts commit 16d8c8b33b.
Because it breaks everything
|
6 years ago |
|
Sadposter
|
16d8c8b33b
|
Assert on the success of enqueue before returning
|
6 years ago |
|
Sadposter
|
5e45557751
|
Always return {atom, _} from try_send_confirmation
|
6 years ago |
|
Sadposter
|
ec42b639a3
|
fix pattern match on user registration
deliver_async will return a single atom
|
6 years ago |
|
eugenijm
|
679a8ef629
|
Assign reblogged in the Mastodon reblog status view
|
6 years ago |
|
kaniini
|
7304e0ce18
|
Merge branch 'docs/archlinux-odbc' into 'develop'
docs/installation/arch_linux_en.md: Remove useless ODBC
See merge request pleroma/pleroma!1055
|
6 years ago |
|
Haelwenn (lanodan) Monnier
|
48982169dc
|
docs/installation/arch_linux_en.md: Remove useless ODBC
See [1] for confirmation.
1: https://git.pleroma.social/pleroma/pleroma/merge_requests/1050#note_24402
|
6 years ago |
|
Haelwenn
|
050339c223
|
Merge branch 'docs/changelog' into 'develop'
Add a changelog
See merge request pleroma/pleroma!1053
|
6 years ago |
|
rinpatch
|
3018d81d87
|
Put an actual description of the vulnerability and add **Breaking:** to breaking changes
|
6 years ago |
|
Alex S
|
c5d0fffeaf
|
naming fix
|
6 years ago |
|
Alex S
|
c349573791
|
Merge develop to 788-separate-email-addresses
Merge conflicts:
test/web/twitter_api/twitter_api_test.exs
test/web/twitter_api/twitter_api_controller_test.exs
test/web/admin_api/admin_api_controller_test.exs
|
6 years ago |
|
Alex S
|
a64eb2b389
|
fallback to the old behaviour
admin and user mailers
|
6 years ago |
|
rinpatch
|
3a805cc35c
|
Add a changelog
|
6 years ago |
|
Haelwenn
|
334b2d78dc
|
Merge branch 'improve-formatter' into 'develop'
Improve formatter and update `auto_linker`
Closes #795
See merge request pleroma/pleroma!1036
|
6 years ago |
|
Egor
|
f9af90c5aa
|
Revert "simplify mentions escape"
This reverts commit f3e06a1030636f24f7129dd93bb9780e67fb7de1.
|
6 years ago |
|
lambda
|
184ae60b21
|
Merge branch 'bugfix/pleroma-email-naming' into 'develop'
Make the filename and module name of Pleroma.Emails.* orthogonal
See merge request pleroma/pleroma!1029
|
6 years ago |
|
Egor Kislitsyn
|
d0304b4f92
|
more tests
|
6 years ago |
|
Egor Kislitsyn
|
dd097a406b
|
add tests
|
6 years ago |
|
lambda
|
0a09692c7d
|
Merge branch 'features/mastoapi/2.6.0-min_id-pagination' into 'develop'
Features: mastoapi-2.6.0 `min_id` pagination
Closes #351
See merge request pleroma/pleroma!976
|
6 years ago |
|
lambda
|
57d5ff57d6
|
Merge branch 'fix/732-password-align' into 'develop'
password reset page labels align
See merge request pleroma/pleroma!986
|
6 years ago |
|
lambda
|
1b4c4d29a3
|
Merge branch 'ssl_trusted_cert' into 'develop'
ssl_trusted_certificate should point to chain.pem if we're demonstrating...
See merge request pleroma/pleroma!996
|
6 years ago |
|
Haelwenn (lanodan) Monnier
|
378b964d8e
|
installation/download-mastofe-build.sh: Add copyright header
[ci skip]
|
6 years ago |
|
Haelwenn (lanodan) Monnier
|
b421dd3dd2
|
installation/download-mastofe-build.sh: Add mastofe CI-artifacts download
[ci skip]
|
6 years ago |
|
kaniini
|
30a4318ef1
|
Merge branch 'feature/801-add-support-destroy-multiple-mastofe' into 'develop'
adding destroy multiple for mastofe
See merge request pleroma/pleroma!1046
|
6 years ago |
|
Alexander Strizhakov
|
711ade961e
|
adding destroy multiple for mastofe
|
6 years ago |
|
kaniini
|
9825a94391
|
Merge branch 'bug/790-repeated-posts-that-are-replies-have-in-reply-to-id-null' into 'develop'
in_reply_to_id - null
See merge request pleroma/pleroma!1037
|
6 years ago |
|
Alexander Strizhakov
|
e03d24af96
|
in_reply_to_id - null
|
6 years ago |
|
kaniini
|
31c06dba5a
|
Merge branch 'fix/hackney_max_body_param' into 'develop'
Add `with_body: true` to requests relying on `max_body: val`
Closes #778
See merge request pleroma/pleroma!1049
|
6 years ago |
|
Roman Chvanikov
|
4615e56219
|
Add `with_body: true` to requests relying on `max_body: val`
|
6 years ago |
|
lain
|
6f880b1627
|
Conversation: Fix tests.
|
6 years ago |
|
lambda
|
42d2c8d95b
|
Merge branch 'update-mastofe/glitch-soc-2019-04-11' into 'develop'
Update Mastodon Frontend to 2019-04-11 bundle
See merge request pleroma/pleroma!1044
|
6 years ago |
|
lain
|
36ec8d9694
|
ActivityPub: Fix specs.
|
6 years ago |
|
Egor Kislitsyn
|
46bd5c1d87
|
fix format
|
6 years ago |
|
Egor Kislitsyn
|
db4badc6aa
|
move user disable into deactivation
|
6 years ago |
|
Egor Kislitsyn
|
0f2f7d2cec
|
Merge remote-tracking branch 'pleroma/develop' into feature/disable-account
|
6 years ago |
|
Haelwenn (lanodan) Monnier
|
51c97d71af
|
Update Mastodon Frontend to 2019-04-11 bundle
See: https://git.pleroma.social/pleroma/mastofe/tags/bundle-2019-04-11
[ci skip]
|
6 years ago |
|
Ivan Tashkinov
|
c3f12cf3c3
|
[#923] OAuth consumer params handling refactoring.
Registration and authorization-related params are wrapped in "authorization" in order to reduce edge cases number and simplify handling logic.
|
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 |
|
Alex S
|
fe511a6c65
|
Merge branch 'develop' into feature/788-separate-email-addresses
|
6 years ago |
|
Alex S
|
fe13a1d78c
|
adding notify_email setting for trigger emails
|
6 years ago |
|
lambda
|
e5d553aa45
|
Merge branch 'feature/767-multiple-use-invite-token' into 'develop'
Feature/767 multiple use invite token
See merge request pleroma/pleroma!1032
|
6 years ago |
|
lambda
|
6504b43f96
|
Merge branch 'feature/user-status-subscriptions' into 'develop'
Add ability to subscribe to users
See merge request pleroma/pleroma!1024
|
6 years ago |
