Ivan Tashkinov
c181e555db
[ #1794 ] Improvements to hashtags extraction from search query.
4 years ago
lain
9848978109
Merge branch 'fix-relay-repeat-notification' into 'develop'
...
Fix relay repeat notification
See merge request pleroma/pleroma!2590
4 years ago
kPherox
228ff3760e
Use `User.is_internal_user?` instead
4 years ago
kPherox
9df5b1e6ae
Don't make relay announce notification
4 years ago
rinpatch
396bc69aee
Merge branch 'fix/mediaproxy-bypass-emoji' into 'develop'
...
Fix profile emojis bypassing mediaproxy and harden CSP
Closes #1810
See merge request pleroma/pleroma!2596
4 years ago
rinpatch
27180611df
HTTP Security plug: make starting csp string generation more readable
4 years ago
lain
1d30608e20
Merge branch 'fix/1557-gets-local-pack' into 'develop'
...
get-packs for local generated pack
Closes #1557
See merge request pleroma/pleroma!2604
4 years ago
lain
f6ddf0cc50
Merge branch 'feature/1792-update-actor-type' into 'develop'
...
Validate actor type
See merge request pleroma/pleroma!2593
4 years ago
lain
ddbf7084e2
Merge branch 'update-install-guides' into 'develop'
...
Update installation guides
See merge request pleroma/pleroma!2603
4 years ago
Alexander Strizhakov
ae05792d2a
get-packs for local generated pack
4 years ago
Egor Kislitsyn
800e624058
Update installation guides
4 years ago
rinpatch
089d72d2e6
Merge branch 'chore/fix-spelling' into 'develop'
...
Fix minor spelling error
See merge request pleroma/pleroma!2598
4 years ago
Mark Felder
95f6240889
Fix minor spelling error
4 years ago
rinpatch
a23df89b5d
Merge branch 'bundle/adminfe-20200527' into 'develop'
...
Update AdminFE build, re-enables emoji packs
See merge request pleroma/pleroma!2597
4 years ago
Mark Felder
d28b9708d2
Update AdminFE build, re-enables emoji packs
4 years ago
rinpatch
29ff6d414b
HTTP security plug: Harden img-src and media-src when MediaProxy is enabled
4 years ago
rinpatch
455a402c8a
HTTP Security plug: rewrite &csp_string/0
...
- Directives are now separated with ";" instead of " ;",
according to https://www.w3.org/TR/CSP2/#policy-parsing
the space is optional
- Use an IO list, which at the end gets converted to a binary as
opposed to ++ing a bunch of arrays with binaries together and joining
them to a string. I doubt it gives any significant real world advantage,
but the code is cleaner and now I can sleep at night.
- The static part of csp is pre-joined to a single binary at compile time.
Same reasoning as the last point.
4 years ago
rinpatch
8f6d428880
AccountView: Use mediaproxy URLs for emojis
...
Also use atom keys in emoji maps instead of binaries
Closes #1810
4 years ago
rinpatch
78c46fb7ba
MediaProxy test: use config macros instead of directly putting values
...
They were not properly cleaned later and caused trouble for another tests
4 years ago
kPherox
48fd9be65a
Exclude post actor from to of relay announce
4 years ago
rinpatch
d35be02e70
Merge branch 'refactor-add-mention-step-one' into 'develop'
...
Fix ObjectView calling into strange functions
Closes #1807
See merge request pleroma/pleroma!2580
4 years ago
rinpatch
91f73a7592
Merge branch 'notification-fixes' into 'develop'
...
Notification performance fixes
See merge request pleroma/pleroma!2595
4 years ago
lain
73f222d76a
Migrations: Make user_id index on notifications better for query.
4 years ago
Alexander Strizhakov
047a11c48f
Apply suggestion to lib/pleroma/web/admin_api/controllers/admin_api_controller.ex
4 years ago
lain
b8e029b5ea
Notification: Actually preload objects.
4 years ago
lain
b9e2678b9e
Merge branch 'fav-speedup' into 'develop'
...
ActivityPub: Change ordering to `nulls last` in favorites query
See merge request pleroma/pleroma!2594
4 years ago
lain
7e13200869
ActivityPub: Change ordering to `nulls last` in favorites query
...
This makes it use our existing index and speeds up the query.
4 years ago
Alexander Strizhakov
3249141588
validate actor type
4 years ago
rinpatch
cf139b06a3
Merge branch 'fav-speedup' into 'develop'
...
Fix favorites query performance
See merge request pleroma/pleroma!2591
4 years ago
rinpatch
3601c0015c
Merge branch '1808-pleroma-sucks' into 'develop'
...
Resolve "Don't fail message ingestions when we can't update a user"
Closes #1808
See merge request pleroma/pleroma!2576
4 years ago
rinpatch
5ad28ff405
Merge branch 'apps-index' into 'develop'
...
Migrations: Add index on client_id and client_secret for apps.
See merge request pleroma/pleroma!2589
4 years ago
rinpatch
ed08da9135
Merge branch '1813-throttling' into 'develop'
...
Mastodon API Controllers: Use the correct params for rate limiting.
Closes #1813
See merge request pleroma/pleroma!2586
4 years ago
lain
d8d99fd4cf
Activity.Queries: Use correct actor restriction.
4 years ago
lain
acba7043be
Migrations: Add index on client_id and client_secret for apps.
...
Greatly speeds up app lookup.
4 years ago
lain
5083558ecd
Merge branch 'restore-new-image' into 'develop'
...
Config: Restore old new background image
See merge request pleroma/pleroma!2588
4 years ago
lain
337ca33e5e
Config: Restore old new background image
...
Became lost in a settings restructure
4 years ago
lain
b233c8e55c
Merge branch 'fix/oban-warnings' into 'develop'
...
Fix Oban warnings
See merge request pleroma/pleroma!2587
4 years ago
Egor Kislitsyn
2069ec5006
Fix Oban warnings
4 years ago
lain
51bc6674f6
Mastodon API Controllers: Use the correct params for rate limiting.
4 years ago
lain
644195e31e
Merge branch '1501-include-unlisted-posts-in-user-feed' into 'develop'
...
[#1501 ] Made user feed contain public and unlisted activities
Closes #1501
See merge request pleroma/pleroma!2584
4 years ago
lain
c8803965af
Merge branch 'skip-crypt-test' into 'develop'
...
Skip failing `:crypt` test on mac
See merge request pleroma/pleroma!2583
4 years ago
Ivan Tashkinov
d7a57004ef
[ #1501 ] Made user feed contain public and unlisted activities.
4 years ago
Egor Kislitsyn
e32b7ae044
Skip failing `:crypt` test on mac
4 years ago
lain
09d8b9cb55
Merge branch '1471-tuning-advice' into 'develop'
...
Docs: Document reasonable Postgres settings.
See merge request pleroma/pleroma!2581
4 years ago
lain
af3568a6d9
Docs: sql -> SQL
4 years ago
lain
f7cb3f4cfc
Apply suggestion to docs/installation/otp_en.md
4 years ago
lain
6a85fe1f9d
Docs: Document reasonable Postgres settings.
4 years ago
lain
6bd7070b00
Transmogrifier: Use a simpler way to get mentions.
4 years ago
lain
5fef405208
User: Change signature of get_users_from_set
4 years ago
lain
f20dff451e
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into 1808-pleroma-sucks
4 years ago