Commit graph

4884 commits

Author SHA1 Message Date
Ekaterina Vaartis 8f93d4c423 Remove most finmoji mentions where appropriate 2019-04-20 15:42:14 +03:00
Ekaterina Vaartis 1f3ddb031c Add the emoji packs & finmoji removal to the changelog 2019-04-20 15:17:21 +03:00
Ekaterina Vaartis 53a3e61016 Fix priv/static/instance/static to be just instance/static
It was a misunderstanding
2019-04-20 15:08:51 +03:00
Ekaterina Vaartis 31cff7dbca Document the pleroma.emoji task 2019-04-20 15:06:07 +03:00
Ekaterina Vaartis 1e311d6662 Add a newline at the end of pack in ls-packs 2019-04-20 11:34:03 +03:00
Ekaterina Vaartis aef3a3ca46 Fix tests that used finmoji 2019-04-20 11:34:00 +03:00
Ekaterina Vaartis 52ed287e87 Fix incorrect multiple emoji tag handling introduced in initial impl 2019-04-20 11:17:17 +03:00
Ekaterina Vaartis 9bd5e2dec9 Make emoji default_manifest a config option 2019-04-20 11:17:17 +03:00
Ekaterina Vaartis 98d4b3de53 Treat the manifest path as a file if it doesn't start with http 2019-04-20 11:17:17 +03:00
Ekaterina Vaartis aaaa428512 mix format 2019-04-20 11:17:17 +03:00
Ekaterina Vaartis a141f0807b Assume packs without emoji.txt only have emoji pictures, unhardcode
unhardcode: remove hardcoded /instance/static and actually use the config option
as it is used in other places.

packs without emoji.txt: these are now assumed to have .png files that
are all emojis, their names are used as shortcodes
2019-04-20 11:17:17 +03:00
Ekaterina Vaartis eff725c3af Add a task to generate emoji packs 2019-04-20 11:17:17 +03:00
Ekaterina Vaartis 1e44b5478d Remove useless comment 2019-04-20 11:17:17 +03:00
Ekaterina Vaartis c5b7286b5f Move helper functions of emoji manager task down in the file 2019-04-20 11:17:17 +03:00
Ekaterina Vaartis 06db3ee1a8 Add MD5 verification for emoji pack source 2019-04-20 11:17:17 +03:00
Ekaterina Vaartis af5494f942 Separate emoji pack file lists in a different file
The file should be in the same directory as the manifest file
2019-04-20 11:17:17 +03:00
Ekaterina Vaartis 21b39c54a3 Allow using a custom manfest and getting multiple packs at once
A custom manifest can be provided as a command-line options --manifest/-m
2019-04-20 11:17:17 +03:00
Ekaterina Vaartis c26724cc55 Remove finmoji and add a way to download emojis in packs
These packs are stored in a git repo on pleroma gitlab
2019-04-20 11:17:17 +03:00
Haelwenn 6ca82c18a7 Merge branch 'patch-2' into 'develop'
Gentoo English Installation Guide

See merge request pleroma/pleroma!1050
2019-04-20 07:11:06 +00:00
witches.live 8166cefa21 Include explicit warning for emerge config line as it will vary more widely based on current version of postgres 2019-04-20 07:11:06 +00:00
eugenijm fa48532387 Handle reblogs on the first follow request in MastoAPI 2019-04-20 04:39:49 +03:00
kaniini 9da8b287f8 Merge branch 'feature/database-compaction' into 'develop'
database compaction

See merge request pleroma/pleroma!473
2019-04-19 16:55:33 +00:00
lambda cc93775ebf Merge branch 'feature/805-server-rendered-rel-me-links' into 'develop'
Feature/805 server rendered rel me links

Closes #805

See merge request pleroma/pleroma!1063
2019-04-19 07:50:21 +00:00
Alexander Strizhakov ada384207b typo fix
docs for RelMe provider
2019-04-19 07:50:21 +00:00
lambda 218d96a26b Merge branch '923_oauth_consumer_refactoring_ci' into 'develop'
OAuth consumer params handling refactoring

See merge request pleroma/pleroma!1047
2019-04-19 07:49:26 +00:00
rinpatch f9865cf943 Stream out deletes, mistakingly removed when resolving merge conflicts 2019-04-19 00:47:02 +03:00
rinpatch 17d94ae267 Add a changelog entry for removing embded objects mix task 2019-04-19 00:26:46 +03:00
rinpatch 73b8c5387b Add some logging 2019-04-19 00:17:37 +03:00
rinpatch 945325013a remove query timeouts 2019-04-18 23:58:59 +03:00
rinpatch 099f89367e Replace embedded object migration with a mix task 2019-04-18 23:34:01 +03:00
rinpatch 9238dccac1 Add a guard to fetching reply activity 2019-04-18 21:40:40 +03:00
Haelwenn eba3db0966 Merge branch 'bugfix/filter-boosted-blocks' into 'develop'
activitypub: fix filtering of boosts from blocked users

See merge request pleroma/pleroma!1074
2019-04-18 18:29:57 +00:00
kaniini ad3270c241 Merge branch 'fix/mastoapi-search-unauth' into 'develop'
Do not require authentication for user search in MastoAPI

See merge request pleroma/pleroma!1075
2019-04-18 18:21:28 +00:00
Mark Felder 1aa4994f6d Do not require authentication for user search in MastoAPI 2019-04-18 12:44:25 -05:00
rinpatch 4ef237f26a Fix my incorrect search test fix 2019-04-18 14:37:57 +03:00
rinpatch a11ca87f40 Add a migration to remove embeded objects 2019-04-18 13:10:38 +03:00
rinpatch 83589ca6a5 Merge branch 'develop' into feature/database-compaction 2019-04-18 12:56:38 +03:00
rinpatch ac04311b3f Fix search in TwitterAPI 2019-04-18 10:24:06 +03:00
rinpatch 6069d0fd36 Fix object search depending on embeded object 2019-04-18 09:28:20 +03:00
rinpatch e31a22043b Fix media timeline depending on embeded object and add some guards 2019-04-18 08:31:08 +03:00
rinpatch 2abc09570f Use the preloaded object in tag queries 2019-04-18 01:37:04 +03:00
William Pitcock 36f78c6dcd activitypub: fix filtering of boosts from blocked users 2019-04-17 22:27:59 +00:00
kaniini 8c65b69d4a Merge branch 'feature/improve-block-filtering' into 'develop'
activitypub: properly filter out transitive activities concerning blocked users

See merge request pleroma/pleroma!1072
2019-04-17 20:12:44 +00:00
William Pitcock 2140e164d7 activitypub: properly filter out transitive activities concerning blocked users 2019-04-17 20:05:09 +00:00
rinpatch 35ac672b8d Remove containment tests from transmogrifier and fix thread visibility solver 2019-04-17 17:59:15 +03:00
rinpatch d1eb578a57 Refactor tests that used ActivityPub.fetch_object_from_id 2019-04-17 17:03:35 +03:00
rinpatch 4c289e924e Fix delete-by_ap_id to expect not only embeded objects 2019-04-17 16:35:01 +03:00
rinpatch 8e4d950f31 Remove updating reply count for embeded objects 2019-04-17 15:54:09 +03:00
rinpatch ff8d76c670 Refactor all tests that acessed the embeded object 2019-04-17 15:46:59 +03:00
rinpatch c3a2052806 If it's an object struct it is already normalized 2019-04-17 15:11:22 +03:00