Commit graph

4838 commits

Author SHA1 Message Date
Alex S
d35246c449 added healthcheck setting to instance config 2019-04-22 17:00:06 +07:00
ilja
c876b04aeb Add shortcode_globs setting to documentation 2019-04-22 11:17:53 +02:00
rinpatch
f4c9b79306 Add a changelog entry for pleroma.in_reply_to_account_acct 2019-04-22 12:02:47 +03:00
rinpatch
f60d072bbb Add pleroma.in_reply_to_account_acct to MastoAPI status entity 2019-04-22 11:54:27 +03:00
rinpatch
d21d921def Replace Object.normalize(activity.data[object] with Object.normalize(acitivty) to benefit from preloading 2019-04-22 11:27:29 +03:00
rinpatch
20deff75f1 Merge branch 'fix/emoji-task-docs' into 'develop'
Fix unclosed ` and put synopsis into a code block in pleroma.emoji mix task docs

See merge request pleroma/pleroma!1084
2019-04-22 08:09:08 +00:00
rinpatch
952a4ae68e Fix unclosed ` and put synopsis into a code block in pleroma.emoji mix
task docs
2019-04-22 11:02:31 +03:00
kaniini
0b6d1d920e Merge branch 'get-cached-everywhere' into 'develop'
Use `User.get_cached*` everywhere

See merge request pleroma/pleroma!1021
2019-04-22 07:20:43 +00:00
Egor
b9cdf6d3b9 Use User.get_cached* everywhere 2019-04-22 07:20:43 +00:00
kaniini
05862ded7a Merge branch 'feature/826-healthcheck-endpoint' into 'develop'
Feature/826 healthcheck endpoint

Closes #826

See merge request pleroma/pleroma!1083
2019-04-22 07:19:53 +00:00
Alexander Strizhakov
88f0be9693 Feature/826 healthcheck endpoint 2019-04-22 07:19:53 +00:00
kaniini
7fcbda702e Merge branch 'rework-emoji-management' into 'develop'
Remove finmoji and add a way to download emojis in packs

Closes #817 and #821

See merge request pleroma/pleroma!1073
2019-04-22 02:07:19 +00:00
Ekaterina Vaartis
3cefdc62e0 Fix emoji.txt / custom_emoji.txt / shortcode_globs handling 2019-04-21 23:07:14 +03:00
rinpatch
6c0e07b8bd Merge branch 'docs/posting_formatted' into 'develop'
differences_in_mastoapi_responses.md: `content_type` parameter of post submission

See merge request pleroma/pleroma!1081
2019-04-21 19:57:52 +00:00
Ekaterina Vaartis
ba19ba8a88 Formatting 2019-04-21 22:33:54 +03:00
Ekaterina Vaartis
0d6265cfe2 Change the default manifest to pleroma's namespace 2019-04-21 22:32:34 +03:00
Ekaterina Vaartis
153f5375a6 Replace MD5 with SHA256 for emoji pack verification 2019-04-21 22:28:41 +03:00
Ekaterina Vaartis
d5c0fd35e1 Wrap the docstrings to 70 characters 2019-04-21 22:16:46 +03:00
lambda
5300cd56e5 Merge branch '923_oauth_controller_refactoring_p2' into 'develop'
[#923] Refactored OAuthController#authorize

See merge request pleroma/pleroma!1080
2019-04-21 13:52:06 +00:00
Haelwenn (lanodan) Monnier
d086319733
differences_in_mastoapi_responses.md: content_type parameter of post submission 2019-04-21 12:48:40 +02:00
Ivan Tashkinov
9256d2d4b4 [#923] Refactored OAuthController#authorize definitions, added test. 2019-04-21 10:51:32 +03:00
kaniini
ad157f16b2 Merge branch 'fix/mastoapi-status-view' into 'develop'
MastoAPI reblog status view

See merge request pleroma/pleroma!1065
2019-04-21 04:22:56 +00:00
eugenijm
375fd21055 Set correct values in the MastoAPI reblog status view 2019-04-21 05:40:22 +03:00
kaniini
2d54fdcdfe Merge branch 'fix/follow-with-reblogs' into 'develop'
Handle `reblogs` on the first follow request

See merge request pleroma/pleroma!1076
2019-04-21 00:41:16 +00:00
kaniini
e48848dad0 Merge branch 'patch-1' into 'develop'
Mention Mastodon 2.8+ follow import fix in changelog

See merge request pleroma/pleroma!1079
2019-04-21 00:40:29 +00:00
Francis Dinh
25fa10499a Mention Mastodon 2.8+ follow import fix in changelog 2019-04-20 18:28:08 +00:00
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
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