fedi/akkoma
1
0
Fork 0
mirror of https://akkoma.dev/AkkomaGang/akkoma.git synced 2024-11-24 07:16:18 +00:00
Code Issues Packages Projects Releases Wiki Activity
3681 commits 26 branches 107 tags 316 MiB
Commit graph

3681 commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
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
href ffbf306c9a Merge branch 'streaming-api-url-fix' into 'develop' 
Fix WebSocket streaming API URL.

See merge request pleroma/pleroma!756
 2019-02-01 19:39:50 +00:00
William Pitcock af10ef8d4e object: use cached accesses when possible in Object.normalize() 2019-02-01 19:38:57 +00:00
eugenijm a184811a60 Use url() instead of static_url in Endpoint.websocket_url() 2019-02-01 22:35:19 +03: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
Luna 9cac8729af update nodeinfo version when requesting 2.1 2019-02-01 16:03:23 -03:00
eugenijm d747bd9870 Use String.replace_leading instead of String.replace for getting websocket streaming api url. 
Extract the login responsible for obtaining websocket URL into the corresponding
Endpoint function.
 2019-02-01 21:58:43 +03:00
Luna 1cdcee89da mix format pass 2019-02-01 14:40:43 -03:00
Luna 23b1c64a19 downcase software name in nodeinfo 2019-02-01 14:35:08 -03:00
Luna e8c7be38fc add tests for nodeinfo 2.0 compat and 2.1's new field 2019-02-01 14:33:14 -03:00
Haelwenn 389e6a878a Merge branch 'bugfix/get_list_return_404' into 'develop' 
MastodonAPI.MastodonAPIController: Return a 404 when we fail to get a list

See merge request pleroma/pleroma!755
 2019-02-01 17:27:50 +00:00
Luna b17ce875cf keep compatibility with nodeinfo 2.0 
splits actual nodeinfo generation into raw_nodeinfo, the 2.0 handler
gives the same result, while the 2.1 handler inserts the
software.repository field. requested by @href
 2019-02-01 14:23:40 -03:00
Haelwenn (lanodan) Monnier 74c6119f28
MastodonAPI.MastodonAPIController: Return a 404 when we fail to get a list 2019-02-01 18:21:16 +01:00
Luna cd6db6abe4 use Mix.Project.Config for some Application functions 2019-02-01 14:11:23 -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
lambda fc7644798d Merge branch 'serve-sw-pleroma.js' into 'develop' 
Serve sw-pleroma.js properly

See merge request pleroma/pleroma!754
 2019-02-01 14:24:07 +00:00
href fa5ec765d9
Serve sw-pleroma.js properly 2019-02-01 11:34:41 +01:00
lambda ddab8d45ec Merge branch 'fix-rich-media-toggle' into 'develop' 
Remove default value for rich media.

See merge request pleroma/pleroma!751
 2019-02-01 09:33:50 +00:00
lain 01d483f9c7 Merge remote-tracking branch 'origin/develop' into fix-rich-media-toggle 2019-02-01 10:21:17 +01: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
Luna b0c4c082c4 mix format pass 2019-02-01 04:02:40 -03:00
Luna 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
Haelwenn 0340fcaeca Merge branch 'docs/pleroma-api-invite-token' into 'develop' 
docs/Pleroma-API.md: Add missing token field documentation

See merge request pleroma/pleroma!752
 2019-01-31 22:28:08 +00:00
Haelwenn (lanodan) Monnier a7c55c61bb
docs/Pleroma-API.md: Add missing token field documentation 
[ci skip]
 2019-01-31 23:23:53 +01:00
lain b19b4f8537 Remove default value for rich media. 
Setting it to true will actually override a 'false' set before.
 2019-01-31 20:02:08 +01:00
kaniini e914eeb632 Merge branch 'user-follow-all-unique' into 'develop' 
User.follow_all: ensure the following array stays unique

See merge request pleroma/pleroma!750
 2019-01-31 18:50:00 +00:00
href 308b35ebe2
User.follow_all: ensure its stays unique 2019-01-31 18:17:44 +01:00