Roman Chvanikov
|
724311e151
|
Fix Credo warnings
|
2019-04-20 19:57:43 +07:00 |
|
Roman Chvanikov
|
60f213bb1a
|
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into feature/digest-email
|
2019-04-20 19:43:06 +07:00 |
|
Roman Chvanikov
|
64a2c6a041
|
Digest emails
|
2019-04-20 19:42:19 +07:00 |
|
kaniini
|
9da8b287f8
|
Merge branch 'feature/database-compaction' into 'develop'
database compaction
See merge request pleroma/pleroma!473
|
2019-04-19 16:55:33 +00:00 |
|
Alexander Strizhakov
|
ada384207b
|
typo fix
docs for RelMe provider
|
2019-04-19 07:50:21 +00:00 |
|
lambda
|
218d96a26b
|
Merge branch '923_oauth_consumer_refactoring_ci' into 'develop'
OAuth consumer params handling refactoring
See merge request pleroma/pleroma!1047
|
2019-04-19 07:49:26 +00:00 |
|
rinpatch
|
f9865cf943
|
Stream out deletes, mistakingly removed when resolving merge conflicts
|
2019-04-19 00:47:02 +03:00 |
|
Haelwenn
|
eba3db0966
|
Merge branch 'bugfix/filter-boosted-blocks' into 'develop'
activitypub: fix filtering of boosts from blocked users
See merge request pleroma/pleroma!1074
|
2019-04-18 18:29:57 +00:00 |
|
Mark Felder
|
1aa4994f6d
|
Do not require authentication for user search in MastoAPI
|
2019-04-18 12:44:25 -05:00 |
|
rinpatch
|
83589ca6a5
|
Merge branch 'develop' into feature/database-compaction
|
2019-04-18 12:56:38 +03:00 |
|
rinpatch
|
ac04311b3f
|
Fix search in TwitterAPI
|
2019-04-18 10:24:06 +03:00 |
|
rinpatch
|
6069d0fd36
|
Fix object search depending on embeded object
|
2019-04-18 09:28:20 +03:00 |
|
rinpatch
|
e31a22043b
|
Fix media timeline depending on embeded object and add some guards
|
2019-04-18 08:31:08 +03:00 |
|
rinpatch
|
2abc09570f
|
Use the preloaded object in tag queries
|
2019-04-18 01:37:04 +03:00 |
|
William Pitcock
|
36f78c6dcd
|
activitypub: fix filtering of boosts from blocked users
|
2019-04-17 22:27:59 +00:00 |
|
William Pitcock
|
2140e164d7
|
activitypub: properly filter out transitive activities concerning blocked users
|
2019-04-17 20:05:09 +00:00 |
|
rinpatch
|
35ac672b8d
|
Remove containment tests from transmogrifier and fix thread visibility solver
|
2019-04-17 17:59:15 +03:00 |
|
rinpatch
|
8e4d950f31
|
Remove updating reply count for embeded objects
|
2019-04-17 15:54:09 +03:00 |
|
rinpatch
|
a53b917e7f
|
oof
|
2019-04-17 14:55:26 +03:00 |
|
rinpatch
|
ad681877df
|
Make credo happy
|
2019-04-17 14:52:01 +03:00 |
|
rinpatch
|
e641651e2b
|
Fix unbookmarking
|
2019-04-17 14:27:02 +03:00 |
|
rinpatch
|
b09ae02c04
|
Added some more normalization calls all in mastodon api controller
|
2019-04-17 13:04:58 +03:00 |
|
rinpatch
|
462028688b
|
Fix pinned posts relying on embded objects
|
2019-04-17 12:34:19 +03:00 |
|
rinpatch
|
627e5a0a49
|
Merge branch 'develop' into feature/database-compaction
|
2019-04-17 12:22:32 +03:00 |
|
Ivan Tashkinov
|
128aae05f3
|
[#923] Minor semantic adjustment.
|
2019-04-17 11:33:21 +03: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 |
|
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
|
6e26ac10a3
|
make Pleroma.Endpoint use extra_cookie_attrs in config
|
2019-04-16 22:20:56 +08: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 |
|
eugenijm
|
27d78dc526
|
Use User.get_cached_by*
|
2019-04-15 12:37:49 +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 |
|
eugenijm
|
679a8ef629
|
Assign reblogged in the Mastodon reblog status view
|
2019-04-14 11:35:15 +03: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 |
|
Alexander Strizhakov
|
711ade961e
|
adding destroy multiple for mastofe
|
2019-04-12 02:28:46 +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 |
|
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.
|
2019-04-10 21:40:38 +03: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 |
|
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 |
|