Commit graph

4705 commits

Author SHA1 Message Date
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
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
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
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
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]
2019-04-11 07:29:03 +02:00
Alex S
fe511a6c65 Merge branch 'develop' into feature/788-separate-email-addresses 2019-04-10 18:06:54 +07:00
Alex S
fe13a1d78c adding notify_email setting for trigger emails 2019-04-10 17:57:41 +07:00
lambda
e5d553aa45 Merge branch 'feature/767-multiple-use-invite-token' into 'develop'
Feature/767 multiple use invite token

See merge request pleroma/pleroma!1032
2019-04-10 10:10:08 +00:00
lambda
6504b43f96 Merge branch 'feature/user-status-subscriptions' into 'develop'
Add ability to subscribe to users

See merge request pleroma/pleroma!1024
2019-04-10 10:04:20 +00:00
Sadposter
be8350baa2
Merge branch 'develop' into feature/user-status-subscriptions 2019-04-10 10:44:54 +01:00
lambda
c8440b5e0c Merge branch 'fix/emoji-api-nonsense' into 'develop'
Change response format of /api/pleroma/emoji so it makes sense

See merge request pleroma/pleroma!1038
2019-04-10 06:22:51 +00:00
Haelwenn (lanodan) Monnier
9c1b36856b
s/Pleroma.UserEmail/Pleroma.Emails.UserEmail/ 2019-04-10 06:33:20 +02:00
Haelwenn (lanodan) Monnier
cae0231731
s/Pleroma.AdminEmail/Pleroma.Emails.AdminEmail/ 2019-04-10 06:33:20 +02:00
Haelwenn (lanodan) Monnier
1791ee8ec4
s/Pleroma.Mailer/Pleroma.Emails.Mailer/ 2019-04-10 06:33:19 +02:00
kaniini
0ab563d334 Merge branch 'hotfix/fix_undefined_summary' into 'develop'
transmogrifier.ex: Add fix_summary/1

See merge request pleroma/pleroma!1039
2019-04-10 02:10:47 +00:00
kaniini
97395e013e Merge branch 'notification-pleroma-settings' into 'develop'
Notification controls

Closes #738

See merge request pleroma/pleroma!988
2019-04-10 02:10:31 +00:00
Haelwenn (lanodan) Monnier
cf9ba8fe1b
transmogrifier.ex: Add fix_summary/1
MRF.KeywordPolicy assumes that summary is present in a activity,
and this would probably simplify code elsewhere too anyway.
2019-04-10 02:32:04 +02:00
rinpatch
b57b43027c Change response format of /api/pleroma/emoji to the one that actually makes sense 2019-04-09 23:20:31 +03:00
rinpatch
144648de92 Merge branch 'mastoapi/plaintext-statuses' into 'develop'
Provide plaintext representations of content/cw in MastoAPI

Closes #787

See merge request pleroma/pleroma!1035
2019-04-09 17:25:31 +00:00
lambda
0a02ed7a2f Merge branch 'bugfix/follower_count' into 'develop'
update the follower count when a follower is blocked

See merge request pleroma/pleroma!1033
2019-04-09 07:30:38 +00:00
Sachin Joshi
07afb9b537 update the follower count when a follower is blocked 2019-04-09 09:15:45 +05:45
Sadposter
589629cf3e
Used cached user resources in subscriptions 2019-04-08 15:56:14 +01:00
Alex S
fee50636d0 removing not needed invite update 2019-04-08 20:08:16 +07:00
Alex S
d0696fdfd6 fix for elixir 1.7.4 2019-04-08 19:16:59 +07:00
Sadposter
87a01f9ee0
Use Pleroma.Config instead of Application.get_env 2019-04-08 13:04:30 +01:00
lambda
4977e96fa4 Merge branch 'use-jobs-in-webpush' into 'develop'
Use PleromaJobQueue in Pleroma.Web.Push

See merge request pleroma/pleroma!1023
2019-04-08 11:53:18 +00:00
Egor Kislitsyn
9abf832b03 Merge remote-tracking branch 'pleroma/develop' into use-jobs-in-webpush 2019-04-08 18:48:10 +07:00
Sadposter
13ff312c48
Sever subscription in case of block 2019-04-08 12:46:12 +01:00
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
2019-04-08 11:42:20 +00:00
lambda
fd45cab9ec Merge branch 'twitter_oauth' into 'develop'
OAuth consumer (sign in / sign up with external provider)

See merge request pleroma/pleroma!923
2019-04-08 11:41:50 +00:00
lambda
ff9290836b Merge branch 'feature/697-language-tag-metadata' into 'develop'
adding language tag

See merge request pleroma/pleroma!1034
2019-04-08 11:03:10 +00:00
Alexander Strizhakov
36c0a10fdf adding language tag 2019-04-08 11:03:10 +00:00
Alex S
f0ca0696c8 test for valid_invite? 2019-04-08 17:06:04 +07:00
lambda
23067908de Merge branch 'feature/770-add-emoji-tags' into 'develop'
Feature/770 add emoji tags

See merge request pleroma/pleroma!998
2019-04-08 09:50:00 +00:00
Egor Kislitsyn
c3d5c3513a Merge remote-tracking branch 'pleroma/develop' into use-jobs-in-webpush 2019-04-08 16:46:59 +07:00
Ivan Tashkinov
44829d9181 AdminApiControllerTest unused variables fix. 2019-04-08 12:32:55 +03:00
Egor Kislitsyn
a1a854646e Merge branch 'develop' into use-jobs-in-webpush 2019-04-08 16:29:20 +07:00
Ivan Tashkinov
bffddf5e31 [#923] Merge remote-tracking branch 'remotes/upstream/develop' into twitter_oauth
# Conflicts:
#	docs/config.md
#	test/support/factory.ex
2019-04-08 12:20:26 +03:00
lambda
b4da2bc1d0 Merge branch 'develop' into 'improve_upgrade_user_from_ap_id'
# Conflicts:
#   config/config.exs
#   docs/config.md
2019-04-08 09:18:01 +00:00
lambda
b177e1e7f3 Merge branch 'scheduled-activities' into 'develop'
Scheduled activities

See merge request pleroma/pleroma!989
2019-04-08 09:08:18 +00:00
Alex S
012bb5dcc9 renaming expire_at -> expires_at
keyword style change
2019-04-08 16:01:28 +07:00
Sadposter
76fdfd1c7f Add check on activity visibility in sub notification 2019-04-07 15:11:29 +01:00