alyssa
/
pleroma
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
3,585 Commits 1 Branch 0 Tags 177 MiB
Commit Graph

3585 Commits

Author SHA1 Message Date
rinpatch a45a903480 Fix OGP provider tests 2019-01-25 10:51:06 +03:00
rinpatch 3a5b3c5a3a Merge remote-tracking branch 'pl/develop' into oembed_provider 2019-01-25 10:40:51 +03:00
kaniini 4c99b6d35a Merge branch 'fix/tusky-dm' into 'develop' 
Add actor to recipients list

Closes #390

See merge request pleroma/pleroma!683
 2019-01-25 05:19:32 +00:00
kaniini c9b418e547 Merge branch 'develop' into 'oembed_provider' 
# Conflicts:
#   lib/pleroma/activity.ex
 2019-01-25 05:00:47 +00:00
kaniini 4df71cd88b Merge branch 'classic-flakeids' into 'develop' 
Flake Ids for Users and Activities

Closes #450

See merge request pleroma/pleroma!645
 2019-01-25 04:59:06 +00:00
kaniini 9bf1a4234d Merge branch 'update/pleroma-fe-20190125' into 'develop' 
update pleroma frontend

See merge request pleroma/pleroma!709
 2019-01-25 04:57:05 +00:00
William Pitcock 4b76f14da1 update pleroma frontend 2019-01-25 04:49:35 +00:00
Maxim Filippov 9274cabe01 Use correct logic to determine "attentions" list 2019-01-24 23:30:43 +03:00
href a3ba72d978
Fix clippy with one/five lines 2019-01-24 16:53:14 +01:00
kaniini 2ebabaeb9c Merge branch 'fix-activity_visibility-autovacuum' into 'develop' 
Fix postgres activity_visibility when running in autovacuum

See merge request pleroma/pleroma!708
 2019-01-24 13:22:34 +00:00
href e02b19d1d7
Fix postgres activity_visibility when running in autovacuum 2019-01-24 14:13:20 +01:00
href be43aa2875
FlakeId: ignore null mac for workerid, use first mac 2019-01-24 13:08:27 +01:00
href 0f80bc2dca Merge branch 'feature/mrf-anti-followbot' into 'develop' 
mrf: add anti-followbot policy

See merge request pleroma/pleroma!706
 2019-01-24 10:20:22 +00:00
William Pitcock 13d72826df test: add anti-followbot policy tests 2019-01-24 09:50:40 +00:00
William Pitcock 54ec6d09b0 mrf: add anti-followbot policy 2019-01-24 09:35:19 +00:00
kaniini 4983e6e9d2 Merge branch 'fix/hide-network-setting' into 'develop' 
Send "hide_network" in user_view

See merge request pleroma/pleroma!704
 2019-01-23 23:47:36 +00:00
Maxim Filippov 4333fea1dc Send "hide_network" in user_view 2019-01-23 19:47:51 +03:00
kaniini 4a278cd80a Merge branch 's3-namespace' into 'develop' 
S3 uploader: support for namespaced bucket

Closes #532

See merge request pleroma/pleroma!699
 2019-01-23 13:25:04 +00:00
href abb349bde0 Merge branch 'fix-info-id' into 'develop' 
Fix info ids.

Closes #511

See merge request pleroma/pleroma!702
 2019-01-23 13:20:34 +00:00
lain ab03f81219 Fix info ids. 
The previous migration actually created values for the key "id", including the
quotes. This one should fill out all missing ids.

Closes #511
 2019-01-23 14:01:44 +01:00
lambda 5067b791a1 Merge branch 'rename/pleroma_activity_consistency' into 'develop' 
Consistent fonction names in Pleroma.Activity

See merge request pleroma/pleroma!690
 2019-01-23 12:14:41 +00:00
