Commit Graph

5745 Commits

Author SHA1 Message Date
Sergey Suprunenko
25c818ed6f Redirect not logged-in users to the MastoFE login page on private instances 2019-08-14 01:50:22 +00:00
Ariadne Conill
f7028ae8ac tests: mastodon account views: add missing CommonAPI alias 2019-08-14 01:50:22 +00:00
Sergey Suprunenko
48bd4ee933 Strip internal fields including likes from incoming and outgoing activities 2019-08-14 01:50:22 +00:00
rinpatch
7e412fd88a Do not rembed the object after updating it 2019-08-14 01:50:22 +00:00
rinpatch
f0c32364b7 OStatus tests: stop relying on embedded objects 2019-08-14 01:50:22 +00:00
rinpatch
e5161961bd ActivityPub tests: remove assertions of embedded object being updated,
because the objects are no longer supposed to be embedded
2019-08-14 01:50:22 +00:00
rinpatch
1807d3a115 OStatus Announce Representer: Do not depend on the object being embedded
in the Create activity
2019-08-14 01:50:21 +00:00
rinpatch
b85840b536 Stop depending on the embedded object in restrict_favorited_by 2019-08-14 01:50:21 +00:00
Ariadne Conill
a7b947534c chase changelog updates 2019-08-14 01:50:21 +00:00
Alexander Strizhakov
b9def3758a Feature/1087 wildcard option for blocks 2019-08-14 01:50:21 +00:00
Sachin Joshi
e08b97853f add listener port and ip option for 'pleroma.instance gen' and enable its test 2019-08-14 01:50:21 +00:00
Ariadne Conill
8a8fe57670 tasks: relay: add list task 2019-08-14 01:50:21 +00:00
Sergey Suprunenko
1310cdc24f Handle MRF rejections of incoming AP activities 2019-08-14 01:50:21 +00:00
Haelwenn (lanodan) Monnier
54d4ceec5c tasks/pleroma/user.ex: Fix documentation of --max-use and --expire-at
Closes: https://git.pleroma.social/pleroma/pleroma/issues/1155

[ci skip]
2019-08-14 01:50:21 +00:00
Haelwenn (lanodan) Monnier
f270e33208 tasks/pleroma/instance.ex: Change :upload_dir to :uploads_dir
Closes: https://git.pleroma.social/pleroma/pleroma/issues/1058
2019-08-14 01:50:21 +00:00
Ariadne Conill
d2c3c64da5 update changelog for lanodan's change 2019-08-14 01:50:21 +00:00
Haelwenn (lanodan) Monnier
65bd927cf2 templates/layout/app.html.eex: Style anchors
[ci skip]
2019-08-14 01:50:21 +00:00
Ariadne Conill
951d8c28d1 update changelog for thibg's change 2019-08-14 01:50:21 +00:00
Thibaut Girka
a3654d9479 Return profile URL in MastodonAPI's url field 2019-08-14 01:50:21 +00:00
Thibaut Girka
b29dcc8c1b Simplify logic to mention.js url field
`User.profile_url` already fallbacks to ap_id
2019-08-14 01:50:21 +00:00
Thibaut Girka
6525fbac95 Return profile URL when available instead of actor URI for MastodonAPI mention URL
Fixes #1165
2019-08-14 01:50:21 +00:00
rinpatch
ba21d515d6 Mastodon API: Fix thread mute detection
It was calling CommonAPI.thread_muted? with post author's account
instead of viewer's one.
2019-08-14 01:50:21 +00:00
rinpatch
dcd30e3ceb Mastodon API: Set follower/following counters to 0 when hiding
followers/following is enabled

We are already doing that in AP representation, so I think we should do
it here as well for consistency.
2019-08-14 01:50:21 +00:00
kaniini
9c499435f0 Merge branch 'release/1.0.4' into 'master'
1.0.4 release

See merge request pleroma/pleroma!1519
2019-08-01 16:41:09 +00:00
Ariadne Conill
455f2934b7 mix: update version to 1.0.4 2019-08-01 16:39:59 +00:00
rinpatch
8998620d71 Fix Invalid SemVer version generation
when the current branch does not have commits ahead of tag/checked out on a tag
2019-08-01 16:39:50 +00:00
kaniini
0eff6349a0 Merge branch 'release/1.0.3' into 'master'
1.0.3 release

See merge request pleroma/pleroma!1514
2019-07-31 20:27:09 +00:00
Ariadne Conill
2536628cac mix: update version to 1.0.3 2019-07-31 20:16:12 +00:00
Ariadne Conill
d006742fd7 changelog again 2019-07-31 20:14:53 +00:00
Ariadne Conill
e5cb15ce2b twitter api: utils: rework do_remote_follow() to use CommonAPI
Closes #1138
2019-07-31 20:12:25 +00:00
Ariadne Conill
d18a7dc0de changelog update 2019-07-31 20:11:02 +00:00
rinpatch
2c2c075fd6 Disallow following locked accounts over OStatus 2019-07-31 20:08:59 +00:00
Ariadne Conill
59e60c6db1 ostatus: explicitly disallow protocol downgrade from activitypub
This closes embargoed bug #1135.
2019-07-31 18:57:52 +00:00
kaniini
cca9d64cb8 Merge branch '1048-semver-format-compliance-backport' into 'master'
Fixed version parsing in pleroma_ctl (backport)

See merge request pleroma/pleroma!1508
2019-07-31 15:13:38 +00:00
Ivan Tashkinov
daf0d0dd9a [#1036] Changelog adjustment. 2019-07-31 09:33:39 +03:00
Ivan Tashkinov
1e77e71fb2 [#1036] Fixed version parsing in pleroma_ctl. 2019-07-30 15:33:51 +03:00
Ivan Tashkinov
7fdbef3e1b [#1048] Fixed version parsing in pleroma_ctl. Closes #1036. 2019-07-30 15:24:39 +03:00
kaniini
ce6dfb6f06 Merge branch 'release/1.0.2' into 'master'
1.0.2 release

See merge request pleroma/pleroma!1499
2019-07-29 16:28:53 +00:00
Ariadne Conill
d9aacbec4d mix: update version to 1.0.2 2019-07-28 23:15:19 +00:00
lain
3e3b00f658 Dependencies: Update tzdata and related packages. 2019-07-28 23:13:48 +00:00
Ariadne Conill
f685e887b3 transmogrifier: use User.delete() instead of handrolled user deletion code for remote users
Closes #1104
2019-07-28 23:09:55 +00:00
Sergey Suprunenko
2b38961bf6 Handle 303 redirects 2019-07-28 22:50:47 +00:00
rinpatch
99989758ff Add a changelog entry for tolerating incorrect chain order 2019-07-28 22:48:16 +00:00
rinpatch
1426358538 Workaround for remote server certificate chain issues 2019-07-28 22:47:46 +00:00
rinpatch
2914f8a749 Merge the default options with custom ones in ReverseProxy and
Pleroma.HTTP
2019-07-28 22:47:41 +00:00
Bradley D. Thornton
8b1b3e84f4 Update otp_en.md - Added creation of initial admin user 2019-07-28 22:47:21 +00:00
tom79
1c364f7407 Fix domain for the contact clients.md 2019-07-28 22:46:04 +00:00
tom79
109e7813c9 Update clients.md for Fedilab
- Change owner (@fedilab@framapiaf.org), Source code: Framagit, Add some other supported features
2019-07-28 22:45:57 +00:00
rinpatch
15aaffc6d8 Add a changelog entry for changing the defaults 2019-07-28 22:44:51 +00:00
rinpatch
67c5e6541e Formatting 2019-07-28 22:44:14 +00:00