kaniini
|
486749064f
|
Revert "Merge branch 'feature/split-hide-network' into 'develop'"
This reverts merge request !733
|
2019-02-01 20:22:58 +00:00 |
|
href
|
7e384a2425
|
Merge branch 'develop' into 'develop'
Use nodeinfo 2.1
See merge request pleroma/pleroma!753
|
2019-02-01 19:18:46 +00:00 |
|
|
|
e8c7be38fc
|
add tests for nodeinfo 2.0 compat and 2.1's new field
|
2019-02-01 14:33:14 -03:00 |
|
kaniini
|
0a82a7e6d6
|
Merge branch 'feature/split-hide-network' into 'develop'
Split hide_network into hide_followers & hide_followings
See merge request pleroma/pleroma!733
|
2019-02-01 17:05:29 +00:00 |
|
href
|
b3b0855456
|
Merge branch '534_federation_targets_reachability' into 'develop'
[#534] Unreachable federation targets retirement
Closes #534
See merge request pleroma/pleroma!703
|
2019-02-01 09:14:35 +00:00 |
|
|
|
c05928dbda
|
use nodeinfo 2.1, add repository field
that is the only change from nodeinfo 2.0 to 2.1
also this makes the nodeinfo tests use 2.1.json instead of 2.0.json
|
2019-02-01 03:55:10 -03:00 |
|
href
|
308b35ebe2
|
User.follow_all: ensure its stays unique
|
2019-01-31 18:17:44 +01:00 |
|
William Pitcock
|
106475f265
|
test: http mocks: formatting
|
2019-01-31 16:30:56 +00:00 |
|
William Pitcock
|
3f5b784596
|
test: rich media: parser: add malformed data regression test
|
2019-01-31 16:19:53 +00:00 |
|
William Pitcock
|
4e76f9fde1
|
test: add malformed OGP data fixture
|
2019-01-31 16:12:35 +00:00 |
|
lambda
|
a43a1c6d4e
|
Revert "Merge branch 'spc-fix-3' into 'develop'"
This reverts merge request !682
|
2019-01-31 12:16:23 +00:00 |
|
kaniini
|
4d3655c479
|
Merge branch 'spc-fix-3' into 'develop'
Spc fix 3
See merge request pleroma/pleroma!682
|
2019-01-31 11:29:29 +00:00 |
|
Haelwenn
|
00d4333373
|
Merge branch 'features/glitch-soc-frontend' into 'develop'
Features/glitch soc frontend
See merge request pleroma/pleroma!192
|
2019-01-31 10:16:11 +00:00 |
|
lain
|
c53b96a024
|
Fix specs.
|
2019-01-30 19:45:31 +01:00 |
|
lain
|
47ec690c54
|
Use race-condition free mass follow.
|
2019-01-30 19:33:25 +01:00 |
|
kaniini
|
d03a116654
|
Merge branch 'hj-happiness-improvement' into 'develop'
New frontend configuration mechanism.
Closes #445
See merge request pleroma/pleroma!700
|
2019-01-29 13:54:10 +00:00 |
|
Ivan Tashkinov
|
92753b0cd9
|
[#534] Made federation push sender be determined basing on content instead of referer header. Updated tests.
|
2019-01-29 13:12:28 +03:00 |
|
Haelwenn
|
ebb3496386
|
Merge branch 'feature/rich-media-part-2-electric-boogaloo' into 'develop'
Rich Media support, part 2.
See merge request pleroma/pleroma!719
|
2019-01-29 05:11:08 +00:00 |
|
William Pitcock
|
61d6715714
|
rich media: oembed: return data in the same format as the other parsers
|
2019-01-28 21:13:25 +00:00 |
|
Maxim Filippov
|
3e968f9ef2
|
Format
|
2019-01-28 21:40:08 +03:00 |
|
Maxim Filippov
|
50d6183893
|
Split hide_network into hide_followers & hide_followings
|
2019-01-28 21:40:08 +03:00 |
|
Ivan Tashkinov
|
d3f9e6f6fe
|
[#534] Merged upstream/develop.
|
2019-01-28 15:39:14 +03:00 |
|
Ivan Tashkinov
|
1d2f41642c
|
[#534] Various tweaks. Tests for Instances and Instance.
|
2019-01-28 15:25:06 +03:00 |
|
lain
|
8e8a1e1ba8
|
Return new-style config if old-style config is set to false.
This is in preparation for 1.0. We'll be able to switch the config to the new
mechanism on PleromaFE then as well.
|
2019-01-28 13:07:12 +01:00 |
|
lain
|
1825118fd4
|
Correctly handle invalid credentials on auth login.
Closes #407
|
2019-01-28 11:41:47 +01:00 |
|
William Pitcock
|
339c26e12b
|
test: add status posting with OGP link preview test
|
2019-01-28 06:19:00 +00:00 |
|
William Pitcock
|
6096846f5f
|
API: kill /api/rich_media/parse endpoint
|
2019-01-28 05:53:17 +00:00 |
|
William Pitcock
|
020b3b29d9
|
test: update twitterapi tests
|
2019-01-28 05:53:17 +00:00 |
|
William Pitcock
|
364cf5369b
|
test: update mastodon status view tests
|
2019-01-28 05:53:17 +00:00 |
|
William Pitcock
|
132d815f1f
|
mastodon api: factor out status card fetching, move status card rendering to statusview, add opengraph extended data
|
2019-01-28 05:53:17 +00:00 |
|
Haelwenn (lanodan) Monnier
|
cda1470e02
|
[MastoAPI][GlitchAPI] Add bookmarks
|
2019-01-28 04:47:32 +01:00 |
|
lain
|
2e277dd4ad
|
Fix objects.
|
2019-01-27 21:03:15 +01:00 |
|
kaniini
|
5eb81d2c72
|
Merge branch 'features/mastoapi-multi-hashtag' into 'develop'
MastodonAPI multi-hashtag
See merge request pleroma/pleroma!652
|
2019-01-27 12:45:50 +00:00 |
|
Haelwenn (lanodan) Monnier
|
a65c188593
|
Web.MastodonAPI.AccountView: Add is_moderator and is_admin
Closes: https://git.pleroma.social/pleroma/pleroma/issues/557
|
2019-01-27 10:33:22 +01:00 |
|
kaniini
|
155a884300
|
Merge branch 'flake-from-int' into 'develop'
Flake: support integers in from_string/1
See merge request pleroma/pleroma!715
|
2019-01-26 16:17:50 +00:00 |
|
href
|
d6015338c8
|
Flake: support integers in from_string/1
Some previously issued stateless tokens have integer ids in them.
|
2019-01-26 16:58:23 +01:00 |
|
William Pitcock
|
1f7843b9b8
|
mastodon api: use OGP uri instead of page_url for deducing domain name, fix test
|
2019-01-26 15:24:16 +00:00 |
|
Haelwenn (lanodan) Monnier
|
3f64379b13
|
Web.MastodonAPI.MastodonAPIController: Add Rich-Media support
|
2019-01-26 14:18:23 +00:00 |
|
Haelwenn (lanodan) Monnier
|
d9f3af477d
|
Move definitions of RichMedia fixtures to test/support/http_request_mock.ex
|
2019-01-26 14:18:23 +00:00 |
|
Haelwenn (lanodan) Monnier
|
22f2687f17
|
Web.MastodonAPI.MastodonAPIControllerTest: Update for difference between all and any parameters
|
2019-01-26 04:46:02 +01:00 |
|
Haelwenn (lanodan) Monnier
|
5a84def6a6
|
Fix the logic in multi-hashtag TLs
|
2019-01-26 04:46:02 +01:00 |
|
Haelwenn (lanodan) Monnier
|
4ad0ad14ed
|
Web.ActivityPub.ActivityPub: Simplify multi-hashtag, add tests
|
2019-01-26 04:46:01 +01:00 |
|
Haelwenn (lanodan) Monnier
|
d8f446f438
|
Web.MastodonAPI.MastodonAPIControllerTest: Add test against multi-hashtag timeline
|
2019-01-26 04:46:01 +01:00 |
|
Haelwenn (lanodan) Monnier
|
499a4591a4
|
Web.ActivityPub.ActivityPubTest: test against inserting activities with content: null
|
2019-01-26 04:23:52 +01:00 |
|
Ivan Tashkinov
|
d99650270b
|
[#534] Federation reachability filtering tests.
|
2019-01-25 20:38:54 +03:00 |
|
lain
|
aa8ddfdbe2
|
SPC fixes: Fix activities.
|
2019-01-25 18:14:48 +01:00 |
|
rinpatch
|
a45a903480
|
Fix OGP provider tests
|
2019-01-25 10:51:06 +03:00 |
|
rinpatch
|
3a5b3c5a3a
|
Merge remote-tracking branch 'pl/develop' into oembed_provider
|
2019-01-25 10:40:51 +03:00 |
|
kaniini
|
4c99b6d35a
|
Merge branch 'fix/tusky-dm' into 'develop'
Add actor to recipients list
Closes #390
See merge request pleroma/pleroma!683
|
2019-01-25 05:19:32 +00:00 |
|
kaniini
|
c9b418e547
|
Merge branch 'develop' into 'oembed_provider'
# Conflicts:
# lib/pleroma/activity.ex
|
2019-01-25 05:00:47 +00:00 |
|
