Egor Kislitsyn
|
48591aab98
|
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into feature/pinned-posts
# Conflicts:
# docs/config.md
|
6 years ago |
|
kaniini
|
5c5c8508c2
|
Merge branch 'hotfix/media-proxy-uri' into 'develop'
user: fix local vs remote determination in remote_or_auth_active?/1
See merge request pleroma/pleroma!640
|
6 years ago |
|
William Pitcock
|
f15183178c
|
user: fix auth_active?/1 for remote users
|
6 years ago |
|
William Pitcock
|
0015d43e13
|
user: factor out illogical User.Info.superuser?/1.
any actual callee will be dealing with a User struct to begin with, so
just check the child struct inside User.superuser?/1 with pattern matching.
|
6 years ago |
|
William Pitcock
|
74f48beec3
|
user: remove entirely redundant remote_or_auth_active?/1.
auth_active?/1 can check remote users and return true directly.
|
6 years ago |
|
William Pitcock
|
2af67353c5
|
user: harden auth_active?/1, superuser?/1, visible_for?/1
|
6 years ago |
|
William Pitcock
|
595a970493
|
user: use pattern matching to determine if user is local or remote instead of the previous hairy logic
|
6 years ago |
|
Egor Kislitsyn
|
0c750bc432
|
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into feature/pinned-posts
|
6 years ago |
|
Egor Kislitsyn
|
6428ef77ad
|
add default configuration for the pinned statuses and some doc
|
6 years ago |
|
lain
|
0fae04c4e3
|
Add a setting for users to autofollow on sign up.
|
6 years ago |
|
Egor Kislitsyn
|
e679da4c34
|
add `pinned` property to `StatusView`
|
6 years ago |
|
Egor Kislitsyn
|
63dbd87568
|
rename `post` to `status`
|
6 years ago |
|
lain
|
a16b17cc61
|
Actually put some onformation in the error user, make it actually properly parse
in conversations.
|
6 years ago |
|
kaniini
|
74e1093732
|
Merge branch 'resilient-user-view' into 'develop'
Make TwAPI UserView more resilient to issues.
See merge request pleroma/pleroma!634
|
6 years ago |
|
Egor Kislitsyn
|
f24087f96e
|
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into feature/pinned-posts
|
6 years ago |
|
Egor Kislitsyn
|
380e9fba21
|
add pinned posts
|
6 years ago |
|
lain
|
7382adf407
|
Make TwAPI UserView more resilient to issues.
Will work for missing users and badly migrated users.
|
6 years ago |
|
scarlett
|
36fa5e8802
|
Check visible_for_user when performing a search using a direct link.
|
6 years ago |
|
Sadposter
|
042852ecf3
|
Add check to prevent multiple follow notifications from the same user
|
6 years ago |
|
kaniini
|
8d047c7a72
|
Merge branch 'fix/user-search-null-name' into 'develop'
fix user search results for users with unset display name
Closes #499
See merge request pleroma/pleroma!625
|
6 years ago |
|
kaniini
|
0b54c3d643
|
Merge branch 'fix_486' into 'develop'
fix 486: Add option --assume-yes to allow mix pleroma.user to work non-interactive
See merge request pleroma/pleroma!627
|
6 years ago |
|
kaniini
|
576368237c
|
Merge branch 'activitypub-tombstone-fix' into 'develop'
Don't crash on AP request for tombstone
See merge request pleroma/pleroma!630
|
6 years ago |
|
scarlett
|
145d6fe6e9
|
Merge branch 'emoji-in-summary' into 'develop'
Strip HTML in and allow emoji in summaries.
See merge request pleroma/pleroma!631
|
6 years ago |
|
scarlett
|
6556be344d
|
Resolve some test failures.
|
6 years ago |
|
scarlett
|
3c86d907d4
|
add some brakets to the emoji list.
|
6 years ago |
|
scarlett
|
0787f0dfbe
|
Strip HTML in and allow emoji in summaries.
|
6 years ago |
|
sxsdv1
|
2d7da5f437
|
Don't crash on AP request for tombstone
Because tombstone objects has no addressing the is_public?-predicate
would cause an error that propagated as a 500 error in the api
|
6 years ago |
|
cascode
|
a81307251c
|
Merge branch 'develop' of git.pleroma.social:cascode/pleroma into fix/user-search-null-name
|
6 years ago |
|
rinpatch
|
ba17518a0a
|
Merge branch 'feature/rich-media-cachex' into 'develop'
rich media: use cachex to avoid flooding remote servers
See merge request pleroma/pleroma!629
|
6 years ago |
|
William Pitcock
|
487c00d36d
|
rich media: disable cachex in test mode
|
6 years ago |
|
kaniini
|
bf5aaefbb5
|
Merge branch 'fix/html-cache-content-collision' into 'develop'
Different caches based on the module. Remove scrubber version since it is not relevant anymore
See merge request pleroma/pleroma!628
|
6 years ago |
|
William Pitcock
|
0964c207eb
|
rich media: use cachex to avoid flooding remote servers
|
6 years ago |
|
Rin Toshaka
|
1e2d58982e
|
oopsies
|
6 years ago |
|
Rin Toshaka
|
846082e54f
|
Different caches based on the module. Remove scrubber version since it is not relevant anymore
|
6 years ago |
|
spctrl
|
4aa977d3b3
|
fix 486: Add option --assume-yes to allow it to work non-interactive
|
6 years ago |
|
kaniini
|
4258dd8633
|
Merge branch 'feature/rich-media' into 'develop'
URL previews in posts
Closes #402
See merge request pleroma/pleroma!617
|
6 years ago |
|
kaniini
|
ffea81b84f
|
Merge branch 'activitypub-c2s-delete-activity' into 'develop'
Activitypub c2s delete activity
See merge request pleroma/pleroma!618
|
6 years ago |
|
cascode
|
5b23dfa1c5
|
handle null
|
6 years ago |
|
kaniini
|
d9d62a110c
|
Merge branch 'mr/retry-queue-remove-fold' into 'develop'
rewrites List.foldl to Enum.each in RetryQueue
See merge request pleroma/pleroma!621
|
6 years ago |
|
kaniini
|
eaaf701319
|
Merge branch 'fix/follow-requests-deleted-accounts' into 'develop'
user: check that the follow request actually has an active account associated with it
See merge request pleroma/pleroma!623
|
6 years ago |
|
rinpatch
|
b73a1a33de
|
Merge branch 'captcha' into 'develop'
Make captcha (kocaptcha) stateless
See merge request pleroma/pleroma!585
|
6 years ago |
|
William Pitcock
|
eb1a18d22f
|
user: check that the follow request actually has an active account associated with it
because of user refetch, accounts can stop existing (get_from_ap_id() can fail), accordingly
filter the follow requests for these failures.
|
6 years ago |
|
Michael Loftis
|
943211b035
|
rewrites List.foldl to Enum.each
|
6 years ago |
|
Maxim Filippov
|
48e81d3d40
|
Add RichMediaController and tests
|
6 years ago |
|
sxsdv1
|
4e1cc2bab6
|
Implement delete activity
|
6 years ago |
|
sxsdv1
|
551c3d9391
|
Split create activity specifics from update_outbox
|
6 years ago |
|
Maxim Filippov
|
917d48d09b
|
Better variable name
|
6 years ago |
|
Maxim Filippov
|
2aab4e03c3
|
Add OGP parser
|
6 years ago |
|
kaniini
|
32bed66471
|
Merge branch 'pool-usage' into 'develop'
Update of hackney and tesla, removal of superflous default options.
See merge request pleroma/pleroma!614
|
6 years ago |
|
rinpatch
|
34fa709015
|
Merge branch 'configurable-federator' into 'develop'
Make Federator options configurable.
See merge request pleroma/pleroma!615
|
6 years ago |
