095117a58c
Merge branch 'develop' into fix/ap-hide-follows
2019-07-12 21:43:06 +03:00
97b79efbcd
ActivityPub Controller: Actually pass for_user to following/followers
...
views and give 403 errors when trying to request hidden follower pages
when unauthenticated
2019-07-12 20:54:20 +03:00
f8e3ae6154
try to always match the filename for proxy url
2019-07-12 22:56:14 +05:45
5999780e82
Merge branch 'tests/web_metadata' into 'develop'
...
Pleroma.Web.Metadata - tests
See merge request pleroma/pleroma!1401
2019-07-12 16:42:54 +00:00
92055941bd
Pleroma.Web.Metadata - tests
2019-07-12 16:42:54 +00:00
1f6ac7680d
ActivityPub User view: Following/Followers refactoring
...
- Render the collection items if the user requesting == the user
rendered
- Do not render the first page if hide_{followers,follows} is set, just
give the URI to it
2019-07-12 19:41:55 +03:00
71cc0d5c17
Merge branch 'fix/pleroma-extensions' into 'develop'
...
Move new endpoints to pleroma namespace in Mastodon API
See merge request pleroma/pleroma!1404
2019-07-12 16:33:58 +00:00
360e4cdaa2
Move these to pleroma namespace in Mastodon API
2019-07-12 11:25:58 -05:00
27ed260eed
AP user view: Add a test for hiding totalItems in following/followers
2019-07-12 18:36:14 +03:00
b6567c9f4e
Merge branch 'url-parser-proxy' into 'develop'
...
preserve the original path/filename (no encoding/decoding) for proxy
See merge request pleroma/pleroma!1403
2019-07-12 15:34:00 +00:00
6a6c4d134b
preserve the original path/filename (no encoding/decoding) for proxy
2019-07-12 21:05:01 +05:45
0384459ce5
Update mix.lock
2019-07-12 18:16:54 +03:00
eae991b06a
merge develop
2019-07-12 18:08:27 +03:00
db75288b71
Merge branch 'search-limit-offset-type' into 'develop'
...
Add account_id, type, limit, and offset to GET /api/v1/search and /api/v2/search
See merge request pleroma/pleroma!1386
2019-07-11 13:55:31 +00:00
4198c3ac39
Extend Pleroma.Pagination to support offset-based pagination, use async/await to execute status and account search in parallel
2019-07-11 13:55:31 +00:00
9991254c06
Update CHANGELOG
2019-07-11 20:17:03 +07:00
4d382d1347
Merge branch 'admin-configure' into 'develop'
...
admin api configure changes
See merge request pleroma/pleroma!1345
2019-07-11 13:02:13 +00:00
846ad9a463
admin api configure changes
2019-07-11 13:02:13 +00:00
e4e3fd7e55
Merge branch 'fix/1019-refactor' into 'develop'
...
Fix/1019 refactor
See merge request pleroma/pleroma!1397
2019-07-11 13:01:11 +00:00
9e06873d58
Add `list` to Visibility
2019-07-11 19:29:24 +07:00
958fb9aa80
Add "listMessage"
2019-07-11 16:36:08 +07:00
6c491b2006
Merge branch 'chore/mailmap' into 'develop'
...
add mailmap [ci skip]
See merge request pleroma/pleroma!1399
2019-07-11 09:03:17 +00:00
347a1823fd
add mailmap [ci skip]
2019-07-11 08:57:51 +00:00
182f7bbb11
Merge branch 'develop' into feature/addressable-lists
2019-07-11 13:26:59 +07:00
59e16fc45a
enable synchronization by default
2019-07-10 18:55:11 +03:00
4016341a77
Merge branch 'fix/1005-idna-domains' into 'develop'
...
support for idna domains
Closes #1005
See merge request pleroma/pleroma!1330
2019-07-10 15:23:25 +00:00
a237c6a2d4
support for idna domains
2019-07-10 15:23:25 +00:00
3ff4a06ebe
Merge branch 'features/mastoapi-emoji-categories' into 'develop'
...
MastoAPI: Add categories to custom emojis
See merge request pleroma/pleroma!1365
2019-07-10 15:07:37 +00:00
252e129b1e
MastoAPI: Add categories to custom emojis
...
Note: This isn’t in a release yet, can be seen in mastofe on the
rebase/glitch-soc branch.
2019-07-10 17:02:37 +02:00
beba7bbc85
removing synchronization worker
2019-07-10 17:42:18 +03:00
ade213cb35
robots txt test fix
2019-07-10 17:42:18 +03:00
936050257d
saving following_address for existing users
2019-07-10 17:42:18 +03:00
f8786fa6f2
adding following_address field to user
2019-07-10 17:42:18 +03:00
b972b972e0
Merge branch 'feature/render-mentions-for-tags' into 'develop'
...
Create mentions only for explicitly mentioned users
Closes #999
See merge request pleroma/pleroma!1375
2019-07-10 13:29:50 +00:00
ff55e3c16f
Create mentions only for explicitly mentioned users
2019-07-10 13:29:50 +00:00
f295b9fba9
Merge branch 'localization' into 'develop'
...
Error Localization
See merge request pleroma/pleroma!1396
2019-07-10 13:27:59 +00:00
ed8ce21a22
Fix unused import warning
2019-07-10 18:10:09 +07:00
406efb3688
Add Russian translation
2019-07-10 18:10:09 +07:00
a42da8f311
Fix response
2019-07-10 18:10:09 +07:00
c2a589d9a3
Fix credo warning
2019-07-10 18:10:09 +07:00
5104f65b69
Wrap error messages into gettext helpers
2019-07-10 18:10:09 +07:00
26a6871609
Add translation helpers
2019-07-10 18:10:09 +07:00
663aebdd59
Update `gettext` dependency
2019-07-10 18:10:09 +07:00
0d54a571ca
Add SetLocalePlug
2019-07-10 18:08:03 +07:00
42422f3ff2
Merge branch 'tests/web/mastodon_api/search_controller' into 'develop'
...
add test for search_controller/ 100% coverage
See merge request pleroma/pleroma!1377
2019-07-10 08:28:03 +00:00
008c55e4e9
add test for search_controller/ 100% coverage
2019-07-10 08:28:03 +00:00
9822f3a05e
Merge branch 'hotfix/disable-email-changelog-fix' into 'develop'
...
Add a breaking changelog entry for explicitly disabling the mailer and reorder changelog sections in order of importance
See merge request pleroma/pleroma!1395
2019-07-10 08:18:12 +00:00
e2782c342f
Add a breaking changelog entry for explicitly disabling the mailer and reorder changelog sections in order of importance
2019-07-10 11:09:55 +03:00
d91231f0be
Merge branch 'feature/disable_send_emails' into 'develop'
...
[#1062 ] added option to disable send email
See merge request pleroma/pleroma!1389
2019-07-10 05:34:21 +00:00
12b1454245
[ #1062 ] added option to disable send email
2019-07-10 05:34:21 +00:00
rinpatch