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 |
|
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).
|
2019-01-21 14:16:51 +03:00 |
|
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
|
2019-01-21 05:22:34 +00:00 |
|
Haelwenn (lanodan) Monnier
|
f94cc6d824
|
Mix.Tasks.Pleroma.Instance: Generate signing_salt
Closes: https://git.pleroma.social/pleroma/pleroma/issues/533
|
2019-01-21 01:16:41 +01:00 |
|
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
|
2019-01-20 23:06:21 +00:00 |
|
lain
|
cf1f35a93a
|
Send delete event over Mastodon streaming api
Closes #116
|
2019-01-20 13:00:46 +01:00 |
|
lambda
|
501fba33d6
|
Merge branch 'add-custom-emoji-test' into 'develop'
Add a test to ensure #39 is fixed.
See merge request pleroma/pleroma!687
|
2019-01-20 10:58:19 +00:00 |
|
lain
|
be0fb5dec4
|
Add a test to ensure #39 is fixed.
|
2019-01-20 11:48:53 +01:00 |
|
lambda
|
2020f26040
|
Merge branch '2019-1-20-update-frontend' into 'develop'
update frontend
See merge request pleroma/pleroma!686
|
2019-01-20 10:42:06 +00:00 |
|
lain
|
deeda94513
|
update frontend
|
2019-01-20 11:28:11 +01:00 |
|
lambda
|
f3045a179e
|
Merge branch 'i1t/pleroma-477_user_search_improvements' into 'develop'
I1t/pleroma 477 user search improvements
See merge request pleroma/pleroma!685
|
2019-01-20 10:24:05 +00:00 |
|
lain
|
5834b08fe7
|
Set custom similarity limit.
|
2019-01-20 10:57:49 +01:00 |
|
William Pitcock
|
aa37313416
|
activitypub: short-circuit is_public?() with directMessage flag check
|
2019-01-20 02:33:21 +00:00 |
|
William Pitcock
|
cf3099231d
|
test: transmogrifier: verify directMessage flag is sent outbound based on declared visibility
|
2019-01-20 02:28:28 +00:00 |
|
William Pitcock
|
7c9749f793
|
transmogrifier: slightly clean up fix_explicit_addressing pipeline
|
2019-01-20 02:27:48 +00:00 |
|
William Pitcock
|
420651157b
|
transmogrifier: don't apply heuristics against messages which have directMessage set true
|
2019-01-20 02:27:48 +00:00 |
|
William Pitcock
|
ddae43eb43
|
activitypub: add is_private?/is_direct? helpers
|
2019-01-20 02:27:48 +00:00 |
|
William Pitcock
|
9adc80afff
|
common api: set directMessage flag on our own posts
|
2019-01-20 02:27:48 +00:00 |
|
William Pitcock
|
75bb663749
|
litepub schema: add litepub:directMessage flag
|
2019-01-20 02:27:48 +00:00 |
|
William Pitcock
|
75dfa1f0b0
|
mastodon api: get_visibility(): DMs never have a cc list.
|
2019-01-20 02:27:48 +00:00 |
|
William Pitcock
|
21ac35fcc0
|
tests: add tests for DM sanitizer
|
2019-01-20 02:27:48 +00:00 |
|
William Pitcock
|
681f40ee5c
|
activitypub: transmogrifier: fix up to/cc addressing brain damage caused by mastodon-style explicit DMs
|
2019-01-20 02:27:48 +00:00 |
|
William Pitcock
|
8d06be35e0
|
activitypub: utils: add determine_explicit_mentions() and tests
|
2019-01-20 02:27:48 +00:00 |
|
kaniini
|
42612b1c8d
|
Merge branch 'bugfix/improve-boost-targeting' into 'develop'
improve handling of non-public Announces
See merge request pleroma/pleroma!681
|
2019-01-19 23:44:08 +00:00 |
|
lain
|
b108aeee08
|
Make use of the indices.
Indices in postgresql rely on operators, so they won't be used if you use only functions.
|
2019-01-20 00:31:17 +01:00 |
|
kaniini
|
651ce1c97b
|
Merge branch '491_full_mentions_in_user_bio' into 'develop'
[#491] Made user bio preserve full nicknames (nick@host)
Closes #491
See merge request pleroma/pleroma!676
|
2019-01-19 07:36:58 +00:00 |
|
William Pitcock
|
31517bec12
|
test: add regression test for to/cc clobbering
|
2019-01-18 22:32:01 +00:00 |
|
Ivan Tashkinov
|
79e44042bc
|
[#477] User trigram index adjustment.
|
2019-01-18 10:57:42 +03:00 |
|
Ivan Tashkinov
|
ed8f55ab8e
|
[#477] User: FTS and trigram search results mixing (to handle misspelled requests).
|
2019-01-18 10:35:45 +03:00 |
|
Ivan Tashkinov
|
65bb9b2fba
|
[#491] Made full nicknames be preserved in user links text only in Bio.
|
2019-01-18 09:30:16 +03:00 |
|
William Pitcock
|
75a9b2a851
|
activitypub: add a match clause for objects, not just activities
|
2019-01-17 23:32:16 +00:00 |
|
William Pitcock
|
dbc4e92509
|
activitypub: transmogrifier: do not clobber the addressing on relayed announcements
|
2019-01-17 23:21:31 +00:00 |
|
William Pitcock
|
33b473cc02
|
activitypub: allow is_public?() to work on any type of map representing an AS2 object
|
2019-01-17 23:21:31 +00:00 |
|
William Pitcock
|
8e9f1d5587
|
activitypub: relay: chase selective public announce changes
|
2019-01-17 23:21:31 +00:00 |
|
William Pitcock
|
2479e88815
|
activitypub: announce: add new public parameter
|
2019-01-17 23:21:31 +00:00 |
|
kaniini
|
98d9dcd509
|
Merge branch '502_instance_stats_active_users_count_fix' into 'develop'
[#502] Fixed `user_count` in `/api/v1/instance` to include only active local users
Closes #502
See merge request pleroma/pleroma!678
|
2019-01-17 19:27:15 +00:00 |
|
kaniini
|
ae8a5942cf
|
Merge branch 'bad-copy-paste' into 'develop'
Fix bad link in likes collection
See merge request pleroma/pleroma!679
|
2019-01-17 19:22:21 +00:00 |
|
kaniini
|
f73b5bd05f
|
Merge branch 'attachment-links' into 'develop'
Make attachment links configurable
See merge request pleroma/pleroma!677
|
2019-01-17 19:21:54 +00:00 |
|
kaniini
|
9fa761620d
|
Merge branch 'change-mix-location' into 'develop'
systemd: Add comments and change default path of the Mix binary.
See merge request pleroma/pleroma!680
|
2019-01-17 19:21:07 +00:00 |
|
shibayashi
|
2a818a3e77
|
Add comments and change default path of the Mix binary.
|
2019-01-17 19:49:54 +01:00 |
|
sxsdv1
|
948fba6f76
|
Fix bad link in likes collection
Don't copy and paste, mkay
|
2019-01-17 18:21:43 +01:00 |
|
Ivan Tashkinov
|
954dc4a4ad
|
[#502] Fixed user_count in /api/v1/instance to include only active local users.
|
2019-01-17 19:16:02 +03:00 |
|
Mark Felder
|
849c83ed46
|
formatting
|
2019-01-17 16:10:26 +00:00 |
|
Mark Felder
|
6bc9a641ba
|
Default to disabled in the code in case the setting is absent from config.exs
|
2019-01-17 16:01:25 +00:00 |
|
Mark Felder
|
207489aa25
|
Also add to default config
|
2019-01-17 15:50:34 +00:00 |
|
Mark Felder
|
8c368d42a2
|
Make attachment links configurable
Thanks @href!
|
2019-01-17 15:48:14 +00:00 |
|
Ivan Tashkinov
|
2bfae25a1f
|
[#491] Made user bio preserve full nicknames (nick@host).
|
2019-01-17 18:03:49 +03:00 |
|