feld
|
ef7d2b0f11
|
Merge branch 'gun' into 'develop'
Gun adapter
Closes #945
See merge request pleroma/pleroma!1861
|
2020-04-01 17:05:09 +00:00 |
|
rinpatch
|
bfec45bf74
|
Merge branch 'fix/1601-add-new-meta-tag' into 'develop'
Restrict remote users from indexing
Closes #1601
See merge request pleroma/pleroma!2341
|
2020-04-01 12:55:52 +00:00 |
|
Alexander Strizhakov
|
94ddbe4098
|
restrict remote users from indexing
|
2020-04-01 09:57:12 +03:00 |
|
Haelwenn
|
c9f51edea1
|
Merge branch 'ops/fix-ci' into 'develop'
Ops/fix ci
See merge request pleroma/pleroma!2340
|
2020-04-01 03:44:47 +00:00 |
|
jp
|
bcaaba4660
|
remove testing only: in docker build
|
2020-03-31 22:16:36 -04:00 |
|
jp
|
c2715ed772
|
add imagemagick and update inherited container to alpine:3.11
|
2020-03-31 21:31:23 -04:00 |
|
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 |
|
Mark Felder
|
d3cd3b96bf
|
Remove problematic --cache-from argument
|
2020-03-31 17:28:41 -05:00 |
|
Haelwenn
|
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 |
|
Haelwenn (lanodan) Monnier
|
185520d1b4
|
Provide known-good user.uri, remove User.profile_url/1
|
2020-03-31 23:55:29 +02:00 |
|
Haelwenn (lanodan) Monnier
|
b30fb1f3bb
|
User: Fix use of source_data in profile_url/1
|
2020-03-31 23:54:20 +02:00 |
|
Haelwenn (lanodan) Monnier
|
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 |
|
Mark Felder
|
f6dc33615b
|
Add imagemagick to Docker image to fix broken mogrify plugin
|
2020-03-31 14:29:43 -05:00 |
|
lain
|
8bd5ad8664
|
Merge branch 'benchmark-improvements' into 'develop'
Benchmark improvements
See merge request pleroma/pleroma!2308
|
2020-03-30 14:48:00 +00:00 |
|
rinpatch
|
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 |
|
Alexander Strizhakov
|
b607ae1a1c
|
removing grouped reports admin api endpoint
|
2020-03-30 13:51:45 +03:00 |
|
Alexander Strizhakov
|
1fcdcb12a7
|
updating gun with bug fix
https://github.com/ninenines/gun/issues/222
|
2020-03-30 12:47:12 +03:00 |
|
Alexander Strizhakov
|
2afc7a9112
|
changelog fix
|
2020-03-30 12:16:45 +03:00 |
|
Alexander Strizhakov
|
f497cf2f7c
|
Merge branch 'develop' into gun
|
2020-03-30 12:15:23 +03:00 |
|
Alexander Strizhakov
|
96e2796557
|
use in timelines benchmark new user generator
|
2020-03-30 11:59:14 +03:00 |
|
Alexander Strizhakov
|
56503c385e
|
fix
|
2020-03-30 11:42:25 +03:00 |
|
Alexander Strizhakov
|
1f29ecdcd7
|
sync with develop
|
2020-03-30 11:42:25 +03:00 |
|
Alexander Strizhakov
|
eb9744cade
|
activities generation tasks
|
2020-03-30 11:42:25 +03:00 |
|
Haelwenn
|
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 |
|
lain
|
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 |
|
Ivan Tashkinov
|
dfbc05d496
|
Misc refactoring / tweaks (ThreadMute.exists?/2).
|
2020-03-27 08:01:03 +03:00 |
|
Ivan Tashkinov
|
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 |
|
Ivan Tashkinov
|
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 |
|
rinpatch
|
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 |
|
rinpatch
|
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 |
|
Ivan Tashkinov
|
ff1baae7e9
|
Merge remote-tracking branch 'remotes/origin/develop' into relations-preloading-for-statuses-rendering
|
2020-03-25 20:41:17 +03:00 |
|
Ivan Tashkinov
|
460e41585c
|
Further preloading (more endpoints), refactoring, tests.
|
2020-03-25 20:33:34 +03:00 |
|
lain
|
c8475cd5c6
|
Apply suggestion to benchmarks/load_testing/generator.ex
|
2020-03-25 15:48:15 +00:00 |
|
Haelwenn
|
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 |
|
Egor Kislitsyn
|
9081a071ee
|
Add a test for accounts/update_credentials
|
2020-03-25 18:46:17 +04:00 |
|
Ivan Tashkinov
|
be5e2c4dbb
|
Applied relationships preloading to GET /api/v1/accounts/relationships. Refactoring (User.binary_id/1).
|
2020-03-25 17:01:45 +03:00 |
|
Ivan Tashkinov
|
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 |
|
Ivan Tashkinov
|
012d428e1f
|
Merge remote-tracking branch 'remotes/origin/develop' into 1364-notifications-sending-control
|
2020-03-25 09:05:17 +03:00 |
|
Ivan Tashkinov
|
e743c22329
|
Fixed incorrect usage of "relations" as a short form of "relationships".
|
2020-03-25 09:04:00 +03:00 |
|
Ivan Tashkinov
|
8f1d622b8d
|
Merge remote-tracking branch 'remotes/origin/develop' into relations-preloading-for-statuses-rendering
|
2020-03-24 22:15:37 +03:00 |
|
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).
|
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 |
|
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
|
2020-03-24 17:34:13 +00:00 |
|
Egor Kislitsyn
|
d1a9716a98
|
Fix activity deletion
|
2020-03-24 17:38:18 +04:00 |
|
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
|
2020-03-23 19:32:01 +00:00 |
|
lain
|
3bd2829e5c
|
Benchmarks: Add timeline benchmark
|
2020-03-23 18:56:01 +01:00 |
|
lain
|
eec1fcaf55
|
Home timeline tests: Add failing test for relationships
|
2020-03-23 15:58:55 +01:00 |
|
Ivan Tashkinov
|
86f2fbc81e
|
Merge remote-tracking branch 'remotes/origin/develop' into relations-preloading-for-statuses-rendering
|
2020-03-23 14:34:58 +03:00 |
|
rinpatch
|
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 |
|