feld
ec5d6eef6a
Merge branch 'fix/docker-mogrify' into 'develop'
...
Remove problematic --cache-from argument
See merge request pleroma/pleroma!2338
2020-03-31 22:32:48 +00:00
d3cd3b96bf
Remove problematic --cache-from argument
2020-03-31 17:28:41 -05:00
7d3b25f0e1
Merge branch 'bugfix/funkwhale-channel' into 'develop'
...
Fix profile url for funkwhale channels, removes one source_data use
Closes #1653
See merge request pleroma/pleroma!2333
2020-03-31 22:04:02 +00:00
185520d1b4
Provide known-good user.uri, remove User.profile_url/1
2020-03-31 23:55:29 +02:00
b30fb1f3bb
User: Fix use of source_data in profile_url/1
2020-03-31 23:54:20 +02:00
2553400a66
Initial failing test statement against funkwhale channels
2020-03-31 23:54:20 +02:00
feld
fa38089f16
Merge branch 'fix/docker-mogrify' into 'develop'
...
Fix/docker mogrify
Closes #1644
See merge request pleroma/pleroma!2337
2020-03-31 19:36:04 +00:00
f6dc33615b
Add imagemagick to Docker image to fix broken mogrify plugin
2020-03-31 14:29:43 -05:00
8bd5ad8664
Merge branch 'benchmark-improvements' into 'develop'
...
Benchmark improvements
See merge request pleroma/pleroma!2308
2020-03-30 14:48:00 +00:00
dabe3aeb9e
Merge branch 'removing-grouped-reports' into 'develop'
...
Removing grouped reports endpoint
See merge request pleroma/pleroma!2335
2020-03-30 12:38:21 +00:00
b607ae1a1c
removing grouped reports admin api endpoint
2020-03-30 13:51:45 +03:00
96e2796557
use in timelines benchmark new user generator
2020-03-30 11:59:14 +03:00
56503c385e
fix
2020-03-30 11:42:25 +03:00
1f29ecdcd7
sync with develop
2020-03-30 11:42:25 +03:00
eb9744cade
activities generation tasks
2020-03-30 11:42:25 +03:00
e999c67cee
Merge branch 'feature/funkwhale-audio' into 'develop'
...
Add support for funkwhale Audio activity
Closes #764 and #1624
See merge request pleroma/pleroma!2287
2020-03-29 19:18:22 +00:00
4e81b4b190
Merge branch 'relations-preloading-for-statuses-rendering' into 'develop'
...
Performance improvements (timeline / statuses / notifications / accounts rendering)
See merge request pleroma/pleroma!2323
2020-03-27 19:14:46 +00:00
dfbc05d496
Misc refactoring / tweaks (`ThreadMute.exists?/2`).
2020-03-27 08:01:03 +03:00
6b793d3f83
Ensured no auxiliary computations (actors list preparation etc.) related to relationships preloading if no user is present (for statuses / accounts / relationships rendering).
2020-03-26 21:54:01 +03:00
112101ca52
Merge remote-tracking branch 'remotes/origin/develop' into relations-preloading-for-statuses-rendering
...
# Conflicts:
# lib/pleroma/thread_mute.ex
2020-03-26 09:43:58 +03:00
af820f8cf1
Merge branch 'benchmark_timeline' into 'develop'
...
Benchmarks: Add timeline benchmark
See merge request pleroma/pleroma!2325
2020-03-25 18:06:00 +00:00
de62e633d3
Merge branch '1364-notifications-sending-control' into 'develop'
...
[#1364 ] Ability to opt-out of notifications (in all clients)
Closes #1364
See merge request pleroma/pleroma!2301
2020-03-25 18:00:24 +00:00
ff1baae7e9
Merge remote-tracking branch 'remotes/origin/develop' into relations-preloading-for-statuses-rendering
2020-03-25 20:41:17 +03:00
460e41585c
Further preloading (more endpoints), refactoring, tests.
2020-03-25 20:33:34 +03:00
c8475cd5c6
Apply suggestion to benchmarks/load_testing/generator.ex
2020-03-25 15:48:15 +00:00
d96139f789
Merge branch 'add-test-update_credentials' into 'develop'
...
Add a test for accounts/update_credentials
See merge request pleroma/pleroma!2330
2020-03-25 14:57:19 +00:00
9081a071ee
Add a test for accounts/update_credentials
2020-03-25 18:46:17 +04:00
be5e2c4dbb
Applied relationships preloading to GET /api/v1/accounts/relationships. Refactoring (User.binary_id/1).
2020-03-25 17:01:45 +03:00
3fa3d45dbe
[ #1364 ] Minor improvements / comments.
...
Further fixes of incorrect usage of "relations" as a short form of "relationships".
2020-03-25 13:05:00 +03:00
012d428e1f
Merge remote-tracking branch 'remotes/origin/develop' into 1364-notifications-sending-control
2020-03-25 09:05:17 +03:00
e743c22329
Fixed incorrect usage of "relations" as a short form of "relationships".
2020-03-25 09:04:00 +03:00
8f1d622b8d
Merge remote-tracking branch 'remotes/origin/develop' into relations-preloading-for-statuses-rendering
2020-03-24 22:15:37 +03:00
13cbb9f6ad
Implemented preloading of relationships with parent activities' actors for statuses/timeline rendering. Applied preloading for notifications rendering. Fixed announces rendering issue (preloading-related).
2020-03-24 22:14:26 +03:00
feld
8eebc75c15
Merge branch 'fix/activity-deletion' into 'develop'
...
Fix activity deletion
Closes #1640
See merge request pleroma/pleroma!2328
2020-03-24 19:10:32 +00:00
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
2020-03-24 17:34:13 +00:00
d1a9716a98
Fix activity deletion
2020-03-24 17:38:18 +04:00
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
2020-03-23 19:32:01 +00:00
3bd2829e5c
Benchmarks: Add timeline benchmark
2020-03-23 18:56:01 +01:00
eec1fcaf55
Home timeline tests: Add failing test for relationships
2020-03-23 15:58:55 +01:00
86f2fbc81e
Merge remote-tracking branch 'remotes/origin/develop' into relations-preloading-for-statuses-rendering
2020-03-23 14:34:58 +03:00
d931a59072
Merge branch 'support-emoji-staticfe' into 'develop'
...
Add emoji support in statuses in staticfe
Closes #1453
See merge request pleroma/pleroma!2324
2020-03-23 10:43:20 +00:00
5a34dca8ed
Add emoji support in statuses in staticfe
2020-03-23 14:03:31 +04:00
3c78e5f327
Preloading of follow relations for timeline/statuses rendering (performance improvement). Refactoring.
2020-03-23 12:01:11 +03:00
c2e415143b
WIP: preloading of user relations for timeline/statuses rendering (performance improvement).
2020-03-22 21:51:44 +03:00
15be6ba9c2
AccountView: fix for other forms of <br> in bio
...
Closes: https://git.pleroma.social/pleroma/pleroma/issues/1643
2020-03-22 16:41:01 +01:00
7dbf1ffa86
Merge branch 'fix/ecto_ssl_option' into 'develop'
...
Fix ssl option on Ecto config breaking release
See merge request pleroma/pleroma!2307
2020-03-22 14:32:40 +00:00
4633793bc1
Merge branch 'relationship-remove-outdated-hack' into 'develop'
...
Mastodon API Account view: Remove an outdated hack
See merge request pleroma/pleroma!2321
2020-03-22 14:25:11 +00:00
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.
2020-03-22 17:10:37 +03:00
d74405fc1a
Merge branch 'fix-feed-pagination' into 'develop'
...
Fix for feed page pagination
Closes #1605
See merge request pleroma/pleroma!2281
2020-03-20 16:57:51 +00:00
d23e81903d
Merge branch 'clear-config-test-improvements' into 'develop'
...
Improved in-test config management
See merge request pleroma/pleroma!2312
2020-03-20 16:54:55 +00:00
feld
Mark Felder