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
2662bea4e0
Add accounts and last_status to conversation read response
2019-04-21 20:26:13 +07:00
d086319733
differences_in_mastoapi_responses.md: `content_type` parameter of post submission
2019-04-21 12:48:40 +02:00
9256d2d4b4
[ #923 ] Refactored OAuthController#authorize definitions, added test.
2019-04-21 10:51:32 +03:00
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
375fd21055
Set correct values in the MastoAPI reblog status view
2019-04-21 05:40:22 +03:00
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
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
25fa10499a
Mention Mastodon 2.8+ follow import fix in changelog
2019-04-20 18:28:08 +00:00
24073f829f
Refactor query to return only 1 message instead of 20
2019-04-21 00:40:41 +07:00
8f93d4c423
Remove most finmoji mentions where appropriate
2019-04-20 15:42:14 +03:00
1f3ddb031c
Add the emoji packs & finmoji removal to the changelog
2019-04-20 15:17:21 +03:00
53a3e61016
Fix priv/static/instance/static to be just instance/static
...
It was a misunderstanding
2019-04-20 15:08:51 +03:00
31cff7dbca
Document the pleroma.emoji task
2019-04-20 15:06:07 +03:00
1e311d6662
Add a newline at the end of pack in ls-packs
2019-04-20 11:34:03 +03:00
aef3a3ca46
Fix tests that used finmoji
2019-04-20 11:34:00 +03:00
52ed287e87
Fix incorrect multiple emoji tag handling introduced in initial impl
2019-04-20 11:17:17 +03:00
9bd5e2dec9
Make emoji default_manifest a config option
2019-04-20 11:17:17 +03:00
98d4b3de53
Treat the manifest path as a file if it doesn't start with http
2019-04-20 11:17:17 +03:00
aaaa428512
mix format
2019-04-20 11:17:17 +03:00
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
eff725c3af
Add a task to generate emoji packs
2019-04-20 11:17:17 +03:00
1e44b5478d
Remove useless comment
2019-04-20 11:17:17 +03:00
c5b7286b5f
Move helper functions of emoji manager task down in the file
2019-04-20 11:17:17 +03:00
06db3ee1a8
Add MD5 verification for emoji pack source
2019-04-20 11:17:17 +03:00
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
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
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
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
fa48532387
Handle `reblogs` on the first follow request in MastoAPI
2019-04-20 04:39:49 +03:00
9da8b287f8
Merge branch 'feature/database-compaction' into 'develop'
...
database compaction
See merge request pleroma/pleroma!473
2019-04-19 16:55:33 +00:00
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
ada384207b
typo fix
...
docs for RelMe provider
2019-04-19 07:50:21 +00:00
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
f9865cf943
Stream out deletes, mistakingly removed when resolving merge conflicts
2019-04-19 00:47:02 +03:00
17d94ae267
Add a changelog entry for removing embded objects mix task
2019-04-19 00:26:46 +03:00
73b8c5387b
Add some logging
2019-04-19 00:17:37 +03:00
945325013a
remove query timeouts
2019-04-18 23:58:59 +03:00
099f89367e
Replace embedded object migration with a mix task
2019-04-18 23:34:01 +03:00
9238dccac1
Add a guard to fetching reply activity
2019-04-18 21:40:40 +03:00
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
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
1aa4994f6d
Do not require authentication for user search in MastoAPI
2019-04-18 12:44:25 -05:00
4ef237f26a
Fix my incorrect search test fix
2019-04-18 14:37:57 +03:00
a11ca87f40
Add a migration to remove embeded objects
2019-04-18 13:10:38 +03:00
83589ca6a5
Merge branch 'develop' into feature/database-compaction
2019-04-18 12:56:38 +03:00
ac04311b3f
Fix search in TwitterAPI
2019-04-18 10:24:06 +03:00
6069d0fd36
Fix object search depending on embeded object
2019-04-18 09:28:20 +03:00
e31a22043b
Fix media timeline depending on embeded object and add some guards
2019-04-18 08:31:08 +03:00
lambda
Roman Chvanikov
Haelwenn (lanodan) Monnier
Ivan Tashkinov
kaniini
eugenijm
Francis Dinh
Ekaterina Vaartis
Haelwenn
witches.live
Alexander Strizhakov
rinpatch
Mark Felder