Anon/pleroma
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
4,311 Commits 1 Branch 0 Tags 222 MiB
e4307cadc8
Commit Graph

4311 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Maxim Filippov
c48aba3c2a Fix SQL 2019-02-05 10:22:31 +03:00
witches.live
47eb557617 ARGLE GARBLE 
Update .gitignore
 2019-02-05 07:03:54 +00:00
William Pitcock
a2bb5d890d html: don't attempt to parse nil content 2019-02-05 05:06:17 +00:00
William Pitcock
e71ab5a10f activitypub: transmogrifier: fix bare tags 2019-02-05 00:43:28 +00:00
William Pitcock
db1165f70f activitypub: c2s: add /api/ap/whoami endpoint for andstatus 2019-02-04 22:58:29 +00:00
lain
f3c8b02d65 Massage index until it actually does the stuff we want. 
Also makes the index a lot smoler.
 2019-02-04 23:47:29 +01:00
Maxim Filippov
cd6606b7f6 Initialize hide_network with false 2019-02-04 22:23:09 +03:00
Haelwenn
03991e7bc5 Merge branch 'feature/mrf-tag' into 'develop' 
MRF TagPolicy engine

See merge request pleroma/pleroma!768
 2019-02-04 19:20:11 +00:00
William Pitcock
7d110be119 activitypub: mrf: tag policy: fix force-unlisted and sandbox actions 2019-02-04 19:03:54 +00:00
William Pitcock
64a3993425 activitypub: mrf: tag policy: add support for subscription control 2019-02-04 17:48:48 +00:00
Egor Kislitsyn
14d967f515 Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into feature/jobs 2019-02-05 00:38:05 +07:00
rinpatch
3ae11835a9 Merge branch 'hotfix/hellthread-deprecation-warning' into 'develop' 
fix hellthread threshold deprecation warning

See merge request pleroma/pleroma!770
 2019-02-04 17:32:12 +00:00
Karen Konou
4031c94a59 fix hellthread threshold deprecation warning 2019-02-04 18:26:56 +01:00
William Pitcock
ff2c28fd6d activitypub: mrf: tag policy: refactor the filtering hook a bit 2019-02-04 17:06:37 +00:00
William Pitcock
9a69f08e86 activitypub: mrf: tag policy: add support for processing follow requests 2019-02-04 17:04:05 +00:00
William Pitcock
084bb8ccd5 activitypub: mrf: tag policy: implement force-unlisted and sandbox 2019-02-04 17:04:05 +00:00
William Pitcock
88e32a32ce mrf: add initial MRF.TagPolicy engine 2019-02-04 17:04:05 +00:00
William Pitcock
93e136d70b mix: add user tag/untag task 2019-02-04 17:04:05 +00:00
kaniini
25a659d2dc Merge branch 'mime-riff' into 'develop' 
Mime: detect RIFF formats (wave, webp, avi)

See merge request pleroma/pleroma!769
 2019-02-04 16:52:41 +00:00
href
127f99ae18
Mime: detect RIFF formats (wave, webp, avi) 2019-02-04 17:44:41 +01:00
rinpatch
00835bf678 Merge branch 'fix/rich-media-relative-path' into 'develop' 
Fix rich media relative path

Closes #588

See merge request pleroma/pleroma!759
 2019-02-04 16:01:34 +00:00
Egor Kislitsyn
3a3a3996b7 Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into feature/jobs 
# Conflicts:
#	lib/pleroma/web/activity_pub/activity_pub.ex
#	lib/pleroma/web/federator/federator.ex
 2019-02-04 20:50:28 +07:00
rinpatch
89762ad230 Merge branch 'feature/hellthread-filter-improvements' into 'develop' 
Improve hellthread filter

Closes #584

See merge request pleroma/pleroma!766
 2019-02-04 12:36:50 +00:00
