bss
/
pleroma
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
7,811 Commits 170 Branches 45 Tags 246 MiB
Commit Graph

7811 Commits

Author SHA1 Message Date
Ivan Tashkinov cad9b325e5 Merge remote-tracking branch 'remotes/upstream/develop' into 1335-user-api-id-fields-relations 
# Conflicts:
#	lib/pleroma/user/search.ex
#	test/user_test.exs
 2019-11-21 16:47:52 +03:00
lain 8feb5dcb42 Merge branch 'issue/1348' into 'develop' 
[#1348] excluded invisible actors from gets  /api/v1/accounts/:id

See merge request pleroma/pleroma!1937
 2019-11-21 13:13:14 +00:00
lain 320690f7a5 Object: Use inspect to log missing preload. 2019-11-21 14:03:01 +01:00
lain 1680a3479e Merge branch 'fix/user-following-count' into 'develop' 
Fix user.following_count

See merge request pleroma/pleroma!2000
 2019-11-21 12:26:05 +00:00
lain cd8da73bbe Merge branch 'remove-useless-warning' into 'develop' 
Remove version mismatch warning

See merge request pleroma/pleroma!2001
 2019-11-21 12:22:46 +00:00
Egor Kislitsyn 8ffd1c792c
Remove version mismatch warning 2019-11-21 18:22:18 +07:00
Egor Kislitsyn d38ab4bb89
Fix user.following_count 2019-11-21 16:31:13 +07:00
Mark Felder edaae845af Some tasks try to set log level in test environment, but we were stripping logs belog :warn. 
Ensure console backend logs in test environment are :warn, but mix tasks run in test env
do not run with :debug because it's far too verbose.
 2019-11-20 11:55:30 -06:00
Mark Felder c65190c799 Console backend's log format should be prefixed and suffixed with newlines. 
This is how upstream does it by default.
 2019-11-20 11:18:42 -06:00
Mark Felder 140a54fd4e Merge branch 'develop' into fix/mix-task-logging 2019-11-20 09:16:46 -06:00
Mark Felder 1c17f18329 Be specific about format for logs in test as we have tests that check it 2019-11-20 09:14:27 -06:00
Ivan Tashkinov 81f1c6bc47 [#1335] Added CHANGELOG.md entry. 2019-11-20 15:57:51 +03:00
Ivan Tashkinov 4f88b1b435 Merge remote-tracking branch 'remotes/upstream/develop' into 1335-user-api-id-fields-relations 2019-11-20 15:47:11 +03:00
lain 937d6c6b32 Merge branch 'fix/sporadic-tests' into 'develop' 
Fix sporadically failing test

Closes #1432

See merge request pleroma/pleroma!1999
 2019-11-20 12:46:33 +00:00
Ivan Tashkinov de892d2fe1 [#1335] Reorganized users.subscribers as UserRelationship. Added tests for UserRelationship-related functionality. 2019-11-20 15:46:11 +03:00
lain 75efdb0781 Merge branch 'fix-docker-build' into 'develop' 
Fix failing docker build

See merge request pleroma/pleroma!1998
 2019-11-20 10:32:58 +00:00
Ivan Tashkinov 555edd01ab [#1335] User AP ID relations fetching performance optimizations. 2019-11-20 12:19:07 +03:00
Egor Kislitsyn 63711258ce
Fix sporadically failing test 2019-11-20 14:25:00 +07:00
Mark Felder cb513a599c Allow test builds to have info and debug logs stripped 2019-11-19 16:21:30 -06:00
Mark Felder ff9133b978 Allow mix tasks to always run with debug logging 2019-11-19 16:01:17 -06:00
rinpatch 27f73d38c0 Merge branch 'chore/bump-fe' into 'develop' 
Bump fe and sync changelogs

See merge request pleroma/pleroma!1996
 2019-11-19 21:03:42 +00:00
rinpatch dc8830da27 changelog: add 1.1.6 entries from stable 2019-11-20 00:01:58 +03:00
rinpatch 0fe08346db bundles: bump pleroma-fe to 0eda60eeb49f4fa460fe6f9f6196ddbb014427c7 2019-11-19 23:28:34 +03:00
Ivan Tashkinov 565f261338 Merge remote-tracking branch 'remotes/upstream/develop' into 1335-user-api-id-fields-relations 2019-11-19 23:22:47 +03:00
Ivan Tashkinov ba5cc30165 [#1335] Implemented notification mutes and reblog mutes as UserRelationships. User to UserRelationship relations and functions refactoring. 2019-11-19 23:22:10 +03:00
Maksim Pechnikov 1fcd579b6d benchmarks/ added favourites timeline 2019-11-19 21:11:15 +03:00
Maksim Pechnikov 708fd234bd fix order favorites activites 2019-11-19 20:19:41 +03:00
kPherox b7bbb5445d
remove docs/ from .dockerignore 2019-11-20 00:09:07 +09:00
Maxim Filippov b88dbc17c8 Fix tests 2019-11-19 22:50:24 +09:00
lain bf89e0bf38 Merge branch 'feature/admin-api/support-token-header' into 'develop' 
Admin API: Support authentication via `x-admin-token` HTTP header

Closes #1430

See merge request pleroma/pleroma!1993
 2019-11-19 13:16:49 +00:00
Maxim Filippov 46eb160135 AdminAPI: Confirm user account, resend confirmation email 2019-11-19 20:14:02 +09:00
Egor Kislitsyn 36686f5245
Support authentication via `x-admin-token` HTTP header 2019-11-19 15:58:20 +07:00
Maksim Pechnikov 7d727dbfec added test 2019-11-18 22:32:43 +03:00
Maksim Pechnikov 5cee51fac5 fix `order by` for fetch_favorites 2019-11-18 21:34:54 +03:00
Ivan Tashkinov 3aaf3aa2c2 Merge remote-tracking branch 'remotes/upstream/develop' into 1335-user-api-id-fields-relations 2019-11-18 20:43:19 +03:00
Ivan Tashkinov aad6576130 [#1335] Refactored UserMute and UserBlock into UserRelationship, introduced EctoEnum. 2019-11-18 20:38:56 +03:00
feld 06151776c0 Merge branch 'docs/remove_activation_status_endpoint' into 'develop' 
Remove deprecated endpoint from docs that is fully removed from backend now

See merge request pleroma/pleroma!1992
 2019-11-18 16:16:27 +00:00
feld adacf1b5e1 Remove deprecated endpoint from docs that is fully removed from backend now 2019-11-18 16:16:27 +00:00
Maksim Pechnikov 0937895182 updated fetch_favorites 2019-11-18 16:56:47 +03:00
Maksim Pechnikov 9da4c88b49 fix test 2019-11-18 10:00:48 +03:00
Maksim Pechnikov 4beb3ce5c5 /api/v1/favourites: added sorting for activites by adds to favorites 2019-11-18 09:44:08 +03:00
rinpatch 4df2d64b9f Merge branch 'chore/bump-fast-sanitize' into 'develop' 
Bump fast_sanitize

See merge request pleroma/pleroma!1988
 2019-11-16 17:49:49 +00:00
rinpatch fad296e432 Bump fast_sanitize 2019-11-16 19:19:25 +03:00
Maxim Filippov c506cc48ef Admin API: Error when trying to update reports in the "old" format 2019-11-16 18:44:48 +09:00
rinpatch a869c718ab Merge branch 'chore/changelog-sync-' into 'develop' 
Sync the changelogs between develop and stable

See merge request pleroma/pleroma!1985
 2019-11-15 22:03:28 +00:00
rinpatch da28bf8fdd Sync the changelogs between develop and stable 2019-11-16 01:02:08 +03:00
kaniini 81cba405af Merge branch 'nodeinfo-fields-limit' into 'develop' 
Add fieldsLimit to metadata of nodeinfo

See merge request pleroma/pleroma!1983
 2019-11-15 20:29:38 +00:00
rinpatch 9e3868425a Merge branch 'mix-task-warning' into 'develop' 
Documentation: Add warning about database mix tasks.

See merge request pleroma/pleroma!1984
 2019-11-15 19:38:52 +00:00
Ivan Tashkinov 01d9c093c3 Merge remote-tracking branch 'remotes/upstream/develop' into 1335-user-api-id-fields-relations 2019-11-15 21:40:14 +03:00
Ivan Tashkinov c31ddce51e [#1335] Reorganized `users.mutes` as relation to UserMute entity. 2019-11-15 21:38:54 +03:00