Maksim [Sun, 14 Jul 2019 21:01:32 +0000 (21:01 +0000)]
added tests for Web.MediaProxy
kaniini [Sun, 14 Jul 2019 19:25:03 +0000 (19:25 +0000)]
Merge branch 'feature/unsubscribe-on-unfollow' into 'develop'
Unfollow should also unsubscribe
Closes #1086
See merge request pleroma/pleroma!1419
Sergey Suprunenko [Sun, 14 Jul 2019 19:25:03 +0000 (19:25 +0000)]
Unfollow should also unsubscribe
kaniini [Sun, 14 Jul 2019 19:24:39 +0000 (19:24 +0000)]
Merge branch 'security/ir-generic-containment' into 'develop'
security: IR-based generic object containment
See merge request pleroma/pleroma!1417
Ariadne Conill [Sun, 14 Jul 2019 17:49:12 +0000 (17:49 +0000)]
tests: fix object containment violations in the transmogrifier tests
Some objects were not completely rewritten in the tests, which caused object
containment violations. Fix them by rewriting the object IDs to be in an
appropriate namespace.
Ariadne Conill [Sun, 14 Jul 2019 17:47:08 +0000 (17:47 +0000)]
security: detect object containment violations at the IR level
It is more efficient to check for object containment violations at the IR
level instead of in the protocol handlers. OStatus containment is especially
a tricky situation, as the containment rules don't match those of IR and
ActivityPub.
Accordingly, we just always do a final containment check at the IR level
before the object is added to the IR object graph.
kaniini [Sun, 14 Jul 2019 16:43:55 +0000 (16:43 +0000)]
Merge branch 'chore/remove-cc-by-nc-nd-license' into 'develop'
remove CC-BY-NC-ND license.
See merge request pleroma/pleroma!1415
Ariadne Conill [Sun, 14 Jul 2019 16:43:00 +0000 (16:43 +0000)]
remove CC-BY-NC-ND license.
we moved branding assets (mascot etc) to CC-BY-SA a while back.
kaniini [Sun, 14 Jul 2019 16:39:17 +0000 (16:39 +0000)]
Merge branch 'bugfix/llal-object-containment' into 'develop'
Object.Fetcher: Handle error on Containment.contain_origin/2
See merge request pleroma/pleroma!1414
Haelwenn (lanodan) Monnier [Sun, 14 Jul 2019 15:28:25 +0000 (17:28 +0200)]
Object.Fetcher: Keep the with-do block as per kaniini proposition
Haelwenn (lanodan) Monnier [Sun, 14 Jul 2019 12:24:56 +0000 (14:24 +0200)]
FetcherTest: Containment refute called(OStatus.fetch_activity_from_url)
Haelwenn (lanodan) Monnier [Sun, 14 Jul 2019 10:13:11 +0000 (12:13 +0200)]
Object.Fetcher: Fallback to OStatus only if AP actually fails
kaniini [Sun, 14 Jul 2019 13:29:32 +0000 (13:29 +0000)]
Merge branch 'feature/1072-muting-notifications' into 'develop'
Feature/1072 muting notifications
Closes #1072
See merge request pleroma/pleroma!1398
Alexander Strizhakov [Sun, 14 Jul 2019 13:29:31 +0000 (13:29 +0000)]
Feature/1072 muting notifications
Haelwenn (lanodan) Monnier [Sun, 14 Jul 2019 10:02:16 +0000 (12:02 +0200)]
Object.Fetcher: Handle error on Containment.contain_origin/2
Haelwenn (lanodan) Monnier [Sun, 14 Jul 2019 11:39:05 +0000 (13:39 +0200)]
HttpRequestMock: Add 404s on OStatus fetching for info.pleroma.site
Haelwenn (lanodan) Monnier [Sun, 14 Jul 2019 11:31:43 +0000 (13:31 +0200)]
HttpRequestMock: Add missing mocks for object containment tests
kaniini [Sun, 14 Jul 2019 09:53:42 +0000 (09:53 +0000)]
Merge branch 'rich_media_parsers_configurable' into 'develop'
parsers configurable
See merge request pleroma/pleroma!1400
Alex S [Sun, 14 Jul 2019 06:20:54 +0000 (09:20 +0300)]
changelog & docs
Alex S [Thu, 11 Jul 2019 13:04:42 +0000 (16:04 +0300)]
parsers configurable
kaniini [Sat, 13 Jul 2019 19:06:54 +0000 (19:06 +0000)]
Merge branch 'feature/mrf-transparency-filter' into 'develop'
nodeinfo: implement MRF transparency exclusions
See merge request pleroma/pleroma!1412
Ariadne Conill [Sat, 13 Jul 2019 19:00:03 +0000 (19:00 +0000)]
docs: note that exclusions usage will be included in the transparency metrics if used
Ariadne Conill [Sat, 13 Jul 2019 18:30:45 +0000 (18:30 +0000)]
nodeinfo: implement MRF transparency exclusions
kaniini [Sat, 13 Jul 2019 14:17:17 +0000 (14:17 +0000)]
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
Ivan Tashkinov [Sat, 13 Jul 2019 12:21:50 +0000 (15:21 +0300)]
[#1041] Minor refactoring.
Ivan Tashkinov [Sat, 13 Jul 2019 12:13:26 +0000 (15:13 +0300)]
[#1041] Added documentation on existing rate limiters.
Haelwenn [Sat, 13 Jul 2019 11:55:09 +0000 (11:55 +0000)]
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
Ivan Tashkinov [Sat, 13 Jul 2019 11:49:39 +0000 (14:49 +0300)]
[#1041] Rate-limited status actions (per user and per user+status).
rinpatch [Fri, 12 Jul 2019 23:04:26 +0000 (02:04 +0300)]
Add a changelog entry for tolerating incorrect chain order
Haelwenn [Sat, 13 Jul 2019 10:22:19 +0000 (10:22 +0000)]
Merge branch 'fix/ap-hide-follows' into 'develop'
ActivityPub Controller: Change how hiding follows/followers is represented
See merge request pleroma/pleroma!1406
rinpatch [Fri, 12 Jul 2019 20:53:21 +0000 (23:53 +0300)]
Workaround for remote server certificate chain issues
rinpatch [Fri, 12 Jul 2019 20:52:26 +0000 (23:52 +0300)]
Merge the default options with custom ones in ReverseProxy and
Pleroma.HTTP
rinpatch [Fri, 12 Jul 2019 18:49:16 +0000 (21:49 +0300)]
Add changelog entries for follower/following collection behaviour changes
rinpatch [Fri, 12 Jul 2019 18:43:06 +0000 (21:43 +0300)]
Merge branch 'develop' into fix/ap-hide-follows
rinpatch [Fri, 12 Jul 2019 17:54:20 +0000 (20:54 +0300)]
ActivityPub Controller: Actually pass for_user to following/followers
views and give 403 errors when trying to request hidden follower pages
when unauthenticated
kaniini [Fri, 12 Jul 2019 16:42:54 +0000 (16:42 +0000)]
Merge branch 'tests/web_metadata' into 'develop'
Pleroma.Web.Metadata - tests
See merge request pleroma/pleroma!1401
Maksim [Fri, 12 Jul 2019 16:42:54 +0000 (16:42 +0000)]
Pleroma.Web.Metadata - tests
rinpatch [Fri, 12 Jul 2019 16:41:05 +0000 (19:41 +0300)]
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
kaniini [Fri, 12 Jul 2019 16:33:58 +0000 (16:33 +0000)]
Merge branch 'fix/pleroma-extensions' into 'develop'
Move new endpoints to pleroma namespace in Mastodon API
See merge request pleroma/pleroma!1404
Mark Felder [Fri, 12 Jul 2019 16:25:58 +0000 (11:25 -0500)]
Move these to pleroma namespace in Mastodon API
rinpatch [Fri, 12 Jul 2019 15:36:07 +0000 (18:36 +0300)]
AP user view: Add a test for hiding totalItems in following/followers
kaniini [Fri, 12 Jul 2019 15:34:00 +0000 (15:34 +0000)]
Merge branch 'url-parser-proxy' into 'develop'
preserve the original path/filename (no encoding/decoding) for proxy
See merge request pleroma/pleroma!1403
Sachin Joshi [Fri, 12 Jul 2019 15:17:55 +0000 (21:02 +0545)]
preserve the original path/filename (no encoding/decoding) for proxy
kaniini [Thu, 11 Jul 2019 13:55:31 +0000 (13:55 +0000)]
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
Eugenij [Thu, 11 Jul 2019 13:55:31 +0000 (13:55 +0000)]
Extend Pleroma.Pagination to support offset-based pagination, use async/await to execute status and account search in parallel
kaniini [Thu, 11 Jul 2019 13:02:13 +0000 (13:02 +0000)]
Merge branch 'admin-configure' into 'develop'
admin api configure changes
See merge request pleroma/pleroma!1345
Alexander Strizhakov [Thu, 11 Jul 2019 13:02:13 +0000 (13:02 +0000)]
admin api configure changes
kaniini [Thu, 11 Jul 2019 13:01:11 +0000 (13:01 +0000)]
Merge branch 'fix/1019-refactor' into 'develop'
Fix/1019 refactor
See merge request pleroma/pleroma!1397
kaniini [Thu, 11 Jul 2019 09:03:17 +0000 (09:03 +0000)]
Merge branch 'chore/mailmap' into 'develop'
add mailmap [ci skip]
See merge request pleroma/pleroma!1399
Ariadne Conill [Thu, 11 Jul 2019 08:57:30 +0000 (08:57 +0000)]
add mailmap [ci skip]
Alex S [Wed, 10 Jul 2019 15:55:11 +0000 (18:55 +0300)]
enable synchronization by default
kaniini [Wed, 10 Jul 2019 15:23:25 +0000 (15:23 +0000)]
Merge branch 'fix/1005-idna-domains' into 'develop'
support for idna domains
Closes #1005
See merge request pleroma/pleroma!1330
Alexander Strizhakov [Wed, 10 Jul 2019 15:23:25 +0000 (15:23 +0000)]
support for idna domains
Haelwenn [Wed, 10 Jul 2019 15:07:37 +0000 (15:07 +0000)]
Merge branch 'features/mastoapi-emoji-categories' into 'develop'
MastoAPI: Add categories to custom emojis
See merge request pleroma/pleroma!1365
Haelwenn (lanodan) Monnier [Sat, 29 Jun 2019 23:05:28 +0000 (01:05 +0200)]
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.
Alex S [Wed, 10 Jul 2019 14:39:07 +0000 (17:39 +0300)]
removing synchronization worker
Alex S [Wed, 10 Jul 2019 13:37:39 +0000 (16:37 +0300)]
robots txt test fix
Alex S [Wed, 10 Jul 2019 13:02:22 +0000 (16:02 +0300)]
saving following_address for existing users
Alex S [Wed, 10 Jul 2019 13:01:32 +0000 (16:01 +0300)]
adding following_address field to user
kaniini [Wed, 10 Jul 2019 13:29:50 +0000 (13:29 +0000)]
Merge branch 'feature/render-mentions-for-tags' into 'develop'
Create mentions only for explicitly mentioned users
Closes #999
See merge request pleroma/pleroma!1375
Sergey Suprunenko [Wed, 10 Jul 2019 13:29:50 +0000 (13:29 +0000)]
Create mentions only for explicitly mentioned users
kaniini [Wed, 10 Jul 2019 13:27:59 +0000 (13:27 +0000)]
Merge branch 'localization' into 'develop'
Error Localization
See merge request pleroma/pleroma!1396
Egor Kislitsyn [Wed, 10 Jul 2019 11:00:22 +0000 (18:00 +0700)]
Fix unused import warning
Egor Kislitsyn [Wed, 10 Jul 2019 10:58:15 +0000 (17:58 +0700)]
Add Russian translation
Egor Kislitsyn [Wed, 10 Jul 2019 10:40:34 +0000 (17:40 +0700)]
Fix response
Egor Kislitsyn [Wed, 10 Jul 2019 09:28:24 +0000 (16:28 +0700)]
Fix credo warning
Egor Kislitsyn [Wed, 10 Jul 2019 09:25:58 +0000 (16:25 +0700)]
Wrap error messages into gettext helpers
Egor Kislitsyn [Wed, 10 Jul 2019 07:52:41 +0000 (14:52 +0700)]
Add translation helpers
Egor Kislitsyn [Wed, 10 Jul 2019 07:01:57 +0000 (14:01 +0700)]
Update `gettext` dependency
Egor Kislitsyn [Tue, 9 Jul 2019 11:30:15 +0000 (18:30 +0700)]
Add SetLocalePlug
kaniini [Wed, 10 Jul 2019 08:28:03 +0000 (08:28 +0000)]
Merge branch 'tests/web/mastodon_api/search_controller' into 'develop'
add test for search_controller/ 100% coverage
See merge request pleroma/pleroma!1377
Maksim [Wed, 10 Jul 2019 08:28:03 +0000 (08:28 +0000)]
add test for search_controller/ 100% coverage
rinpatch [Wed, 10 Jul 2019 08:18:12 +0000 (08:18 +0000)]
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
rinpatch [Wed, 10 Jul 2019 08:09:55 +0000 (11:09 +0300)]
Add a breaking changelog entry for explicitly disabling the mailer and reorder changelog sections in order of importance
kaniini [Wed, 10 Jul 2019 05:34:21 +0000 (05:34 +0000)]
Merge branch 'feature/disable_send_emails' into 'develop'
[#1062] added option to disable send email
See merge request pleroma/pleroma!1389
Maksim [Wed, 10 Jul 2019 05:34:21 +0000 (05:34 +0000)]
[#1062] added option to disable send email
kaniini [Wed, 10 Jul 2019 05:16:08 +0000 (05:16 +0000)]
Merge branch 'feature/send-delete-user-activity' into 'develop'
Send and handle "Delete" activity for deleted users
Closes #1071 and #1059
See merge request pleroma/pleroma!1384
Sergey Suprunenko [Wed, 10 Jul 2019 05:16:08 +0000 (05:16 +0000)]
Send and handle "Delete" activity for deleted users
kaniini [Wed, 10 Jul 2019 05:14:08 +0000 (05:14 +0000)]
Merge branch 'release/listener' into 'develop'
add listener port and ip option for 'pleroma.instance gen' and enable its test
See merge request pleroma/pleroma!1393
kaniini [Wed, 10 Jul 2019 05:13:23 +0000 (05:13 +0000)]
Merge branch 'fix/license-attribution' into 'develop'
Add license/copyright to all project files
See merge request pleroma/pleroma!1394
feld [Wed, 10 Jul 2019 05:13:23 +0000 (05:13 +0000)]
Add license/copyright to all project files
kaniini [Wed, 10 Jul 2019 05:12:21 +0000 (05:12 +0000)]
Merge branch 'tests/mrf_policy' into 'develop'
tests MRF filters
See merge request pleroma/pleroma!1379
Maksim [Wed, 10 Jul 2019 05:12:21 +0000 (05:12 +0000)]
tests MRF filters
Sachin Joshi [Tue, 9 Jul 2019 19:57:41 +0000 (01:42 +0545)]
add listener port and ip option for 'pleroma.instance gen' and enable its test
rinpatch [Tue, 9 Jul 2019 20:00:37 +0000 (20:00 +0000)]
Merge branch '878-activity-object-decoupling-in-tests' into 'develop'
[#878] Refactored assumptions on embedded object presence in tests
Closes #878
See merge request pleroma/pleroma!1390
Ivan Tashkinov [Tue, 9 Jul 2019 19:37:59 +0000 (22:37 +0300)]
[#878] Tests improvements per code review.
Ivan Tashkinov [Tue, 9 Jul 2019 19:28:04 +0000 (22:28 +0300)]
[#878] Uncommented test statement.
Ivan Tashkinov [Tue, 9 Jul 2019 18:46:16 +0000 (21:46 +0300)]
[#878] Merge remote-tracking branch 'remotes/upstream/develop' into 878-activity-object-decoupling-in-tests
# Conflicts:
# lib/pleroma/object.ex
# test/web/activity_pub/transmogrifier_test.exs
# test/web/ostatus/ostatus_test.exs
kaniini [Tue, 9 Jul 2019 18:20:36 +0000 (18:20 +0000)]
Merge branch 'docs/more-mastodon-api' into 'develop'
Docs/more mastodon api
See merge request pleroma/pleroma!1392
feld [Tue, 9 Jul 2019 18:20:36 +0000 (18:20 +0000)]
Docs/more mastodon api
kaniini [Tue, 9 Jul 2019 17:53:41 +0000 (17:53 +0000)]
Merge branch 'feature/allow-user-query-via-id' into 'develop'
Admin API: Allow querying user by ID
See merge request pleroma/pleroma!1380
kaniini [Tue, 9 Jul 2019 17:51:41 +0000 (17:51 +0000)]
Merge branch 'remove-avatar-header' into 'develop'
Ability to reset avatar, profile banner and backgroud
See merge request pleroma/pleroma!1187
Mark Felder [Tue, 9 Jul 2019 17:49:04 +0000 (12:49 -0500)]
Merge branch 'develop' into feature/allow-user-query-via-id
kaniini [Tue, 9 Jul 2019 17:36:35 +0000 (17:36 +0000)]
Merge branch 'fix/1019-correct-count-remote-users' into 'develop'
Fix/1019 correct count remote users
Closes #1019
See merge request pleroma/pleroma!1376
Alexander Strizhakov [Tue, 9 Jul 2019 17:36:35 +0000 (17:36 +0000)]
Fix/1019 correct count remote users
kaniini [Tue, 9 Jul 2019 16:54:32 +0000 (16:54 +0000)]
Merge branch 'remove-swift' into 'develop'
Remove Uploaders.Swift and `httpoison` dependency
Closes #1051
See merge request pleroma/pleroma!1374
kaniini [Tue, 9 Jul 2019 16:54:14 +0000 (16:54 +0000)]
Merge branch 'test-coverage' into 'develop'
reverse proxy tests
See merge request pleroma/pleroma!1385
Alexander Strizhakov [Tue, 9 Jul 2019 16:54:13 +0000 (16:54 +0000)]
reverse proxy tests
kaniini [Tue, 9 Jul 2019 16:52:22 +0000 (16:52 +0000)]
Merge branch 'features/sec-websocket-protocol-header' into 'develop'
Features: MastoAPI streaming Sec-WebSocket-Protocol header
See merge request pleroma/pleroma!1381
Haelwenn [Tue, 9 Jul 2019 16:07:20 +0000 (16:07 +0000)]
Merge branch 'enable-ogp-by-default' into 'develop'
Do not crash if metadata fails to render and enable OGP and TwitterCard by default
Closes #1034
See merge request pleroma/pleroma!1388
projects / akkoma / log