alyssa
/
pleroma
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
6,114 Commits 1 Branch 0 Tags 177 MiB
Commit Graph

6114 Commits

Author SHA1 Message Date
rinpatch 996fd58ac4 Merge branch 'bugfix/poll-id-as-string' into 'develop' 
Status View: Poll ids are strings.

See merge request pleroma/pleroma!1430
 2019-07-16 06:06:22 +00:00
lain 7a24def473 Mastodon Controller: Fix tests. 2019-07-16 14:01:18 +09:00
lain 1ed24bcc76 Status View: Poll ids are strings. 
All ids in mastodon are strings, in general.
 2019-07-16 12:47:40 +09:00
Mark Felder 46c7c53fbb Add changelog entry for Mastodon API change 2019-07-15 17:10:33 -05:00
Mark Felder ffb4eb9779 Merge branch 'develop' into feature/matstodon-statuses-by-name 2019-07-15 17:10:27 -05:00
feld 9f987dd017 Merge branch 'match-file-name' into 'develop' 
try to always match the filename for proxy url

See merge request pleroma/pleroma!1405
 2019-07-15 22:04:58 +00:00
feld 03bcb40883 Merge branch 'remove-dead-admin-tasks-links-from-docs' into 'develop' 
Remove dead link from the installation docs

See merge request pleroma/pleroma!1428
 2019-07-15 21:43:04 +00:00
Eugenij 345a38778e Remove dead link from the installation docs 2019-07-15 21:43:04 +00:00
kaniini d80bcd270d Merge branch 'tests/mastodon-common-api' into 'develop' 
Add more tests for MastodonAPIController and CommonAPI

See merge request pleroma/pleroma!1425
 2019-07-15 19:47:23 +00:00
Sergey Suprunenko b74300bc7a Add more tests for MastodonAPIController and CommonAPI 2019-07-15 19:47:23 +00:00
kaniini 30d7e22784 Merge branch 'fix/1091-notifications-query' into 'develop' 
Notifications query fix

Closes #1091

See merge request pleroma/pleroma!1427
 2019-07-15 19:46:31 +00:00
Alex S 33fd4c0ed7 query fix 2019-07-15 20:53:52 +03:00
kaniini ee5250ae56 Merge branch 'sha512-crypt' into 'develop' 
detect and use sha512-crypt for stored password hash.

See merge request pleroma/pleroma!1422
 2019-07-15 16:13:17 +00:00
Sachin Joshi 1d906ffa82 Merge branch 'develop' into match-file-name 
# Conflicts:
#	lib/pleroma/web/media_proxy/media_proxy_controller.ex
 2019-07-15 21:30:56 +05:45
Moonman 105f437ce9 formatting 2019-07-15 08:36:51 -07:00
kaniini 6aa5b39837 Merge branch 'update-tzdata' into 'develop' 
Dependencies: Update tzdata and related packages.

See merge request pleroma/pleroma!1423
 2019-07-15 13:02:59 +00:00
kaniini 03c4ea44ad Merge branch 'admin-configure-atom-keys' into 'develop' 
admin configure - atom keys with leading :

See merge request pleroma/pleroma!1424
 2019-07-15 13:01:58 +00:00
kaniini 11b71c6a70 Merge branch 'tests/http_signature' into 'develop' 
tests for Pleroma.Signature

See merge request pleroma/pleroma!1426
 2019-07-15 13:01:22 +00:00
