Ariadne Conill
3f6a596922
activitypub: visibility: refactor is_public?() to use JSON-LD safe accessors
2019-10-22 20:50:46 -05:00
kaniini
894fb806e9
Merge branch 'chore/add-single-value-deserialization-tests' into 'develop'
...
tests: transmogrifier: add explicit regression tests for JSON-LD strings as single-element array fuckery
See merge request pleroma/pleroma!1873
2019-10-23 00:47:28 +00:00
Ariadne Conill
277aea45b9
tests: transmogrifier: add explicit regression tests for JSON-LD string to single-element array deserialization
...
There appears to be confusion on whether or not Pleroma can handle this particular
sin of JSON-LD. It can, and we will add regression tests to prove that it can handle
this particular sin. Which, by the way, this is actually not a "feature" of JSON-LD,
but whatever.
2019-10-22 19:43:31 -05:00
kaniini
6281e4795a
Merge branch 'feature/push-subject-for-dm' into 'develop'
...
Direct messages should provide a distinct push notification subject
See merge request pleroma/pleroma!1864
2019-10-21 23:50:01 +00:00
Mark Felder
0c628fafc5
Spelling
2019-10-21 18:35:43 -05:00
Mark Felder
2cbb3f2364
Add tests for the subject of push notifications
2019-10-21 18:34:20 -05:00
rinpatch
6712b6e4de
Merge branch 'fix/notifs-exclude-blocked-from-with-muted' into 'develop'
...
Do not include notifications from blocked users when with_muted is set
See merge request pleroma/pleroma!1869
2019-10-21 16:44:17 +00:00
rinpatch
2dbee29cf5
Do not include notifications from blocked users when with_muted is set
...
This is not what with_muted is for per documentation and it was agreed
on irc that this behavior doesn't make sense.
2019-10-21 19:27:38 +03:00
kaniini
ce750dbab5
Merge branch 'feature/masto_api_markers' into 'develop'
...
[#1275 ] Markers /api/v1/markers
See merge request pleroma/pleroma!1852
2019-10-21 09:26:17 +00:00
Maksim Pechnikov
31d6ef6f92
update changelog
2019-10-21 11:53:11 +03:00
Maksim Pechnikov
243719a965
Merge branch 'develop' into feature/masto_api_markers
2019-10-21 11:32:28 +03:00
kaniini
2ebe8c416a
Merge branch 'feature/activitypub-semantics' into 'develop'
...
activitypub semantics
See merge request pleroma/pleroma!1798
2019-10-21 07:54:48 +00:00
kaniini
62e3d76a45
Merge branch 'chore/add-missing-websub-drop-migration' into 'develop'
...
add missing migration to drop websub table
See merge request pleroma/pleroma!1868
2019-10-20 11:04:22 +00:00
Ariadne Conill
34754938ba
add missing migration to drop websub table
2019-10-20 10:39:03 +00:00
Ariadne Conill
05c58eaece
change Maksim's test description
2019-10-19 23:23:13 +00:00
Ariadne Conill
ba92522c69
tests: add test to ensure invisible actors are rendered with the invisible hint set to true
2019-10-19 23:21:37 +00:00
Ariadne Conill
52d56ed705
tests: add test verifying the relay user is invisible
2019-10-19 23:21:37 +00:00
Ariadne Conill
c9280b9730
rework to use properties instead of compound typing, per SocialCG
2019-10-19 23:21:37 +00:00
Maksim Pechnikov
189a288925
fix test
2019-10-19 23:21:37 +00:00
Maksim Pechnikov
9694d51437
added test fo Pleroma.Web.MastodonAPI.StatusController
2019-10-19 23:21:37 +00:00
Ariadne Conill
80d3912a56
test: activitypub: use User.invisible?/1 for testing invisibility
2019-10-19 23:21:37 +00:00
Ariadne Conill
ef659331b0
implement invisible support for remote users
2019-10-19 23:21:37 +00:00
Ariadne Conill
95871cb462
user: implement User.invisible?/1
2019-10-19 23:21:37 +00:00
Ariadne Conill
1469a084d4
relay: set invisible to true
2019-10-19 23:21:37 +00:00
Ariadne Conill
e7333db72a
user info: add invisible field
2019-10-19 23:21:37 +00:00
kaniini
1311884a1d
Merge branch 'chore/fixup-testsuite-import' into 'develop'
...
tests: ostatus controller tests: fix sporadic compilation failure
See merge request pleroma/pleroma!1867
2019-10-19 23:20:38 +00:00
Ariadne Conill
cd90735a4b
tests: ostatus controller tests: fix sporadic compilation failure
2019-10-19 23:16:15 +00:00
Haelwenn
f01dbc450c
Merge branch 'feature/mastofe-pwa' into 'develop'
...
MastoFE: Add PWA manifest.
See merge request pleroma/pleroma!1834
2019-10-19 20:11:58 +00:00
Haelwenn
cec4b00140
Merge branch 'mark-all-conversations-as-read' into 'develop'
...
Pleroma API: `POST /api/v1/pleroma/conversations/read`
See merge request pleroma/pleroma!1830
2019-10-19 19:55:16 +00:00
rinpatch
289f011e0a
Merge branch 'develop-version-bump' into 'develop'
...
mix.exs: Bump version for develop builds
See merge request pleroma/pleroma!1866
2019-10-19 19:13:00 +00:00
rinpatch
f94e28e8b6
mix.exs: Bump version for develop builds
...
As per discussion on irc, we already used GNU-style versioning system
for release candidates, so it makes sense to use it for develop builds as well.
2019-10-19 22:00:35 +03:00
eugenijm
52ed2f8f2d
Pleroma API: `POST /api/v1/pleroma/conversations/read` to mark all user's conversations as read
2019-10-19 15:24:06 +03:00
Jill H.
df3c2dfd8b
Add documentation for PWA manifest configuration.
2019-10-19 12:15:16 +02:00
Jill H.
638457ba94
MastoFE: Add PWA manifest.
2019-10-19 12:15:14 +02:00
rinpatch
fd6d05dc45
Merge branch 'mix-emoji-task-pack-json' into 'develop'
...
For pleroma.emoji downloaded packs, generate pack.json instead
See merge request pleroma/pleroma!1748
2019-10-19 08:51:03 +00:00
Mark Felder
dcb23a85b6
Merge branch 'develop' into feature/push-subject-for-dm
2019-10-18 17:56:15 -05:00
Mark Felder
152caef51d
Direct messages should provide a distinct push notification subject
2019-10-18 17:51:34 -05:00
rinpatch
5c6c3026ea
Merge branch 'patch-1' into 'develop'
...
Fix a typo in default static directory configuration for OTP releases
Closes #1289
See merge request pleroma/pleroma!1829
2019-10-18 22:29:04 +00:00
rinpatch
0341f6f779
Merge branch 'fix/pleroma-ctl-rpc' into 'develop'
...
pleroma_ctl: Fix attempting to use RPC for config generation
See merge request pleroma/pleroma!1862
2019-10-18 21:40:07 +00:00
rinpatch
901bf0fb8c
pleroma_ctl: Fix attempting to use RPC for config generation
2019-10-19 00:37:39 +03:00
kaniini
c25a81b173
Merge branch 'feature/relay-list' into 'develop'
...
Admin API: Ability to list all followed relays
See merge request pleroma/pleroma!1835
2019-10-18 16:51:04 +00:00
Maxim Filippov
019147f115
Merge branch 'develop' into feature/relay-list
2019-10-18 18:35:58 +02:00
kaniini
4053a82f41
Merge branch 'feature/ostatus-removal' into 'develop'
...
ostatus removal
Closes #1145
See merge request pleroma/pleroma!1854
2019-10-18 16:04:57 +00:00
Ariadne Conill
c2ae6310dc
tests: mastodon api: fix broken test that used OStatus
2019-10-18 15:46:46 +00:00
Ariadne Conill
44e64af5e7
object: containment: simplify the pattern match for OStatus testsuite hack
2019-10-18 15:39:15 +00:00
Ariadne Conill
e99fdfc32d
object: containment: only allow OStatus references in test suite environment
2019-10-18 15:37:14 +00:00
Ariadne Conill
a8eb1f0975
tests: mastodon search: search for an account that is visible via activitypub, not ostatus
2019-10-18 14:50:10 +00:00
Ariadne Conill
3c785b85a6
object: fetcher: fix up formatting
2019-10-18 14:50:10 +00:00
Ariadne Conill
dbfdb1f6e3
add some missing tesla fixtures
2019-10-18 14:50:10 +00:00
Ariadne Conill
bae96de273
activitypub: tag containment checks for better error tracing
2019-10-18 14:50:10 +00:00