Maxim Filippov
|
4333fea1dc
|
Send "hide_network" in user_view
|
6 years ago |
|
kaniini
|
4a278cd80a
|
Merge branch 's3-namespace' into 'develop'
S3 uploader: support for namespaced bucket
Closes #532
See merge request pleroma/pleroma!699
|
6 years ago |
|
href
|
abb349bde0
|
Merge branch 'fix-info-id' into 'develop'
Fix info ids.
Closes #511
See merge request pleroma/pleroma!702
|
6 years ago |
|
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
|
6 years ago |
|
lambda
|
5067b791a1
|
Merge branch 'rename/pleroma_activity_consistency' into 'develop'
Consistent fonction names in Pleroma.Activity
See merge request pleroma/pleroma!690
|
6 years ago |
|
lain
|
2de208817c
|
Merge branch 'develop' into rename/pleroma_activity_consistency
|
6 years ago |
|
lain
|
e221c681dc
|
New frontend configuration mechanism.
|
6 years ago |
|
href
|
9ba6e1fabe
|
FlakeId: chain alter statements
|
6 years ago |
|
href
|
e67bd93d90
|
Flake: migrate pinned_activities in jsonb
|
6 years ago |
|
href
|
a92c43bc4b
|
Clippy!
|
6 years ago |
|
href
|
465fb4327d
|
Lock activities/users table during flake migration.
|
6 years ago |
|
href
|
973c9eed18
|
Treat User.Info pinned ids as strings
|
6 years ago |
|
href
|
e36a434b99
|
FlakeId.from_string/1: remove old, un-needed conversion
|
6 years ago |
|
href
|
422e60ad76
|
2019
|
6 years ago |
|
href
|
cdc5e6ff5c
|
ActivityPub: restrict_since/restrict_max: ignore empty param
|
6 years ago |
|
href
|
9d63b27dcd
|
Test FlakeID old id compat & Ecto type
|
6 years ago |
|
href
|
28d77e373c
|
Flake Ids for Users and Activities
|
6 years ago |
|
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
|
6 years ago |
|
Michael Loftis
|
98cbeae49c
|
slightly changes definition so that autovacuum works paralell safe too
|
6 years ago |
|
Haelwenn
|
707cd9389c
|
Merge branch 'fix/activity_get_by_id' into 'develop'
Add get_by_id to activity.ex
See merge request pleroma/pleroma!695
|
6 years ago |
|
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
|
6 years ago |
|
Ivan Tashkinov
|
34d59e4008
|
[#502] Fixed User.active_local_user_query to return users with nil or missing `info.deactivated`. Adjusted test.
|
6 years ago |
|
kaniini
|
d17a4b1891
|
Merge branch 'uploader-controller' into 'develop'
Uploader callback controller
See merge request pleroma/pleroma!694
|
6 years ago |
|
rinpatch
|
e460820fcf
|
Add get_by_id to activity.ex
|
6 years ago |
|
href
|
f9a3269099
|
Uploader callback controller
|
6 years ago |
|
rinpatch
|
afb8d9ec13
|
Merge branch 'fix-buggy-test' into 'develop'
Fix buggy test.
See merge request pleroma/pleroma!693
|
6 years ago |
|
lain
|
762fafe738
|
Fix buggy test.
|
6 years ago |
|
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
|
6 years ago |
|
href
|
99763999c1
|
reverse_proxy - always override plug's cache-control
|
6 years ago |
|
href
|
97412d9f94
|
S3 Namespace
|
6 years ago |
|
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
|
6 years ago |
|
lambda
|
69454c8345
|
Merge branch 'feature/dm-sanity' into 'develop'
DM sanitization
See merge request pleroma/pleroma!458
|
6 years ago |
|
Ivan Tashkinov
|
a4d3fec8a7
|
[#502] Code comments update.
|
6 years ago |
|
Ivan Tashkinov
|
789a9843da
|
[#530] Fixed test.
|
6 years ago |
|
Ivan Tashkinov
|
aa480f4a8b
|
[#530] Prevents user `info` from being overwritten because of race conditions
and non-partial update of embed (in WebFinger.ensure_keys_present and other places).
|
6 years ago |
|
Haelwenn (lanodan) Monnier
|
7390192c03
|
Activity: mix format (2 empty lines)
|
6 years ago |
|
Haelwenn (lanodan) Monnier
|
98c8184c1f
|
Activity: get_create_activity_by_object_ap_id/1 → get_create_by_object_ap_id/1
|
6 years ago |
|
Haelwenn (lanodan) Monnier
|
2fdbd4d137
|
Activity: create_activity_by_object_id_query/1 → create_by_object_ap_id/1 when is_list
|
6 years ago |
|
Haelwenn (lanodan) Monnier
|
f8ab1b7427
|
Activity: get_all_by_object_ap_id/1 → get_all_create_by_object_ap_id/1
|
6 years ago |
|
Haelwenn (lanodan) Monnier
|
4ad5a0abb9
|
Activity: all_by_object_ap_id_q/1 → create_by_object_ap_id/1
|
6 years ago |
|
Haelwenn (lanodan) Monnier
|
75e4c8f0b2
|
Activity: all_non_create_by_object_ap_id_q → by_object_ap_id
|
6 years ago |
|
Haelwenn (lanodan) Monnier
|
b82c6dc536
|
Activity: all_by_object_ap_id/1 → get_all_by_object_ap_id/1
|
6 years ago |
|
rinpatch
|
52006f8f8a
|
Merge branch 'bugfix/gen_signing_salt' into 'develop'
Mix.Tasks.Pleroma.Instance: Generate signing_salt
Closes #533
See merge request pleroma/pleroma!689
|
6 years ago |
|
Haelwenn (lanodan) Monnier
|
f94cc6d824
|
Mix.Tasks.Pleroma.Instance: Generate signing_salt
Closes: https://git.pleroma.social/pleroma/pleroma/issues/533
|
6 years ago |
|
kaniini
|
5803672ae5
|
Merge branch '116-send-delete-event' into 'develop'
Send delete event over Mastodon streaming api
Closes #116
See merge request pleroma/pleroma!688
|
6 years ago |
|
lain
|
cf1f35a93a
|
Send delete event over Mastodon streaming api
Closes #116
|
6 years ago |
|
lambda
|
501fba33d6
|
Merge branch 'add-custom-emoji-test' into 'develop'
Add a test to ensure #39 is fixed.
See merge request pleroma/pleroma!687
|
6 years ago |
|
lain
|
be0fb5dec4
|
Add a test to ensure #39 is fixed.
|
6 years ago |
|
lambda
|
2020f26040
|
Merge branch '2019-1-20-update-frontend' into 'develop'
update frontend
See merge request pleroma/pleroma!686
|
6 years ago |
|
lain
|
deeda94513
|
update frontend
|
6 years ago |
