squeegily/pleroma
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity
5,751 Commits 154 Branches 42 Tags 503 MiB
29db8dc799
Commit Graph

5751 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Ariadne Conill
5e9befc7d4 tests: fix object containment violations in the transmogrifier tests 
Some objects were not completely rewritten in the tests, which caused object
containment violations.  Fix them by rewriting the object IDs to be in an
appropriate namespace.
 2019-07-14 19:29:15 +00:00
Ariadne Conill
6d715b7702 security: detect object containment violations at the IR level 
It is more efficient to check for object containment violations at the IR
level instead of in the protocol handlers.  OStatus containment is especially
a tricky situation, as the containment rules don't match those of IR and
ActivityPub.

Accordingly, we just always do a final containment check at the IR level
before the object is added to the IR object graph.
 2019-07-14 19:28:47 +00:00
Ariadne Conill
73a3dbe31e remove CC-BY-NC-ND license. 
we moved branding assets (mascot etc) to CC-BY-SA a while back.
 2019-07-14 19:28:32 +00:00
rinpatch
9504544d5b Merge branch 'revert/tags-releases' into 'master' 
Revert "Build releases only on tags or develop"

See merge request pleroma/pleroma!1356
 2019-06-29 10:35:32 +00:00
rinpatch
5bc9e6e0f3 Revert "Build releases only on tags or develop" 
This reverts commit 54d2873770. It breaks
getting the latest artifact for the master branch.
 2019-06-29 13:24:26 +03:00
rinpatch
e9426d15d8 Merge branch 'rebase/docs-master' into 'master' 
Cherry-pick documentation fixes to master

See merge request pleroma/pleroma!1354
 2019-06-29 09:49:38 +00:00
rinpatch
54d2873770 Build releases only on tags or develop 
Needed so we could push documentation updates to master without
triggering a rebuild
 2019-06-29 12:42:19 +03:00
rinpatch
9b014eae68 Add a warning about service files assuming installation paths 2019-06-29 12:13:52 +03:00
Yuji Nakao
69585a3218 Move all upload contents despite upload folder itself. 2019-06-29 12:13:45 +03:00
Yuji Nakao
d9f8230d2c Update migrating_from_source_otp_en.md: Replace reload-daemon with daemon-reload. 2019-06-29 12:13:32 +03:00
lain
456668b490 Merge branch 'release/1.0' into 'develop' 
1.0 Release

See merge request pleroma/pleroma!1348
 2019-06-28 15:29:44 +00:00
lain
2286f62a36 Merge branch 'release-docs' into 'develop' 
Docs on OTP releases

See merge request pleroma/pleroma!1315
 2019-06-28 15:26:09 +00:00
lain
da17bdd87e BUMP OF CHICKEN 
1.0
 2019-06-28 17:15:44 +02:00
lain
f5b015b998 Merge branch '2019-06-29-pleromafe' into 'develop' 
Update frontend.

See merge request pleroma/pleroma!1347
 2019-06-28 12:39:51 +00:00
lain
efad26bbb9 Update frontend. 2019-06-28 14:29:26 +02:00
rinpatch
eeb419e3a0 Add a note about the develop branch 2019-06-28 09:42:45 +03:00
kaniini
ad249f6f5f Merge branch 'fix/syslog-tag' into 'develop' 
lowercase syslog tag

See merge request pleroma/pleroma!1344
 2019-06-27 21:30:54 +00:00
Mark Felder
e64c758cea Add changelog entry for syslog tag change 2019-06-27 16:25:55 -05:00
Mark Felder
f8ec3e129f In my experience syslog tags are usually lowercase 2019-06-27 13:00:22 -05:00