lain 2de208817c Merge branch 'develop' into rename/pleroma_activity_consistency 2019-01-23 13:05:58 +01:00
lain e221c681dc New frontend configuration mechanism. 2019-01-23 12:40:57 +01:00
href 9ba6e1fabe
FlakeId: chain alter statements 2019-01-23 12:09:21 +01:00
href e67bd93d90
Flake: migrate pinned_activities in jsonb 2019-01-23 11:26:39 +01:00
href a92c43bc4b
Clippy! 2019-01-23 11:26:38 +01:00
href 465fb4327d
Lock activities/users table during flake migration. 2019-01-23 11:26:37 +01:00
href 973c9eed18
Treat User.Info pinned ids as strings 2019-01-23 11:26:37 +01:00
href e36a434b99
FlakeId.from_string/1: remove old, un-needed conversion 2019-01-23 11:26:36 +01:00
href 422e60ad76
2019 2019-01-23 11:26:35 +01:00
href cdc5e6ff5c
ActivityPub: restrict_since/restrict_max: ignore empty param 2019-01-23 11:26:35 +01:00
href 9d63b27dcd
Test FlakeID old id compat & Ecto type 2019-01-23 11:26:34 +01:00
href 28d77e373c
Flake Ids for Users and Activities 2019-01-23 11:26:27 +01:00
href b624b7a150 Merge branch 'mr/20190122-activity-visibility-update' into 'develop' 
slightly changes definition so that autovacuum works parallel safe too

Closes #540

See merge request pleroma/pleroma!697
 2019-01-22 16:10:38 +00:00
Michael Loftis 98cbeae49c slightly changes definition so that autovacuum works paralell safe too 2019-01-22 15:35:21 +00:00
Haelwenn 707cd9389c Merge branch 'fix/activity_get_by_id' into 'develop' 
Add get_by_id to activity.ex

See merge request pleroma/pleroma!695
 2019-01-22 14:28:17 +00:00
lambda 7d55bb0896 Merge branch '502_stats_fix_for_nil_info_deactivated' into 'develop' 
[#502] Stats fix (users with nil or missing `info.deactivated` should be treated active)

Closes #502

See merge request pleroma/pleroma!696
 2019-01-22 14:18:36 +00:00
Ivan Tashkinov 34d59e4008 [#502] Fixed User.active_local_user_query to return users with nil or missing `info.deactivated`. Adjusted test. 2019-01-22 17:12:53 +03:00
kaniini d17a4b1891 Merge branch 'uploader-controller' into 'develop' 
Uploader callback controller

See merge request pleroma/pleroma!694
 2019-01-22 09:03:03 +00:00
rinpatch e460820fcf Add get_by_id to activity.ex 2019-01-22 10:55:10 +03:00
href f9a3269099
Uploader callback controller 2019-01-21 22:44:14 +01:00
rinpatch afb8d9ec13 Merge branch 'fix-buggy-test' into 'develop' 
Fix buggy test.

See merge request pleroma/pleroma!693
 2019-01-21 20:02:58 +00:00
lain 762fafe738 Fix buggy test. 2019-01-21 17:54:11 +01:00
lambda 3f9c778320 Merge branch 'proxy-no-default-plug-cache' into 'develop' 
Always override plug's default cache-control in reverse proxy

See merge request pleroma/pleroma!692
 2019-01-21 16:19:15 +00:00
href 99763999c1
reverse_proxy - always override plug's cache-control 2019-01-21 15:17:24 +01:00
href 97412d9f94
S3 Namespace 2019-01-21 14:42:16 +01:00
lambda 8cd853ce0c Merge branch '530_federator_user_info_overwrite_fix' into 'develop' 
[#530] Prevents user `info` from being overwritten because of race conditions

Closes #530

See merge request pleroma/pleroma!691
 2019-01-21 13:03:32 +00:00
lambda 69454c8345 Merge branch 'feature/dm-sanity' into 'develop' 
DM sanitization

See merge request pleroma/pleroma!458
 2019-01-21 12:35:10 +00:00
Ivan Tashkinov a4d3fec8a7 [#502] Code comments update. 2019-01-21 14:52:41 +03:00
Ivan Tashkinov 789a9843da [#530] Fixed test. 2019-01-21 14:30:01 +03:00