Maksim c32384c1ea tests for Pleroma.Signature 2019-07-15 13:01:22 +00:00
kaniini d725ccfd3a Merge branch 'feature/addressable-lists' into 'develop' 
[#802] Add addressable lists

See merge request pleroma/pleroma!1113
 2019-07-15 13:00:33 +00:00
Alex S b8607c151c migrating task refactor 2019-07-15 15:45:27 +03:00
Alex S c66044b923 atom keys with leading : 2019-07-15 11:00:55 +03:00
Egor Kislitsyn de13c9bb8f List messages must be visible for mentioned users 2019-07-15 14:54:40 +07:00
lain d302fcaa61 Dependencies: Update tzdata and related packages. 2019-07-15 16:47:39 +09:00
Egor Kislitsyn 04f18a144b Add `listMessage` to to the JSON-LD context 2019-07-15 14:29:13 +07:00
Egor Kislitsyn 0c66bb5857 Update documentation 2019-07-15 14:27:56 +07:00
Egor Kislitsyn d86a97abfb Add an explanation comment to Publisher.publish/2 2019-07-15 14:20:31 +07:00
Egor Kislitsyn 64a946643e Merge remote-tracking branch 'pleroma/develop' into feature/addressable-lists 2019-07-15 14:11:54 +07:00
Egor Kislitsyn a87c313309 Support `list` visibility in StatusView 2019-07-15 14:00:29 +07:00
kaniini 46ef8f0216 Merge branch 'tests/media_proxy' into 'develop' 
added tests for Web.MediaProxy

See merge request pleroma/pleroma!1418
 2019-07-14 21:01:32 +00:00
Maksim fa17879c20 added tests for Web.MediaProxy 2019-07-14 21:01:32 +00:00
kaniini 4b78622bba Merge branch 'feature/unsubscribe-on-unfollow' into 'develop' 
Unfollow should also unsubscribe

Closes #1086

See merge request pleroma/pleroma!1419
 2019-07-14 19:25:03 +00:00
Sergey Suprunenko dce8ebc9ea Unfollow should also unsubscribe 2019-07-14 19:25:03 +00:00
kaniini 509d8058d9 Merge branch 'security/ir-generic-containment' into 'develop' 
security: IR-based generic object containment

See merge request pleroma/pleroma!1417
 2019-07-14 19:24:39 +00:00
Ariadne Conill 841314c2d5 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.
 2019-07-14 19:24:22 +00:00
Ariadne Conill 739bbe0d3b 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.
 2019-07-14 17:47:08 +00:00
Moonman f98f7ad1b9 detect and use sha512-crypt for stored password hash. 2019-07-14 09:48:42 -07:00
kaniini 93701c3399 Merge branch 'chore/remove-cc-by-nc-nd-license' into 'develop' 
remove CC-BY-NC-ND license.

See merge request pleroma/pleroma!1415
 2019-07-14 16:43:55 +00:00
Ariadne Conill 26f265fb0e remove CC-BY-NC-ND license. 
we moved branding assets (mascot etc) to CC-BY-SA a while back.
 2019-07-14 16:43:00 +00:00
kaniini cef4337f95 Merge branch 'bugfix/llal-object-containment' into 'develop' 
Object.Fetcher: Handle error on Containment.contain_origin/2

See merge request pleroma/pleroma!1414
 2019-07-14 16:39:17 +00:00
Haelwenn (lanodan) Monnier 2592934480
Object.Fetcher: Keep the with-do block as per kaniini proposition 2019-07-14 17:28:25 +02:00
Haelwenn (lanodan) Monnier a2c601acb5
FetcherTest: Containment refute called(OStatus.fetch_activity_from_url) 2019-07-14 17:05:32 +02:00
Haelwenn (lanodan) Monnier e1c08a67d6
Object.Fetcher: Fallback to OStatus only if AP actually fails 2019-07-14 17:05:31 +02:00
kaniini 1589b170e8 Merge branch 'feature/1072-muting-notifications' into 'develop' 
Feature/1072 muting notifications

Closes #1072

See merge request pleroma/pleroma!1398
 2019-07-14 13:29:32 +00:00
Alexander Strizhakov e7c39b7ac8 Feature/1072 muting notifications 2019-07-14 13:29:31 +00:00
Haelwenn (lanodan) Monnier 40d0a198e2
Object.Fetcher: Handle error on Containment.contain_origin/2 2019-07-14 14:58:47 +02:00
Haelwenn (lanodan) Monnier f00562ed6b
HttpRequestMock: Add 404s on OStatus fetching for info.pleroma.site 2019-07-14 13:55:41 +02:00
Haelwenn (lanodan) Monnier efa9a13d4e
HttpRequestMock: Add missing mocks for object containment tests 2019-07-14 13:55:41 +02: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