Ivan Tashkinov
460e41585c
Further preloading (more endpoints), refactoring, tests.
4 years ago
Ivan Tashkinov
be5e2c4dbb
Applied relationships preloading to GET /api/v1/accounts/relationships. Refactoring (User.binary_id/1).
4 years ago
Ivan Tashkinov
8f1d622b8d
Merge remote-tracking branch 'remotes/origin/develop' into relations-preloading-for-statuses-rendering
4 years ago
Ivan Tashkinov
13cbb9f6ad
Implemented preloading of relationships with parent activities' actors for statuses/timeline rendering. Applied preloading for notifications rendering. Fixed announces rendering issue (preloading-related).
4 years ago
feld
8eebc75c15
Merge branch 'fix/activity-deletion' into 'develop'
Fix activity deletion
Closes #1640
See merge request pleroma/pleroma!2328
4 years ago
lain
1d75d0ed7a
Merge branch 'admin-api-change-password' into 'develop'
Admin API: `PATCH /api/pleroma/admin/users/:nickname/update_credentials`
See merge request pleroma/pleroma!2149
4 years ago
Egor Kislitsyn
d1a9716a98
Fix activity deletion
4 years ago
rinpatch
fbf02a3722
Merge branch 'bugfix/profile-bio-newline' into 'develop'
AccountView: fix for other forms of <br> in bio
Closes #1643
See merge request pleroma/pleroma!2322
4 years ago
lain
eec1fcaf55
Home timeline tests: Add failing test for relationships
4 years ago
Ivan Tashkinov
86f2fbc81e
Merge remote-tracking branch 'remotes/origin/develop' into relations-preloading-for-statuses-rendering
4 years ago
rinpatch
d931a59072
Merge branch 'support-emoji-staticfe' into 'develop'
Add emoji support in statuses in staticfe
Closes #1453
See merge request pleroma/pleroma!2324
4 years ago
Egor Kislitsyn
5a34dca8ed
Add emoji support in statuses in staticfe
4 years ago
Ivan Tashkinov
3c78e5f327
Preloading of follow relations for timeline/statuses rendering (performance improvement). Refactoring.
4 years ago
Ivan Tashkinov
c2e415143b
WIP: preloading of user relations for timeline/statuses rendering (performance improvement).
4 years ago
Haelwenn (lanodan) Monnier
15be6ba9c2
AccountView: fix for other forms of <br> in bio
Closes: https://git.pleroma.social/pleroma/pleroma/issues/1643
4 years ago
rinpatch
7dbf1ffa86
Merge branch 'fix/ecto_ssl_option' into 'develop'
Fix ssl option on Ecto config breaking release
See merge request pleroma/pleroma!2307
4 years ago
Haelwenn
4633793bc1
Merge branch 'relationship-remove-outdated-hack' into 'develop'
Mastodon API Account view: Remove an outdated hack
See merge request pleroma/pleroma!2321
4 years ago
rinpatch
981e015f1b
Mastodon API Account view: Remove an outdated hack
The hack with caching the follow relationship was introduced
when we still were storing it inside the follow activity, resulting in
slow queries. Now we store follow state in `FollowRelationship` table,
so this is no longer necessary.
4 years ago
lain
d74405fc1a
Merge branch 'fix-feed-pagination' into 'develop'
Fix for feed page pagination
Closes #1605
See merge request pleroma/pleroma!2281
4 years ago
lain
d23e81903d
Merge branch 'clear-config-test-improvements' into 'develop'
Improved in-test config management
See merge request pleroma/pleroma!2312
4 years ago
Ivan Tashkinov
1c05f539aa
Improved in-test `clear_config/n` applicability (setup / setup_all / in-test usage).
4 years ago
Ivan Tashkinov
0e27c274f4
Merge remote-tracking branch 'remotes/origin/develop' into clear-config-test-improvements
# Conflicts:
# test/web/mastodon_api/controllers/account_controller_test.exs
4 years ago
lain
5efa5b0c4a
Merge branch 'feature/1206-restrict-unauthenticated' into 'develop'
restrict_unauthenticated setting
Closes #1206
See merge request pleroma/pleroma!2318
4 years ago
Alexander Strizhakov
fe15f0ba15
restrict_unauthenticated setting
4 years ago
lain
d63dca8d99
Merge branch 'feature/1635-notifications-include-types' into 'develop'
include_types parameter in /api/v1/notifications
Closes #1635
See merge request pleroma/pleroma!2311
4 years ago
Alexander Strizhakov
98a60df41f
include_types parameter in /api/v1/notifications
4 years ago
lain
952cb589f4
Merge branch 'fix-testing' into 'develop'
Fix CI by temporarily removing federated testing
See merge request pleroma/pleroma!2314
4 years ago
stwf
a8c6933ca0
remove federated testing
4 years ago
Ivan Tashkinov
ec3719f539
Improved in-test config management functions.
4 years ago
rinpatch
69341cbcba
Merge branch 'feature/1530-removing-with_move' into 'develop'
Feature/1530 removing with move
Closes #1530
See merge request pleroma/pleroma!2306
4 years ago
Cevado
4705590f76
Fix ssl option on Ecto config breaking release
To use `:ssl` option on Ecto config it's required to include Erlang ssl
application, this prevents releases to start when `:ssl` option is set
to true.
4 years ago
eugenijm
13cce9c0de
Admin API: `PATCH /api/pleroma/admin/users/:nickname/credentials`, `GET /api/pleroma/admin/users/:nickname/credentials`.
4 years ago
Haelwenn
e4380afc18
Merge branch 'docs/mrf_object_age' into 'develop'
Improve documentation of mrf_object_age
See merge request pleroma/pleroma!2305
4 years ago
eugenijm
d198e7fa2a
Admin API: `PATCH /api/pleroma/admin/users/:nickname/change_password`
4 years ago
Alexander Strizhakov
f3791add99
removing with_move parameter
4 years ago
Mark Felder
8dd01b24d2
Improve documentation of mrf_object_age
4 years ago
rinpatch
b80958d4e3
Merge branch 'feat/templates' into 'develop'
gitlab: create templates for bug reports and release MRs
See merge request pleroma/pleroma!2304
4 years ago
rinpatch
7829de6da4
gitlab: create templates for bug reports and release MRs
4 years ago
rinpatch
ac5c2b66b9
Merge branch 'fix-warnings-in-tests' into 'develop'
Warnings fix
See merge request pleroma/pleroma!2303
4 years ago
Alexander Strizhakov
dc2ec84c0f
warnings fix
4 years ago
rinpatch
c2527b8c63
Merge branch 'removing-deprecated' into 'develop'
Removing from descriptions.exs deprecated settings
See merge request pleroma/pleroma!2302
4 years ago
Alexander Strizhakov
ba90a6d3e5
removing from descriptions.exs deprecated settings
4 years ago
Alexander Strizhakov
89e4b3ebbd
fix for content-type header for tag feed
4 years ago
Alexander Strizhakov
91870c8995
adding rss for user feed
4 years ago
Alexander Strizhakov
26e2076659
fix for feed page pagination
4 years ago
rinpatch
34fd1c2c9d
Merge branch 'bugfix/earmark_renderer_test' into 'develop'
test/earmark_renderer_test.exs: Rename from test/earmark_renderer_test.ex
See merge request pleroma/pleroma!2300
4 years ago
rinpatch
df2608ebf8
Merge branch 'features/staticfe-sanitization' into 'develop'
static_fe: Sanitize HTML
Closes #1614
See merge request pleroma/pleroma!2299
4 years ago
Haelwenn (lanodan) Monnier
8176ca9e40
static_fe: Sanitize HTML in users
4 years ago
Haelwenn (lanodan) Monnier
acb016397e
mix.lock: [minor] last hash appended
4 years ago
Haelwenn (lanodan) Monnier
0ac6e29654
static_fe: Sanitize HTML in posts
Note: Seems to have different sanitization with TwitterCard generator giving
the following:
<meta content=\"“alert('xss')”\" property=\"twitter:description\">
4 years ago