Karen Konou
58262a8b8a removed a debug thingy 2019-02-04 11:22:25 +00:00
Karen Konou
4430641349 squished a bug 2019-02-04 12:09:00 +01:00
Karen Konou
3cf046babb actually commited the changes 2019-02-04 10:23:43 +01:00
Karen Konou
63a4f4b7be fixed Map,put arguments, updated nomenclature 2019-02-04 10:23:07 +01:00
Karen Konou
583c4e0f17 more tweaks, fixed silly mistakes... 2019-02-03 23:56:20 +01:00
Karen Konou
e10cda7541 implemented tweaks 2019-02-03 22:46:06 +01:00
kaniini
c57f37bd36 Merge branch 'mogrify-orient' into 'develop' 
Update Mogrify docs and warning for deprecated syntax

See merge request pleroma/pleroma!763
 2019-02-03 21:06:15 +00:00
Karen Konou
531507a635 fixed things 2019-02-03 20:45:32 +01:00
Karen Konou
10130fa7d6 made toggleable, added docs 2019-02-03 20:27:28 +01:00
Karen Konou
0ef0ae35ab added optional delist feature 2019-02-03 20:12:23 +01:00
Maxim Filippov
16ce129e38 Split hide_network into hide_followers & hide_followings (fixed) 2019-02-03 21:55:04 +03:00
lambda
69a38644bc Merge branch '589-fix-cache' into 'develop' 
Resolve "Update object cache on favs/boosts"

Closes #589

See merge request pleroma/pleroma!764
 2019-02-03 18:19:40 +00:00
lain
e61f0be951 Unbreak all the tests. 2019-02-03 18:54:39 +01:00
lain
505a084058 Still do caching in tests. 2019-02-03 18:28:14 +01:00
Mark Felder
0c08bd4181 Update Mogrify docs and warning for deprecated syntax to encourage 
users to enable both strip and auto-orient
 2019-02-03 16:39:42 +00:00
kaniini
8180de951e Merge branch '582_federation_retirement_optimization' into 'develop' 
[#582] Optimized federation retirement by reducing the number of SQL calls

Closes #582

See merge request pleroma/pleroma!762
 2019-02-03 15:47:55 +00:00
Ivan Tashkinov
3913b0196e [#582] Made single-pub task call Instance.set_reachable/1 if set_reachable is not specified. 
Added tests.
 2019-02-03 13:28:13 +03:00
Ivan Tashkinov
b40b4bc4e5 [#582] Optimized federation retirement by reducing the number of SQL calls 
(calling `Instances.set_reachable/1` only if instance had `unreachable_since`,
calling `Instances.set_unreachable/1` only if instance had nil `unreachable_since`).
 2019-02-03 12:41:27 +03:00
rinpatch
d5d91ae689 Merge branch 'fix/oauth-page-responsiveness' into 'develop' 
Add responsive features to layout

Closes #564

See merge request pleroma/pleroma!760
 2019-02-02 10:48:35 +00:00
Maxim Filippov
2c59eb3cfc Add responsive features to layout 2019-02-02 13:40:34 +03:00
rinpatch
68d461b3a9 Check if rich media uri is relative 2019-02-02 12:24:24 +03:00
rinpatch
833404f0f5 Use with instead of if in the card 2019-02-02 12:04:18 +03:00
rinpatch
e4d18f328b merge only if page_url is an absolute path 2019-02-02 11:53:46 +03:00
rinpatch
cbadf9d333 Fix rich media relative path 2019-02-02 11:38:37 +03:00
kaniini
09e1c8c05d Merge branch 'revert-0a82a7e6' into 'develop' 
Revert "Merge branch 'feature/split-hide-network' into 'develop'"

See merge request pleroma/pleroma!758
 2019-02-01 20:23:55 +00:00
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
28bfb09b01 Merge branch 'hotfix/object-normalize-cache' into 'develop' 
object: use cached accesses when possible in Object.normalize()

See merge request pleroma/pleroma!757
 2019-02-01 19:45:55 +00:00