rinpatch
|
627e5a0a49
|
Merge branch 'develop' into feature/database-compaction
|
2019-04-17 12:22:32 +03:00 |
|
rinpatch
|
8de17c480e
|
Merge branch '788-notify-email-changelog' into 'develop'
changelog info
See merge request pleroma/pleroma!1070
|
2019-04-17 09:05:27 +00:00 |
|
Ivan Tashkinov
|
128aae05f3
|
[#923] Minor semantic adjustment.
|
2019-04-17 11:33:21 +03:00 |
|
Alex S
|
2198e54d28
|
changes
|
2019-04-17 14:27:51 +07:00 |
|
Alex S
|
6ac948c5b8
|
changelog info
|
2019-04-17 14:12:45 +07:00 |
|
kaniini
|
73df3046e0
|
Merge branch 'feature/788-separate-email-addresses' into 'develop'
Feature/788 separate email addresses
Closes #788
See merge request pleroma/pleroma!1040
|
2019-04-16 18:44:07 +00:00 |
|
kaniini
|
02a53d00c9
|
Merge branch 'fix/remote-follow-auth' into 'develop'
Fix: remote follows should not ask user to log-in again for authorization
See merge request pleroma/pleroma!1060
|
2019-04-16 18:40:56 +00:00 |
|
Haelwenn
|
cde7711b12
|
Merge branch 'bugfix/relax-spam-protection' into 'develop'
activitypub: allow indirect messages from users being followed at a personal inbox
See merge request pleroma/pleroma!1069
|
2019-04-16 18:38:11 +00:00 |
|
kaniini
|
6ddaeb14e2
|
Merge branch 'patch-2' into 'develop'
Add supervisord configuration
See merge request pleroma/pleroma!1066
|
2019-04-16 18:35:58 +00:00 |
|
kaniini
|
5f31e7ec6b
|
Merge branch 'fix/follow-imports' into 'develop'
Handle new-style mastodon follow lists
Closes #814
See merge request pleroma/pleroma!1067
|
2019-04-16 18:35:38 +00:00 |
|
Normandy
|
d4a749cfb2
|
Handle new-style mastodon follow lists
Fixes https://git.pleroma.social/pleroma/pleroma/issues/814
|
2019-04-16 18:35:38 +00:00 |
|
William Pitcock
|
750b369d04
|
activitypub: allow indirect messages from users being followed at a personal inbox
|
2019-04-16 18:31:12 +00:00 |
|
Hakurei Reimu
|
2472efb4e9
|
Add extra_cookie_attrs to changelog
|
2019-04-16 22:24:24 +08:00 |
|
Hakurei Reimu
|
6e26ac10a3
|
make Pleroma.Endpoint use extra_cookie_attrs in config
|
2019-04-16 22:20:56 +08:00 |
|
Hakurei Reimu
|
10096bbf2b
|
add extra_cookie_attrs option to config
Allow instance admins to set their own SameSite cookie policy from
the config. Default value in the config is `Lax`.
|
2019-04-16 22:20:56 +08:00 |
|
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 |
|
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 |
|
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 |
|
Roman Chvanikov
|
dc21181f65
|
Update updated_at field on notification read
|
2019-04-14 22:29:05 +07: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 |
|
Roman Chvanikov
|
0cd4b6024d
|
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into feature/digest-email
|
2019-04-14 14:05:21 +07: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 |
|
Roman Chvanikov
|
371a4aed2c
|
Add User.Info.email_notifications
|
2019-04-13 17:40:42 +07: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 |
|
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 |
|