Commit graph

139 commits

Author SHA1 Message Date
Sergey Suprunenko 2c303afc8b Remove duplicated entries in users' following lists 2019-05-16 20:04:08 +00:00
lambda fde30aee43 Merge branch 'feature/sql-thread-sat' into 'develop'
SQL thread visibility solver

See merge request pleroma/pleroma!971
2019-05-16 13:44:22 +00:00
Alexander Strizhakov 73ae58fdfa Feature/896 toggling confirmation 2019-05-16 13:23:41 +00:00
William Pitcock f09c3afdf5 chase test failures 2019-05-15 16:23:01 +00:00
Egor Kislitsyn 5e2b491276 Merge remote-tracking branch 'pleroma/develop' into feature/disable-account 2019-05-14 18:15:56 +07:00
Alexander Strizhakov a2be420f94 differences_in_mastoapi_responses.md: fullname & bio are optionnal
[ci skip]
2019-05-13 18:35:45 +00:00
Egor Kislitsyn 1557b99beb Merge remote-tracking branch 'pleroma/develop' into feature/disable-account 2019-05-07 16:51:11 +07:00
Alexander Strizhakov ce6ca0fefe Merge branch 'develop' of https://git.pleroma.social/pleroma/pleroma into feature/845-improve-status-deletion 2019-05-06 16:45:22 +00:00
Haelwenn (lanodan) Monnier d70af32127
Pleroma.User: remove emojify on parse_bio 2019-05-03 16:27:50 +02:00
Alex S f11e7037c2 test fixes 2019-05-01 16:09:53 +07:00
Egor Kislitsyn c157e27a00 Merge branch 'develop' into feature/disable-account 2019-04-25 13:41:10 +07:00
Alex S 73d01857e3 bookmarks in separate table 2019-04-25 13:38:24 +07:00
Egor b9cdf6d3b9 Use User.get_cached* everywhere 2019-04-22 07:20:43 +00:00
Egor Kislitsyn e8c2f9a73a Merge remote-tracking branch 'pleroma/develop' into feature/disable-account 2019-04-22 13:08:30 +07:00
rinpatch 6069d0fd36 Fix object search depending on embeded object 2019-04-18 09:28:20 +03:00
rinpatch ff8d76c670 Refactor all tests that acessed the embeded object 2019-04-17 15:46:59 +03:00
Egor Kislitsyn dd097a406b add tests 2019-04-12 16:38:32 +07:00
Sadposter be8350baa2
Merge branch 'develop' into feature/user-status-subscriptions 2019-04-10 10:44:54 +01:00
Sachin Joshi 07afb9b537 update the follower count when a follower is blocked 2019-04-09 09:15:45 +05:45
Sadposter 13ff312c48
Sever subscription in case of block 2019-04-08 12:46:12 +01:00
lambda ce9284b36f Merge branch 'remove-user-activities' into 'develop'
[#757] Add mix task to delete user's activities

See merge request pleroma/pleroma!1008
2019-04-02 12:45:29 +00:00
lambda 26d509cc86 Merge branch 'get_by_id' into 'develop'
Replace `Repo.get(Module, id)` with `Module.get_by_id(id)` where possible

See merge request pleroma/pleroma!1009
2019-04-02 10:52:29 +00:00
cascode 95c92c49c9 Fix account lookup for nicknames beginning with numbers 2019-04-02 10:51:33 +00:00
Egor Kislitsyn 11c2d6bdc4 change Repo.get(Activity, id) => Activity.get_by_id(id) in tests 2019-04-02 17:08:03 +07:00
Egor Kislitsyn 1b3d921921 change Repo.get(User, id) => User.get_by_id(id) 2019-04-02 17:01:26 +07:00
Egor Kislitsyn a14742f495 add user delete_activities mix task 2019-04-02 16:30:11 +07:00
Maxim Filippov 3cf7539bca Add more user filters + move search to its own module 2019-03-27 03:51:59 +05:00
rinpatch 3229c7a1d6 Ensure fts is prefered over trigram and use union_all instead of union in user search query 2019-03-22 08:39:49 +03:00
Maxim Filippov ed8a2935f5 Use ILIKE to search users 2019-03-20 01:37:40 +03:00
Haelwenn (lanodan) Monnier a3a9cec483
[Credo] fix Credo.Check.Readability.AliasOrder 2019-03-13 04:26:54 +01:00
kaniini ace4231628 Merge branch 'features/bio_rel_me' into 'develop'
Add rel=me to the User bio

Closes #423

See merge request pleroma/pleroma!813
2019-03-03 16:00:49 +00:00
kaniini 6c6a2dbfdd Merge branch 'feature/add-pagination-to-users-admin-api' into 'develop'
Add pagination and search to users

See merge request pleroma/pleroma!873
2019-03-03 15:59:15 +00:00
eugenijm 1a1f4520cd Use sql query in User.get_follow_requests/1 for filtering logic 2019-03-02 22:18:56 +03:00
Maxim Filippov bf30df99cb We do not guarantee the order of elements when we search 2019-03-02 17:32:40 +03:00
Haelwenn (lanodan) Monnier 7b9868f343
Pleroma.UserTest: Add tests for rel=me 2019-03-02 06:59:09 +01:00
Maxim Filippov a25c1313ae Format 2019-03-01 21:07:05 +03:00
Maxim Filippov aaa9fed1ca Fix user_test 2019-03-01 20:58:47 +03:00
lain 8d8cb08f94 Add follow request test. 2019-02-27 14:51:07 +01:00
lain 4196d9af11 Add test for User.mutes and so on. 2019-02-20 14:14:52 +01:00
lain f469a8610f Check that the welcome message is sent from the correct user. 2019-02-16 17:24:31 +01:00
lain d812a347ca Add optional welcome message. 2019-02-16 16:42:34 +01:00
William Pitcock 32b1649434 test: user: add a test for whether user search returns a user or not 2019-02-14 20:05:08 +00:00
kaniini 19756d68f2 Merge branch 'fix/credo-issues-test' into 'develop'
Fix credo issues in ./test

See merge request pleroma/pleroma!808
2019-02-14 03:55:26 +00:00
lain 88a4de24f9 User.follow_all: Respect blocks in both directions. 2019-02-13 13:52:27 +01:00
Haelwenn (lanodan) Monnier 8bb7e19b38
test: de-group alias/es 2019-02-11 03:44:15 +01:00
lain bbd0049fae Respect blocks in mass follow. 2019-02-09 13:24:23 +01:00
href 308b35ebe2
User.follow_all: ensure its stays unique 2019-01-31 18:17:44 +01:00
Haelwenn 00d4333373 Merge branch 'features/glitch-soc-frontend' into 'develop'
Features/glitch soc frontend

See merge request pleroma/pleroma!192
2019-01-31 10:16:11 +00:00
lain 47ec690c54 Use race-condition free mass follow. 2019-01-30 19:33:25 +01:00
Haelwenn (lanodan) Monnier cda1470e02
[MastoAPI][GlitchAPI] Add bookmarks 2019-01-28 04:47:32 +01:00