squeegily/pleroma
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity
8,814 Commits 154 Branches 42 Tags 503 MiB
eb9744cade
Commit Graph

8814 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Egor Kislitsyn
5a34dca8ed
Add emoji support in statuses in staticfe 2020-03-23 14:03:31 +04:00
Ivan Tashkinov
3c78e5f327 Preloading of follow relations for timeline/statuses rendering (performance improvement). Refactoring. 2020-03-23 12:01:11 +03:00
Ivan Tashkinov
c2e415143b WIP: preloading of user relations for timeline/statuses rendering (performance improvement). 2020-03-22 21:51:44 +03:00
Haelwenn (lanodan) Monnier
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
rinpatch
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
Haelwenn
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
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.
 2020-03-22 17:10:37 +03:00
lain
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
lain
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
Ivan Tashkinov
1c05f539aa Improved in-test clear_config/n applicability (setup / setup_all / in-test usage). 2020-03-20 18:33:00 +03:00
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
 2020-03-20 18:08:23 +03:00
lain
5efa5b0c4a Merge branch 'feature/1206-restrict-unauthenticated' into 'develop' 
restrict_unauthenticated setting

Closes #1206

See merge request pleroma/pleroma!2318
 2020-03-20 14:40:08 +00:00
Alexander Strizhakov
fe15f0ba15
restrict_unauthenticated setting 2020-03-20 16:36:20 +03:00
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
 2020-03-20 13:27:29 +00:00
Alexander Strizhakov
98a60df41f
include_types parameter in /api/v1/notifications 2020-03-20 13:18:12 +03:00
lain
952cb589f4 Merge branch 'fix-testing' into 'develop' 
Fix CI by temporarily removing federated testing

See merge request pleroma/pleroma!2314
 2020-03-19 18:10:39 +00:00
stwf
a8c6933ca0 remove federated testing 2020-03-19 12:27:09 -04:00
Ivan Tashkinov
ec3719f539 Improved in-test config management functions. 2020-03-18 20:30:31 +03:00
rinpatch
69341cbcba Merge branch 'feature/1530-removing-with_move' into 'develop' 
Feature/1530 removing with move

Closes #1530

See merge request pleroma/pleroma!2306
 2020-03-18 10:12:50 +00:00
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.
 2020-03-16 22:02:01 -03:00
Ivan Tashkinov
7438833685 [#1364] Improved notification-related tests. 2020-03-16 21:58:10 +03:00
eugenijm
13cce9c0de Admin API: PATCH /api/pleroma/admin/users/:nickname/credentials, GET /api/pleroma/admin/users/:nickname/credentials. 2020-03-16 20:42:37 +03:00
Haelwenn
e4380afc18 Merge branch 'docs/mrf_object_age' into 'develop' 
Improve documentation of mrf_object_age

See merge request pleroma/pleroma!2305
 2020-03-16 17:42:10 +00:00