rinpatch [Mon, 29 Apr 2019 06:45:18 +0000 (06:45 +0000)]
Merge branch 'fix/add-default-scope-mastoapi' into 'develop'
Add default_scope to /api/v1/update_credentials
See merge request pleroma/pleroma!1100
kaniini [Sun, 28 Apr 2019 23:05:50 +0000 (23:05 +0000)]
Merge branch 'fix/uploads-folder-issues' into 'develop'
fix issues with the uploads directory
See merge request pleroma/pleroma!1101
kaniini [Sun, 28 Apr 2019 23:05:14 +0000 (23:05 +0000)]
Merge branch 'regression/rights-only-for-admin' into 'develop'
Fix `rights` in TwitterAPI's user entity being present only for Admins/Moderators
See merge request pleroma/pleroma!1102
rinpatch [Sun, 28 Apr 2019 16:42:43 +0000 (19:42 +0300)]
Fix `rights` in TwitterAPI's user entity being present only for
Admins/Moderators
In !1093 I reused `maybe_with_role` for `rights` object, however I
missed that `maybe_with_role` is called only for admins/moderators.
xse [Sun, 28 Apr 2019 04:43:00 +0000 (06:43 +0200)]
fix issues with the uploads directory
kaniini [Sun, 28 Apr 2019 00:21:32 +0000 (00:21 +0000)]
Merge branch 'fix/bookmark-depend-on-embeded-object' into 'develop'
Fix bookmarks depending on embeded object and move checking if the status is bookmarked to SQL
See merge request pleroma/pleroma!1099
rinpatch [Sat, 27 Apr 2019 20:55:54 +0000 (23:55 +0300)]
Add default_scope to /api/v1/update_credentials
rinpatch [Sat, 27 Apr 2019 20:06:46 +0000 (23:06 +0300)]
Fix bookmarks depending on embeded object and move checking if the
status is bookmarked to SQL
kaniini [Sat, 27 Apr 2019 07:44:24 +0000 (07:44 +0000)]
Merge branch 'feature/bbcode' into 'develop'
BBCode support (backend)
See merge request pleroma/pleroma!1097
kaniini [Sat, 27 Apr 2019 07:42:01 +0000 (07:42 +0000)]
Merge branch 'update/pleroma-fe-
20190426' into 'develop'
update pleroma frontend
See merge request pleroma/pleroma!1098
William Pitcock [Sat, 27 Apr 2019 07:34:59 +0000 (07:34 +0000)]
update pleroma frontend
William Pitcock [Fri, 26 Apr 2019 22:38:56 +0000 (22:38 +0000)]
tests: fix up for changed bbcode library output and verify html is properly escaped
William Pitcock [Fri, 26 Apr 2019 10:17:57 +0000 (10:17 +0000)]
add support for bbcode
William Pitcock [Fri, 26 Apr 2019 09:22:26 +0000 (09:22 +0000)]
mix: add bbcode dependency
lambda [Fri, 26 Apr 2019 11:59:47 +0000 (11:59 +0000)]
Merge branch 'feature/807-bookmark-endpoint-extension' into 'develop'
Feature/807 bookmark endpoint extension
Closes #807
See merge request pleroma/pleroma!1059
kaniini [Fri, 26 Apr 2019 02:41:35 +0000 (02:41 +0000)]
Merge branch 'feature/mastoapi-new-config' into 'develop'
Fix leaking private configuration parameters in Mastodon and Twitter APIs, and add new configuration parameters to Mastodon API
This patch:
- Fixes `rights` in TwitterAPI ignoring `show_role`
- Fixes exposing default scope of the user to anyone in Mastodon API
- Extends Mastodon API to be able to show and set `no_rich_text`, `default_scope`, `hide_follows`, `hide_followers`, `hide_favorites` (requested by the FE in #674)
Sorry in advance for 500 line one commit diff, I should have split it up to separate MRs
See merge request pleroma/pleroma!1093
kaniini [Thu, 25 Apr 2019 23:35:13 +0000 (23:35 +0000)]
Merge branch 'chore/update-changelog' into 'develop'
update Changelog
See merge request pleroma/pleroma!1096
William Pitcock [Thu, 25 Apr 2019 23:27:38 +0000 (23:27 +0000)]
update Changelog
kaniini [Thu, 25 Apr 2019 23:23:27 +0000 (23:23 +0000)]
Merge branch 'feature/mediaproxy-whitelist' into 'develop'
Add mediaproxy whitelist capability
Closes #837
See merge request pleroma/pleroma!1095
Mark Felder [Thu, 25 Apr 2019 23:11:47 +0000 (18:11 -0500)]
Add mediaproxy whitelist capability
Haelwenn [Thu, 25 Apr 2019 09:47:42 +0000 (09:47 +0000)]
Merge branch 'feature/auto-reject-follow-requests-blocked' into 'develop'
activitypub: transmogrifier: send reject follow if following does not succeed
See merge request pleroma/pleroma!1094
rinpatch [Thu, 25 Apr 2019 06:14:35 +0000 (09:14 +0300)]
Move settings to Source subentity
Alex S [Thu, 25 Apr 2019 07:09:57 +0000 (14:09 +0700)]
test fixes
Alex S [Mon, 22 Apr 2019 09:16:19 +0000 (16:16 +0700)]
fixes for tests
Alex S [Mon, 22 Apr 2019 05:45:45 +0000 (12:45 +0700)]
migration without using old field name
removing old field from db, after bookmarks migration
Alex S [Sat, 20 Apr 2019 07:41:42 +0000 (14:41 +0700)]
unused
Alex S [Wed, 17 Apr 2019 07:24:11 +0000 (14:24 +0700)]
removing useless transaction
Alex S [Mon, 15 Apr 2019 04:43:02 +0000 (11:43 +0700)]
migration optimization
changelog wording
Alex S [Sun, 14 Apr 2019 14:54:49 +0000 (21:54 +0700)]
changelog file update
Alex S [Sun, 14 Apr 2019 14:42:18 +0000 (21:42 +0700)]
favourites add bookmark display
Alex S [Sun, 14 Apr 2019 14:37:05 +0000 (21:37 +0700)]
migrate user.bookmarks to separate table
Alex S [Sun, 14 Apr 2019 12:45:56 +0000 (19:45 +0700)]
bookmarks in separate table
William Pitcock [Wed, 24 Apr 2019 23:52:33 +0000 (23:52 +0000)]
activitypub: transmogrifier: send reject follow if following does not succeed
rinpatch [Wed, 24 Apr 2019 17:01:42 +0000 (20:01 +0300)]
Fix leaking private configuration parameters in Mastodon and Twitter APIs, and add new configuration parameters to Mastodon API
This patch:
- Fixes `rights` in twitterapi ignoring `show_role`
- Fixes exposing default scope of the user to anyone in Mastodon API
- Extends Mastodon API to be able to show and set `no_rich_text`, `default_scope`, `hide_follows`, `hide_followers`, `hide_favorites` (requested by the FE in #674)
Sorry in advance for 500 line one commit diff, I should have split it up to separate MRs
kaniini [Tue, 23 Apr 2019 23:07:56 +0000 (23:07 +0000)]
Merge branch 'security/fix-html-class-scrubbing' into 'develop'
html: lock down allowed class attributes to only those related to microformats
See merge request pleroma/pleroma!1090
William Pitcock [Tue, 23 Apr 2019 22:55:21 +0000 (22:55 +0000)]
html: lock down allowed class attributes to only those related to microformats
kaniini [Tue, 23 Apr 2019 02:47:43 +0000 (02:47 +0000)]
Merge branch 'feature/users-favourites-timeline-endpoint' into 'develop'
Extend Mastodon API with public endpoint for getting Favorites timeline of any user (#789)
Closes #789
See merge request pleroma/pleroma!1056
Sergey Suprunenko [Tue, 23 Apr 2019 02:47:43 +0000 (02:47 +0000)]
Extend Mastodon API with public endpoint for getting Favorites timeline of any user (#789)
kaniini [Tue, 23 Apr 2019 02:43:53 +0000 (02:43 +0000)]
Merge branch 'mastoapi/add-in-reply-to-screen-name' into 'develop'
Add `in_reply_to_account_acct` to MastoAPI status entity
See merge request pleroma/pleroma!1086
kaniini [Tue, 23 Apr 2019 02:43:26 +0000 (02:43 +0000)]
Merge branch 'fix/normalize-activities' into 'develop'
Normalize acitvities instead of objects inside them
See merge request pleroma/pleroma!1085
kaniini [Tue, 23 Apr 2019 02:41:21 +0000 (02:41 +0000)]
Merge branch 'develop' into 'develop'
Add shortcode_globs setting to documentation
See merge request pleroma/pleroma!1087
kaniini [Mon, 22 Apr 2019 18:31:01 +0000 (18:31 +0000)]
Merge branch 'add-healthcheck-setting-to-config' into 'develop'
added healthcheck setting to instance config
See merge request pleroma/pleroma!1088
ilja [Mon, 22 Apr 2019 17:42:02 +0000 (19:42 +0200)]
Add :emoji settings to config.md
Alex S [Mon, 22 Apr 2019 10:00:06 +0000 (17:00 +0700)]
added healthcheck setting to instance config
ilja [Mon, 22 Apr 2019 09:17:53 +0000 (11:17 +0200)]
Add shortcode_globs setting to documentation
rinpatch [Mon, 22 Apr 2019 09:02:41 +0000 (12:02 +0300)]
Add a changelog entry for `pleroma.in_reply_to_account_acct`
rinpatch [Mon, 22 Apr 2019 08:53:37 +0000 (11:53 +0300)]
Add `pleroma.in_reply_to_account_acct` to MastoAPI status entity
rinpatch [Mon, 22 Apr 2019 08:27:29 +0000 (11:27 +0300)]
Replace Object.normalize(activity.data[object] with Object.normalize(acitivty) to benefit from preloading
rinpatch [Mon, 22 Apr 2019 08:09:08 +0000 (08:09 +0000)]
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
rinpatch [Mon, 22 Apr 2019 08:02:31 +0000 (11:02 +0300)]
Fix unclosed ` and put synopsis into a code block in pleroma.emoji mix
task docs
kaniini [Mon, 22 Apr 2019 07:20:43 +0000 (07:20 +0000)]
Merge branch 'get-cached-everywhere' into 'develop'
Use `User.get_cached*` everywhere
See merge request pleroma/pleroma!1021
Egor [Mon, 22 Apr 2019 07:20:43 +0000 (07:20 +0000)]
Use `User.get_cached*` everywhere
kaniini [Mon, 22 Apr 2019 07:19:53 +0000 (07:19 +0000)]
Merge branch 'feature/826-healthcheck-endpoint' into 'develop'
Feature/826 healthcheck endpoint
Closes #826
See merge request pleroma/pleroma!1083
Alexander Strizhakov [Mon, 22 Apr 2019 07:19:53 +0000 (07:19 +0000)]
Feature/826 healthcheck endpoint
kaniini [Mon, 22 Apr 2019 02:07:19 +0000 (02:07 +0000)]
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
Ekaterina Vaartis [Sun, 21 Apr 2019 19:46:55 +0000 (22:46 +0300)]
Fix emoji.txt / custom_emoji.txt / shortcode_globs handling
rinpatch [Sun, 21 Apr 2019 19:57:52 +0000 (19:57 +0000)]
Merge branch 'docs/posting_formatted' into 'develop'
differences_in_mastoapi_responses.md: `content_type` parameter of post submission
See merge request pleroma/pleroma!1081
Ekaterina Vaartis [Sun, 21 Apr 2019 19:33:54 +0000 (22:33 +0300)]
Formatting
Ekaterina Vaartis [Sun, 21 Apr 2019 19:32:34 +0000 (22:32 +0300)]
Change the default manifest to pleroma's namespace
Ekaterina Vaartis [Sun, 21 Apr 2019 19:19:19 +0000 (22:19 +0300)]
Replace MD5 with SHA256 for emoji pack verification
Ekaterina Vaartis [Sun, 21 Apr 2019 19:16:46 +0000 (22:16 +0300)]
Wrap the docstrings to 70 characters
lambda [Sun, 21 Apr 2019 13:52:06 +0000 (13:52 +0000)]
Merge branch '923_oauth_controller_refactoring_p2' into 'develop'
[#923] Refactored OAuthController#authorize
See merge request pleroma/pleroma!1080
Haelwenn (lanodan) Monnier [Sun, 21 Apr 2019 10:48:40 +0000 (12:48 +0200)]
differences_in_mastoapi_responses.md: `content_type` parameter of post submission
Ivan Tashkinov [Sun, 21 Apr 2019 07:51:32 +0000 (10:51 +0300)]
[#923] Refactored OAuthController#authorize definitions, added test.
kaniini [Sun, 21 Apr 2019 04:22:56 +0000 (04:22 +0000)]
Merge branch 'fix/mastoapi-status-view' into 'develop'
MastoAPI reblog status view
See merge request pleroma/pleroma!1065
eugenijm [Mon, 15 Apr 2019 17:32:14 +0000 (20:32 +0300)]
Set correct values in the MastoAPI reblog status view
kaniini [Sun, 21 Apr 2019 00:41:16 +0000 (00:41 +0000)]
Merge branch 'fix/follow-with-reblogs' into 'develop'
Handle `reblogs` on the first follow request
See merge request pleroma/pleroma!1076
kaniini [Sun, 21 Apr 2019 00:40:29 +0000 (00:40 +0000)]
Merge branch 'patch-1' into 'develop'
Mention Mastodon 2.8+ follow import fix in changelog
See merge request pleroma/pleroma!1079
Francis Dinh [Sat, 20 Apr 2019 18:28:08 +0000 (18:28 +0000)]
Mention Mastodon 2.8+ follow import fix in changelog
Ekaterina Vaartis [Sat, 20 Apr 2019 12:34:45 +0000 (15:34 +0300)]
Remove most finmoji mentions where appropriate
Ekaterina Vaartis [Sat, 20 Apr 2019 12:17:21 +0000 (15:17 +0300)]
Add the emoji packs & finmoji removal to the changelog
Ekaterina Vaartis [Sat, 20 Apr 2019 12:06:56 +0000 (15:06 +0300)]
Fix priv/static/instance/static to be just instance/static
It was a misunderstanding
Ekaterina Vaartis [Sat, 20 Apr 2019 07:57:31 +0000 (10:57 +0300)]
Document the pleroma.emoji task
Ekaterina Vaartis [Fri, 19 Apr 2019 21:22:11 +0000 (00:22 +0300)]
Add a newline at the end of pack in ls-packs
Ekaterina Vaartis [Thu, 18 Apr 2019 19:04:37 +0000 (22:04 +0300)]
Fix tests that used finmoji
Ekaterina Vaartis [Thu, 18 Apr 2019 18:17:52 +0000 (21:17 +0300)]
Fix incorrect multiple emoji tag handling introduced in initial impl
Ekaterina Vaartis [Thu, 18 Apr 2019 17:48:57 +0000 (20:48 +0300)]
Make emoji default_manifest a config option
Ekaterina Vaartis [Thu, 18 Apr 2019 17:06:59 +0000 (20:06 +0300)]
Treat the manifest path as a file if it doesn't start with http
Ekaterina Vaartis [Thu, 18 Apr 2019 15:09:43 +0000 (18:09 +0300)]
mix format
Ekaterina Vaartis [Thu, 18 Apr 2019 15:04:02 +0000 (18:04 +0300)]
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
Ekaterina Vaartis [Thu, 18 Apr 2019 14:02:22 +0000 (17:02 +0300)]
Add a task to generate emoji packs
Ekaterina Vaartis [Thu, 18 Apr 2019 12:57:41 +0000 (15:57 +0300)]
Remove useless comment
Ekaterina Vaartis [Thu, 18 Apr 2019 12:47:49 +0000 (15:47 +0300)]
Move helper functions of emoji manager task down in the file
Ekaterina Vaartis [Thu, 18 Apr 2019 12:46:07 +0000 (15:46 +0300)]
Add MD5 verification for emoji pack source
Ekaterina Vaartis [Thu, 18 Apr 2019 12:32:18 +0000 (15:32 +0300)]
Separate emoji pack file lists in a different file
The file should be in the same directory as the manifest file
Ekaterina Vaartis [Thu, 18 Apr 2019 07:57:20 +0000 (10:57 +0300)]
Allow using a custom manfest and getting multiple packs at once
A custom manifest can be provided as a command-line options --manifest/-m
Ekaterina Vaartis [Wed, 17 Apr 2019 20:54:09 +0000 (23:54 +0300)]
Remove finmoji and add a way to download emojis in packs
These packs are stored in a git repo on pleroma gitlab
Haelwenn [Sat, 20 Apr 2019 07:11:06 +0000 (07:11 +0000)]
Merge branch 'patch-2' into 'develop'
Gentoo English Installation Guide
See merge request pleroma/pleroma!1050
witches.live [Sat, 20 Apr 2019 07:11:06 +0000 (07:11 +0000)]
Include explicit warning for emerge config line as it will vary more widely based on current version of postgres
eugenijm [Fri, 19 Apr 2019 05:35:05 +0000 (08:35 +0300)]
Handle `reblogs` on the first follow request in MastoAPI
kaniini [Fri, 19 Apr 2019 16:55:33 +0000 (16:55 +0000)]
Merge branch 'feature/database-compaction' into 'develop'
database compaction
See merge request pleroma/pleroma!473
lambda [Fri, 19 Apr 2019 07:50:21 +0000 (07:50 +0000)]
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
Alexander Strizhakov [Fri, 19 Apr 2019 07:50:21 +0000 (07:50 +0000)]
typo fix
docs for RelMe provider
lambda [Fri, 19 Apr 2019 07:49:26 +0000 (07:49 +0000)]
Merge branch '923_oauth_consumer_refactoring_ci' into 'develop'
OAuth consumer params handling refactoring
See merge request pleroma/pleroma!1047
rinpatch [Thu, 18 Apr 2019 21:47:02 +0000 (00:47 +0300)]
Stream out deletes, mistakingly removed when resolving merge conflicts
rinpatch [Thu, 18 Apr 2019 21:26:46 +0000 (00:26 +0300)]
Add a changelog entry for removing embded objects mix task
rinpatch [Thu, 18 Apr 2019 21:17:37 +0000 (00:17 +0300)]
Add some logging
rinpatch [Thu, 18 Apr 2019 20:58:59 +0000 (23:58 +0300)]
remove query timeouts
rinpatch [Thu, 18 Apr 2019 20:34:01 +0000 (23:34 +0300)]
Replace embedded object migration with a mix task
rinpatch [Thu, 18 Apr 2019 18:40:40 +0000 (21:40 +0300)]
Add a guard to fetching reply activity
projects / akkoma / log