rinpatch
|
0d4afdc6e6
|
Merge branch 'deps/bump-exdoc' into 'develop'
Bump ex_doc to 20.2
See merge request pleroma/pleroma!1068
|
2019-04-16 11:59:38 +00:00 |
|
rinpatch
|
37da03499e
|
Bump ex_doc
|
2019-04-16 14:53:17 +03:00 |
|
Dominik V. Salonen
|
498c96d458
|
Add supervisord configuration
|
2019-04-16 07:14:44 +00:00 |
|
lain
|
76999c73a7
|
Conversation: Add accounts to output.
|
2019-04-15 22:28:42 +02:00 |
|
lain
|
0da985182f
|
Conversation: Return full status object, id is a string.
|
2019-04-15 21:58:58 +02:00 |
|
lain
|
c1ebb38d3a
|
Conversation: Also create participations for remote users.
Needed to get the participating user list.
|
2019-04-15 21:45:25 +02:00 |
|
rinpatch
|
776f1e3bdf
|
Merge branch 'remove-footguns' into 'develop'
Remove ambiguous documentation regarding emoji and config.exs
See merge request pleroma/pleroma!1064
|
2019-04-15 13:57:38 +00:00 |
|
lain
|
088f378408
|
Custom Emoji docs: Make it clear that config.exs is not for lewd.
|
2019-04-15 15:51:17 +02:00 |
|
lain
|
4fecd6f9a7
|
Config.exs: Add big warning so that nobody ever edits it.
|
2019-04-15 15:45:15 +02:00 |
|
lambda
|
56956de6fa
|
Merge branch 'fix/status-reblogged' into 'develop'
Assign reblogged in the Mastodon reblog status view
Closes #812
See merge request pleroma/pleroma!1057
|
2019-04-15 10:26:23 +00:00 |
|
lambda
|
f358295cbe
|
Merge branch 'unfollow-oneself' into 'develop'
Consistent response for self follow/unfollow
Closes #819
See merge request pleroma/pleroma!1061
|
2019-04-15 10:24:37 +00:00 |
|
lambda
|
f896699357
|
Merge branch 'refactor/remove-inReplyToStatusId' into 'develop'
Remove inReplyToStatusId
See merge request pleroma/pleroma!1062
|
2019-04-15 10:23:06 +00:00 |
|
Egor Kislitsyn
|
38926a063a
|
add /api/pleroma/disable_account to docs/api/pleroma_api.md
|
2019-04-15 16:39:42 +07:00 |
|
eugenijm
|
27d78dc526
|
Use User.get_cached_by*
|
2019-04-15 12:37:49 +03:00 |
|
rinpatch
|
fd2e31af86
|
oops
|
2019-04-15 11:59:01 +03:00 |
|
rinpatch
|
5d73dca064
|
Remove inReplyToStatusId
|
2019-04-15 11:50:36 +03:00 |
|
eugenijm
|
507e7821e3
|
Handle follow/unfollow directed to themselves
|
2019-04-15 10:21:18 +03:00 |
|
rinpatch
|
8c6d5a6b4d
|
Merge branch 'bugfix/registration-email-pattern' into 'develop'
fix pattern match on user registration
See merge request pleroma/pleroma!1058
|
2019-04-14 17:54:32 +00:00 |
|
Sadposter
|
e513504e88
|
Revert "Assert on the success of enqueue before returning"
This reverts commit 16d8c8b33b.
Because it breaks everything
|
2019-04-14 16:12:54 +01:00 |
|
Sadposter
|
16d8c8b33b
|
Assert on the success of enqueue before returning
|
2019-04-14 16:05:26 +01:00 |
|
Sadposter
|
5e45557751
|
Always return {atom, _} from try_send_confirmation
|
2019-04-14 16:01:48 +01:00 |
|
Sadposter
|
ec42b639a3
|
fix pattern match on user registration
deliver_async will return a single atom
|
2019-04-14 15:46:54 +01:00 |
|
eugenijm
|
679a8ef629
|
Assign reblogged in the Mastodon reblog status view
|
2019-04-14 11:35:15 +03:00 |
|
kaniini
|
7304e0ce18
|
Merge branch 'docs/archlinux-odbc' into 'develop'
docs/installation/arch_linux_en.md: Remove useless ODBC
See merge request pleroma/pleroma!1055
|
2019-04-14 05:34:17 +00:00 |
|
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
|
2019-04-13 22:41:54 +02:00 |
|
Haelwenn
|
050339c223
|
Merge branch 'docs/changelog' into 'develop'
Add a changelog
See merge request pleroma/pleroma!1053
|
2019-04-13 20:29:05 +00:00 |
|
rinpatch
|
3018d81d87
|
Put an actual description of the vulnerability and add **Breaking:** to breaking changes
|
2019-04-13 21:17:10 +03:00 |
|
Alex S
|
c5d0fffeaf
|
naming fix
|
2019-04-13 14:55:42 +07:00 |
|
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
|
2019-04-13 12:24:38 +07:00 |
|
Alex S
|
a64eb2b389
|
fallback to the old behaviour
admin and user mailers
|
2019-04-13 12:20:36 +07:00 |
|
rinpatch
|
3a805cc35c
|
Add a changelog
|
2019-04-13 00:31:18 +03:00 |
|
Haelwenn
|
334b2d78dc
|
Merge branch 'improve-formatter' into 'develop'
Improve formatter and update `auto_linker`
Closes #795
See merge request pleroma/pleroma!1036
|
2019-04-12 19:25:53 +00:00 |
|
Egor
|
f9af90c5aa
|
Revert "simplify mentions escape"
This reverts commit f3e06a1030636f24f7129dd93bb9780e67fb7de1.
|
2019-04-12 19:25:53 +00:00 |
|
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
|
2019-04-12 10:41:09 +00:00 |
|
Egor Kislitsyn
|
d0304b4f92
|
more tests
|
2019-04-12 16:51:28 +07:00 |
|
Egor Kislitsyn
|
dd097a406b
|
add tests
|
2019-04-12 16:38:32 +07:00 |
|
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
|
2019-04-12 09:34:12 +00:00 |
|
lambda
|
57d5ff57d6
|
Merge branch 'fix/732-password-align' into 'develop'
password reset page labels align
See merge request pleroma/pleroma!986
|
2019-04-12 09:13:30 +00:00 |
|
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
|
2019-04-12 08:58:46 +00:00 |
|
Haelwenn (lanodan) Monnier
|
378b964d8e
|
installation/download-mastofe-build.sh: Add copyright header
[ci skip]
|
2019-04-12 07:39:49 +02:00 |
|
Haelwenn (lanodan) Monnier
|
b421dd3dd2
|
installation/download-mastofe-build.sh: Add mastofe CI-artifacts download
[ci skip]
|
2019-04-12 07:32:46 +02:00 |
|
kaniini
|
30a4318ef1
|
Merge branch 'feature/801-add-support-destroy-multiple-mastofe' into 'develop'
adding destroy multiple for mastofe
See merge request pleroma/pleroma!1046
|
2019-04-12 02:28:46 +00:00 |
|
Alexander Strizhakov
|
711ade961e
|
adding destroy multiple for mastofe
|
2019-04-12 02:28:46 +00:00 |
|
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
|
2019-04-12 02:21:32 +00:00 |
|
Alexander Strizhakov
|
e03d24af96
|
in_reply_to_id - null
|
2019-04-12 02:21:32 +00:00 |
|
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
|
2019-04-11 17:54:31 +00:00 |
|
Roman Chvanikov
|
4615e56219
|
Add with_body: true to requests relying on max_body: val
|
2019-04-12 00:16:33 +07:00 |
|
lain
|
6f880b1627
|
Conversation: Fix tests.
|
2019-04-11 13:31:20 +02:00 |
|
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
|
2019-04-11 11:24:36 +00:00 |
|
lain
|
36ec8d9694
|
ActivityPub: Fix specs.
|
2019-04-11 13:20:46 +02:00 |
|