718882b326
Update mix.exs
2018-06-27 19:35:38 +00:00
d386e8a825
Merge branch 'features/initial-state_rights' into 'develop'
...
[Pleroma.Web.MastodonAPI.MastodonAPIController]: Add rights to initial_state
See merge request pleroma/pleroma!236
2018-06-27 12:48:01 +00:00
beb940a57e
[Pleroma.Web.MastodonAPI.MastodonAPIController]: Add rights to initial_state
...
Related to https://git.pleroma.social/pleroma/mastofe/issues/20
2018-06-26 20:48:35 +02:00
fc012491a5
Merge branch 'fix/mutes.json-emptyarray' into 'develop'
...
Return empty array from /api/qvitter/mutes.json
See merge request pleroma/pleroma!234
2018-06-25 08:45:42 +00:00
dfc96f222c
Merge branch 'feature/configurable-blocks' into 'develop'
...
Add more configurability to how blocks work
See merge request pleroma/pleroma!203
2018-06-25 06:12:29 +00:00
ea214b8ba6
combined outgoing_blocks with statement
2018-06-24 23:05:44 -07:00
6160a1b3c0
mix format
2018-06-24 15:24:41 -07:00
92135d00fc
Merge branch 'feature/application-xml-mime' into 'develop'
...
config: add application/xml mimetype support.
See merge request pleroma/pleroma!228
2018-06-24 13:28:42 +00:00
c3002c583e
Merge branch 'features/glitch-soc-frontend' into 'develop'
...
Empty 2.4.x endpoints and ``api/v2/search``
See merge request pleroma/pleroma!214
2018-06-24 13:17:14 +00:00
1299bccc7d
return unquoted empty array from /api/qvitter/mutes.json
2018-06-23 23:20:30 -07:00
6316003946
fixes- found that TwitterAPI.Controller adds .json suffix already
2018-06-23 23:05:54 -07:00
f2badd4424
return empty array for api/qvitter/mutes.json queries instead of html
2018-06-23 22:21:39 -07:00
c4038ede07
fix mind-crushingly dumb syntax error
2018-06-23 14:32:00 -07:00
f4990283de
change moved attributes into normal variables
2018-06-23 14:27:07 -07:00
4e099fcfa9
move configurable module attributes into relevant functions
2018-06-23 14:16:08 -07:00
5a4a45b875
[Pleroma.Web.MastodonApi.MastodonApiController] Add initial_state.meta.max_toot_chars
2018-06-23 16:22:49 +02:00
a05c0ff61d
[Pleroma.Web.MastodonApi.MastodonApiController] Add /api/v2/search
2018-06-23 16:22:47 +02:00
359093d73b
Fake 2.4.0 API
2018-06-23 16:12:57 +02:00
c45133377a
lib/pleroma/web/activity_pub/mrf/simple_policy.ex: mix format
...
Hnng!
2018-06-23 16:12:57 +02:00
ad28854f47
Merge branch 'feature/mrf-simple-accept-lists' into 'develop'
...
mrf simple: add accept lists
See merge request pleroma/pleroma!231
2018-06-21 07:09:57 +00:00
60d6038be5
mrf simple: add accept lists
...
accept lists supplement reject lists by requiring that any message accepted by contained
by the accept list.
in other words, this functionality can be used to implement instances similar to
awoo.space.
2018-06-19 21:28:24 +00:00
90cf75f4a7
Merge branch 'features/column_media_streaming' into 'develop'
...
Add streaming to media tabs of federated and local TLs
See merge request pleroma/pleroma!225
2018-06-19 09:50:05 +00:00
be800d7936
Merge branch 'bugfix/block-follow-relationships' into 'develop'
...
fix follow relationship leaks when blocked
See merge request pleroma/pleroma!230
2018-06-19 09:42:45 +00:00
590e8d5555
tests: fix a completely bogus mastodon api test
2018-06-19 08:53:54 +00:00
056305dfa7
user: add helper function to fetch a user given only an ap_id (fix tests)
2018-06-19 08:31:06 +00:00
db0731b6ac
Merge branch 'feature/exclude-replies-filter' into 'develop'
...
activitypub: support filtering activities by whether or not they are a reply (closes #109 )
Closes #109
See merge request pleroma/pleroma!226
2018-06-19 05:15:11 +00:00
de80363518
Merge branch 'bugfix/as2-contentmap' into 'develop'
...
handle ActivityStreams 2.0 contentMap
See merge request pleroma/pleroma!229
2018-06-19 05:13:00 +00:00
3707a7fa42
tests: transmogrifier: ensure incoming blocks have the same effect as local blocks
2018-06-19 00:59:28 +00:00
e9ed7eb963
tests: prove that the block code is properly destroying follow relationships
2018-06-19 00:59:27 +00:00
320ca7b11e
user: when processing a block in User.block(), ensure all follow relationships are broken
...
this is needed for activitypub conformance
ref #213
2018-06-19 00:59:26 +00:00
a2c6778ce6
tests: add regression test for contentMap-only posts
2018-06-18 22:14:51 +00:00
c95941e64d
activitypub transmogrifier: fix handling of contentMap.
2018-06-18 22:14:50 +00:00
c5bbc46f87
config: add application/xml mimetype support.
...
application/xml is the older xml mimetype. some legacy scripts make use of it,
as well as common use for debugging with curl and other tools. so it makes sense
to have it alongside text/xml.
2018-06-18 05:41:04 +00:00
4f589998ee
activitypub: support filtering activities by whether or not they are a reply ( closes #109 )
2018-06-18 03:21:32 +00:00
b670d4d683
MastodonAPI: Add streaming to media tabs of federated and local TLs
2018-06-17 16:17:15 +02:00
25946f772d
Merge branch 'patch-2' into 'develop'
...
Comment for Old Servers
See merge request pleroma/pleroma!224
2018-06-17 10:33:08 +00:00
63946a6af3
added info about block configuration to CONFIGURATION.md
2018-06-16 16:33:52 -07:00
2e294ee44a
Merge branch 'develop' into feature/configurable-blocks
2018-06-16 15:37:16 -07:00
394d0c94c4
Add comment about TLS curves for older servers.
2018-06-16 18:14:05 +00:00
1ea4a18ad8
Merge branch 'feature/configure-mrf-rejectnonpublic' into 'develop'
...
Configs for mrf_rejectnonpublic
See merge request pleroma/pleroma!205
2018-06-16 10:39:36 +00:00
a938d07df1
Merge branch 'bugfix/mastofe_thread_render' into 'develop'
...
lib/pleroma/web/mastodon_api/views/status_view.ex: Fix status.json so it renders threads
See merge request pleroma/pleroma!223
2018-06-15 20:43:30 +00:00
72c2915ecd
Pleroma.Web.MastodonAPI.StatusView: Fix status.json so it renders threads
2018-06-15 22:14:17 +02:00
00d7d109ef
Fix typo
2018-06-15 22:01:17 +02:00
de20c8d620
Merge branch 'fix/missing-file-extension' into 'develop'
...
Add missing file extension if file does not have one
See merge request pleroma/pleroma!222
2018-06-14 19:11:30 +00:00
0a95b5594b
Add missing file extension if file does not have one
2018-06-14 12:16:34 -04:00
1c676b7573
Merge branch 'fix/mp3-recognition' into 'develop'
...
upload.ex: add MPEG Layer 3 file header.
See merge request pleroma/pleroma!221
2018-06-14 13:55:50 +00:00
12c7a023de
upload.ex: add MPEG Layer 3 file header.
2018-06-14 16:41:08 +03:00
678df59d22
Merge branch 'patch-2' into 'develop'
...
* fix nginx 1.15 warning:
See merge request pleroma/pleroma!213
2018-06-14 07:23:14 +00:00
2723fb5150
Merge branch 'bugfix/mrf-orphaning' into 'develop'
...
activitypub transmogrifier: handle activity lookup failure
Closes #156
See merge request pleroma/pleroma!216
2018-06-14 07:20:54 +00:00
8c7fdcb31b
Merge branch 'feature/twitterapi-unrepeat' into 'develop'
...
Add TwitterAPI unretweet endpoint and cleanup AP.unannounce
See merge request pleroma/pleroma!218
2018-06-14 07:19:36 +00:00
Artik Banana