squeegily/pleroma
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity
5,836 Commits 154 Branches 42 Tags 503 MiB
e7c39b7ac8
Commit Graph

5836 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Alexander Strizhakov
e7c39b7ac8 Feature/1072 muting notifications 2019-07-14 13:29:31 +00:00
kaniini
9f211838ec Merge branch 'rich_media_parsers_configurable' into 'develop' 
parsers configurable

See merge request pleroma/pleroma!1400
 2019-07-14 09:53:42 +00:00
Alex S
7af27c143d changelog & docs 2019-07-14 09:23:43 +03:00
Alex S
f4447d82b8 parsers configurable 2019-07-14 09:21:56 +03:00
kaniini
592411e4fe Merge branch 'feature/mrf-transparency-filter' into 'develop' 
nodeinfo: implement MRF transparency exclusions

See merge request pleroma/pleroma!1412
 2019-07-13 19:06:54 +00:00
Ariadne Conill
0cc638b968 docs: note that exclusions usage will be included in the transparency metrics if used 2019-07-13 19:00:03 +00:00
Ariadne Conill
80c46d6d8b nodeinfo: implement MRF transparency exclusions 2019-07-13 18:53:14 +00:00
kaniini
f4c001062e Merge branch '1041-status-actions-rate-limit' into 'develop' 
Rate-limited status actions (per user and per user+status).

Closes #1041

See merge request pleroma/pleroma!1410
 2019-07-13 14:17:17 +00:00
Ivan Tashkinov
d72876c57d [#1041] Minor refactoring. 2019-07-13 15:21:50 +03:00
Ivan Tashkinov
b74d11e20a [#1041] Added documentation on existing rate limiters. 2019-07-13 15:13:26 +03:00
Haelwenn
9497d14f09 Merge branch 'fix/hackney-global-options' into 'develop' 
Merge the default options with custom ones in ReverseProxy and Pleroma.HTTP and workaround for remote server certificate chain issues

See merge request pleroma/pleroma!1409
 2019-07-13 11:55:09 +00:00
Ivan Tashkinov
369e9bb42f [#1041] Rate-limited status actions (per user and per user+status). 2019-07-13 14:49:39 +03:00
rinpatch
29ffe81c2e Add a changelog entry for tolerating incorrect chain order 2019-07-13 13:38:53 +03:00
Haelwenn
02cdedbf9f Merge branch 'fix/ap-hide-follows' into 'develop' 
ActivityPub Controller: Change how hiding follows/followers is represented

See merge request pleroma/pleroma!1406
 2019-07-13 10:22:19 +00:00
rinpatch
fa7e0c4262 Workaround for remote server certificate chain issues 2019-07-12 23:53:21 +03:00
rinpatch
b001b8891a Merge the default options with custom ones in ReverseProxy and 
Pleroma.HTTP
 2019-07-12 23:52:26 +03:00
rinpatch
f40004e746 Add changelog entries for follower/following collection behaviour changes 2019-07-12 21:49:16 +03:00
rinpatch
095117a58c Merge branch 'develop' into fix/ap-hide-follows 2019-07-12 21:43:06 +03:00
rinpatch
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
kaniini
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
Maksim
92055941bd Pleroma.Web.Metadata - tests 2019-07-12 16:42:54 +00:00
rinpatch
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
kaniini
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
Mark Felder
360e4cdaa2 Move these to pleroma namespace in Mastodon API 2019-07-12 11:25:58 -05:00
rinpatch
27ed260eed AP user view: Add a test for hiding totalItems in following/followers 2019-07-12 18:36:14 +03:00
kaniini
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
Sachin Joshi
6a6c4d134b preserve the original path/filename (no encoding/decoding) for proxy 2019-07-12 21:05:01 +05:45
kaniini
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
Eugenij
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
kaniini
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
Alexander Strizhakov
846ad9a463 admin api configure changes 2019-07-11 13:02:13 +00:00
kaniini
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
kaniini
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
Ariadne Conill
347a1823fd add mailmap [ci skip] 2019-07-11 08:57:51 +00:00
Alex S
59e16fc45a enable synchronization by default 2019-07-10 18:55:11 +03:00
kaniini
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
Alexander Strizhakov
a237c6a2d4 support for idna domains 2019-07-10 15:23:25 +00:00
Haelwenn
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
Haelwenn (lanodan) Monnier
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
Alex S
beba7bbc85 removing synchronization worker 2019-07-10 17:42:18 +03:00
Alex S
ade213cb35 robots txt test fix 2019-07-10 17:42:18 +03:00
Alex S
936050257d saving following_address for existing users 2019-07-10 17:42:18 +03:00
Alex S
f8786fa6f2 adding following_address field to user 2019-07-10 17:42:18 +03:00
kaniini
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
Sergey Suprunenko
ff55e3c16f Create mentions only for explicitly mentioned users 2019-07-10 13:29:50 +00:00
kaniini
f295b9fba9 Merge branch 'localization' into 'develop' 
Error Localization

See merge request pleroma/pleroma!1396
 2019-07-10 13:27:59 +00:00
Egor Kislitsyn
ed8ce21a22 Fix unused import warning 2019-07-10 18:10:09 +07:00
Egor Kislitsyn
406efb3688 Add Russian translation 2019-07-10 18:10:09 +07:00
Egor Kislitsyn
a42da8f311 Fix response 2019-07-10 18:10:09 +07:00
Egor Kislitsyn
c2a589d9a3 Fix credo warning 2019-07-10 18:10:09 +07:00