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 |
|
lambda
|
32541172cd
|
Merge branch 'cleanup/admin-api-useless-if' into 'develop'
Web.AdminAPI.AdminAPIController: Remove a useless if in user_delete
See merge request pleroma/pleroma!612
|
6 years ago |
|
lain
|
400337b0a7
|
Make Federator options configurable.
|
6 years ago |
|
lain
|
096a927805
|
Merge remote-tracking branch 'origin/develop' into pool-usage
|
6 years ago |
|
lain
|
d4799e0dc2
|
Remove default pool, it's used automatically anyway.
|
6 years ago |
|
Haelwenn (lanodan) Monnier
|
1e6c102bfc
|
Web.AdminAPI.AdminAPIController: Remove a useless if in user_delete
|
6 years ago |
|
kaniini
|
90e157ef80
|
Merge branch 'features/admin-api-user-views' into 'develop'
User/Account views: Add rights.admin
Closes #472
See merge request pleroma/pleroma!589
|
6 years ago |
|
William Pitcock
|
980b5288ed
|
update copyright years to 2019
|
6 years ago |
|
lambda
|
33e3a7ba7d
|
Merge branch 'fix/scrubber-cache' into 'develop'
[#481] Store scrubbed posts in Cachex
Closes #481
See merge request pleroma/pleroma!610
|
6 years ago |
|
Rin Toshaka
|
6ed9b31a5f
|
Eh?
|
6 years ago |
|
Rin Toshaka
|
7e09c2bd7d
|
Move scrubber cache-related functions to Pleroma.HTML
|
6 years ago |
|
kaniini
|
8e7da98b18
|
Merge branch 'mr/retry-queue' into 'develop'
Improves RetryQueue behavior
See merge request pleroma/pleroma!609
|
6 years ago |
|
Rin Toshaka
|
dec23500d8
|
Resolve merge conflict
|
6 years ago |
|
Rin Toshaka
|
ab3089d6a7
|
Fix comment in object.ex
|
6 years ago |
|
Rin Toshaka
|
c50353e6ae
|
shame on me for not testing after revert
|
6 years ago |
|
Rin Toshaka
|
3f9da55adc
|
Fix formating. Aparently my pre-commit hook broke.
|
6 years ago |
|
Rin Toshaka
|
62af23bd26
|
Revert some changes in html.ex
|
6 years ago |
|
Rin Toshaka
|
c119ea3a57
|
Friendship ended with Postgresql now Cachex is my best friend
|
6 years ago |
|
Rin Toshaka
|
535fddd286
|
Friendship ended with Postgresql now Cachex is my best friend
|
6 years ago |
|
Rin Toshaka
|
d9f40b05b3
|
Added get_stripped_html_for_object. Renamed a few things
|
6 years ago |
|
Michael Loftis
|
cb286fdeba
|
Improves RetryQueue behavior
reduces to one single timer firing once a second
switches to a parallel worker model
|
6 years ago |
|
Rin Toshaka
|
bce152aba0
|
Tidy up the code. Rename key to signature
|
6 years ago |
|
Rin Toshaka
|
66d1c31461
|
Fix some stupid typos
|
6 years ago |
|
sxsdv1
|
f40562b4e1
|
Respond with full activity to outbox post
|
6 years ago |
|
sxsdv1
|
1e781715c8
|
Limit activity types accepted to outbox to only 'Create'
|
6 years ago |
|
sxsdv1
|
569bad8210
|
Create activity when client posts to outbox
|
6 years ago |
|
sxsdv1
|
26dc2dddab
|
Implement ActivityPub inbox view
More or less verbatim copied from the outbox template with only changes
to the activities fetched and url reported
|
6 years ago |
|
Rin Toshaka
|
a32e23905a
|
Use Object.change instead of Ecto.Changeset.change
|
6 years ago |
|
sxsdv1
|
aa082ca7b6
|
Wire up stub routes for client calls of activitypub inbox/outbox
Code style: remove wrapping function of outbox
|
6 years ago |
|
Rin Toshaka
|
9a0163db53
|
use Kernel.put_in instead of Map.merge
|
6 years ago |
|
Rin Toshaka
|
19f9889fbe
|
I am not sure what's going on anymore so I'll just commit and reset all the other files to HEAD
|
6 years ago |
|
kaniini
|
3dc5f04976
|
Merge branch 'carrot-bullying' into 'develop'
Add some hard limits on inserted activities.
See merge request pleroma/pleroma!595
|
6 years ago |
|
kaniini
|
dd8f2196f6
|
Merge branch '483_blocks_import_export' into 'develop'
[#483] Blocked users list import & export
Closes #483
See merge request pleroma/pleroma!603
|
6 years ago |
|
Maksim Pechnikov
|
523848d1fd
|
Salmon# fixed publish an activity to remote accounts
|
6 years ago |
|
Ivan Tashkinov
|
7bd49a3222
|
[#483] User.get_by_nickname/1: ensured case-insensitive matching for local FQN. Added tests.
|
6 years ago |
|
Ivan Tashkinov
|
b3574dccbb
|
[#483] User.get_by_nickname/1: allowed retrieving user by fully-qualified local nickname
(<nick>@<our_instance_host>).
|
6 years ago |
|
Ivan Tashkinov
|
67b4297f4d
|
[#483] Refactored blocks and follows import, added tests.
|
6 years ago |
|
kaniini
|
49cf5f9ce0
|
Merge branch '471_invalid_accounts_rendering' into 'develop'
[#471] Prevented rendering of inactive local accounts
Closes #471
See merge request pleroma/pleroma!599
|
6 years ago |
|
Ivan Tashkinov
|
700661b761
|
[#483] Blocked users list import (TwitterAPI).
|
6 years ago |
|
Ivan Tashkinov
|
0a41786624
|
[#467] Refactored valid / invalid user rendering.
|
6 years ago |
|
kaniini
|
68f483ef4c
|
Merge branch 'fix/no-attachment-links' into 'develop'
Treat any present value in "no_attachment_links" as true
Closes pleroma-fe#175
See merge request pleroma/pleroma!597
|
6 years ago |
|
Ivan Tashkinov
|
6e9a15b181
|
[#483] Blocked users export for TwitterAPI.
|
6 years ago |
|
Haelwenn (lanodan) Monnier
|
b43d630f30
|
Web.TwitterAPI.UserView: Add rights.admin
|
6 years ago |
|
Ivan Tashkinov
|
0d1788ce44
|
[#471] Factored out User.visible_for?/2.
|
6 years ago |
|
Vyr Cossont
|
d8cc96cb1f
|
Fix Twitter timelines for private instances
|
6 years ago |
|
kaniini
|
bee6acd51d
|
Merge branch 'feature/create-tombstone-instead-of-delete' into 'develop'
Create tombstone instead of object deletion
See merge request pleroma/pleroma!593
|
6 years ago |
|
kaniini
|
cff0292d4b
|
Merge branch 'reserve-user-names' into 'develop'
Reserve a few user names
See merge request pleroma/pleroma!594
|
6 years ago |
|
Ivan Tashkinov
|
e6aeb1d4a5
|
[#471] Prevented rendering of inactive local accounts.
|
6 years ago |
|
Maxim Filippov
|
be70272ab0
|
Treat only true and "true" as true
|
6 years ago |
