Commit graph

5720 commits

Author SHA1 Message Date
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
rinpatch
7486a917d4 Improve wording in CHANGELOG.md 2019-07-28 22:43:58 +00:00
rinpatch
0c028f345a Enable OpenGraph and TwitterCard by default
Closes #1034
2019-07-28 22:43:19 +00:00
rinpatch
48aed88dbd FallbackRedirector: Do not crash on Metadata rendering errors 2019-07-28 22:43:11 +00:00
rinpatch
fd4963006a OGP/TwitterCard: Add fallbacks in case the attachment key is nonexistent 2019-07-28 22:42:38 +00:00
rinpatch
876b5b45a3 OTP Release install docs: Remove --dry-run in cron certbot command 2019-07-28 22:42:06 +00:00
Ariadne Conill
3ec6f34ef0 update Changelog 2019-07-28 22:41:31 +00:00
rinpatch
6a35c151c6 Fix not being able to pin unlisted posts
Closes #1038
2019-07-28 22:39:10 +00:00
Sachin Joshi
1e5d889aec preserve the original path/filename (no encoding/decoding) for proxy 2019-07-28 22:37:18 +00:00
Sachin Joshi
ccafecf9be try to always match the filename for proxy url 2019-07-28 22:36:42 +00:00
Roman Chvanikov
9e88ab2cad Split alters rather than work with indexes 2019-07-28 22:35:15 +00:00
Roman Chvanikov
494a611afe Fix migration 2019-07-28 22:35:03 +00:00
lain
ed639376ac Mastodon Controller: Fix tests. 2019-07-28 22:33:17 +00:00
lain
8123578bf8 Status View: Poll ids are strings.
All ids in mastodon are strings, in general.
2019-07-28 22:33:09 +00:00
kaniini
5cb37412a2 Merge branch 'release/1.0.1' into 'master'
version bump to 1.0.1

See merge request pleroma/pleroma!1421
2019-07-14 20:54:06 +00:00
Ariadne Conill
e01bab843b version bump to 1.0.1 2019-07-14 20:53:10 +00:00
kaniini
ba26208cec Merge branch 'release/1.0.1' into 'master'
1.0.1 release

See merge request pleroma/pleroma!1420
2019-07-14 20:31:57 +00:00
Ariadne Conill
f1147a3d7f fix backport 2019-07-14 20:02:39 +00:00
Haelwenn (lanodan) Monnier
c51b2abead HttpRequestMock: Add 404s on OStatus fetching for info.pleroma.site 2019-07-14 20:00:48 +00:00
Haelwenn (lanodan) Monnier
3e298cc85a HttpRequestMock: Add missing mocks for object containment tests 2019-07-14 20:00:17 +00:00
Ariadne Conill
7523ab1495 object: fix backport 2019-07-14 19:39:37 +00:00
Ariadne Conill
6b12cb60e9 docs: note that exclusions usage will be included in the transparency metrics if used 2019-07-14 19:32:07 +00:00
Ariadne Conill
cdf2ff8176 nodeinfo: implement MRF transparency exclusions 2019-07-14 19:31:55 +00:00
Haelwenn (lanodan) Monnier
48927b1d3b Object.Fetcher: Keep the with-do block as per kaniini proposition 2019-07-14 19:30:39 +00:00
Haelwenn (lanodan) Monnier
1c79ec2c08 FetcherTest: Containment refute called(OStatus.fetch_activity_from_url) 2019-07-14 19:30:34 +00:00
Haelwenn (lanodan) Monnier
e7a472a11f Object.Fetcher: Fallback to OStatus only if AP actually fails 2019-07-14 19:30:13 +00:00