rinpatch
|
78b6549611
|
CHANGELOG.md: Add 2.0.2 entry
|
2020-03-31 13:59:26 +03:00 |
|
Haelwenn
|
540dd38a5e
|
Merge branch 'docs/mrf_object_age' into 'develop'
Improve documentation of mrf_object_age
See merge request pleroma/pleroma!2305
|
2020-03-31 13:42:42 +03:00 |
|
rinpatch
|
0c010c292e
|
Merge branch 'fix/ecto_ssl_option' into 'develop'
Fix ssl option on Ecto config breaking release
See merge request pleroma/pleroma!2307
|
2020-03-31 13:42:19 +03:00 |
|
rinpatch
|
e99e2a86af
|
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-31 13:42:02 +03:00 |
|
lain
|
c4d3ccc7b9
|
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-31 13:41:47 +03:00 |
|
feld
|
10b7b2b4a4
|
Merge branch 'fix/activity-deletion' into 'develop'
Fix activity deletion
Closes #1640
See merge request pleroma/pleroma!2328
|
2020-03-31 13:40:28 +03:00 |
|
rinpatch
|
0e92aa0025
|
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-31 13:39:58 +03:00 |
|
Ivan Tashkinov
|
ea9c57b26e
|
[#2332] Misc. improvements per code change requests.
|
2020-03-31 09:21:42 +03:00 |
|
Ivan Tashkinov
|
9c94b6a327
|
[#2332] Misc. fixes per code change requests.
|
2020-03-30 19:08:37 +03: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 |
|
Maksim Pechnikov
|
dfd2c74184
|
Merge branch 'develop' into issue/1276
|
2020-03-29 06:57:34 +03:00 |
|
Ivan Tashkinov
|
be9d18461a
|
FollowingRelationship storage & performance optimizations (state turned ecto_enum-driven integer, reorganized indices etc.).
|
2020-03-28 18:49:03 +03: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 |
|
lain
|
29ab1d9f8d
|
Merge branch 'remake-remodel-2' of git.pleroma.social:pleroma/pleroma into remake-remodel-2
|
2020-03-26 17:24:10 +01:00 |
|
lain
|
69fc1dd69f
|
Apply suggestion to lib/pleroma/web/activity_pub/pipeline.ex
|
2020-03-26 14:45:28 +00:00 |
|
lain
|
0c60c0a76a
|
Validators: Use correct type for IDs.
|
2020-03-26 15:44:14 +01:00 |
|
lain
|
0adaab8e75
|
Bump copyright dates.
|
2020-03-26 15:37:42 +01:00 |
|
lain
|
eaacc64839
|
Refactors.
|
2020-03-26 15:33:10 +01:00 |
|
lain
|
ee979dd6d7
|
Merge branch 'remake-remodel-2' of git.pleroma.social:pleroma/pleroma into remake-remodel-2
|
2020-03-26 15:24:06 +01:00 |
|
lain
|
d7aa0b645b
|
Apply suggestion to lib/pleroma/web/activity_pub/object_validator.ex
|
2020-03-26 14:23:19 +00:00 |
|
lain
|
4cf1007a7d
|
ActivityPub: Small refactor.
|
2020-03-26 15:16:54 +01:00 |
|
Egor Kislitsyn
|
94a6590e3c
|
Partially restore /api/statusnet/config.json
|
2020-03-26 17:59:45 +04:00 |
|
Egor Kislitsyn
|
1c3f3a12ed
|
Add characterLimit and vapidPublicKey to nodeinfo
|
2020-03-26 16:20:20 +04: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 |
|
Haelwenn (lanodan) Monnier
|
03a18cf037
|
node_info_test: Bump default features list
|
2020-03-24 20:39:19 +01:00 |
|
Haelwenn (lanodan) Monnier
|
212c31c637
|
Merge remote-tracking branch 'pleroma/develop' into featureflag/emoji_reactions
|
2020-03-24 20:32:49 +01:00 |
|
Haelwenn (lanodan) Monnier
|
64165d1df9
|
node_info_test.exs: Add test on the default feature list
|
2020-03-24 20:21:27 +01:00 |
|