lain
|
096a927805
|
Merge remote-tracking branch 'origin/develop' into pool-usage
|
6 years ago |
|
lain
|
91afbbe4ea
|
Update Tesla and Hackney.
|
6 years ago |
|
lain
|
d4799e0dc2
|
Remove default pool, it's used automatically anyway.
|
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 |
|
kaniini
|
1b1e928667
|
Merge branch 'docs/admin-api' into 'develop'
Add docs/Admin-API.md
See merge request pleroma/pleroma!611
|
6 years ago |
|
kaniini
|
ede3fd7459
|
Merge branch 'maintenance/copyright-2019' into 'develop'
update copyright years to 2019
See merge request pleroma/pleroma!613
|
6 years ago |
|
William Pitcock
|
980b5288ed
|
update copyright years to 2019
|
6 years ago |
|
Haelwenn (lanodan) Monnier
|
286632dfa2
|
Add docs/Admin-API.md
[ci skip]
|
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
|
9f5881cbb1
|
Fix a typo in user_test.ex
|
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 |
|
rinpatch
|
05743e2000
|
Get default scrubbers from config instead of hardcoded
|
6 years ago |
|
rinpatch
|
91d5a7e81c
|
Fix test failure
|
6 years ago |
|
Rin Toshaka
|
dec23500d8
|
Resolve merge conflict
|
6 years ago |
|
Rin Toshaka
|
ab3089d6a7
|
Fix comment in object.ex
|
6 years ago |
|
kaniini
|
dfde2622d0
|
Merge branch 'activitypub-c2s' into 'develop'
Activitypub c2s
See merge request pleroma/pleroma!608
|
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 |
|
Haelwenn
|
f5d7b0003e
|
Merge branch 'fix_485' into 'develop'
Change 'name' to 'instance_name' so option is used when running non-interactive
See merge request pleroma/pleroma!607
|
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 |
|
lambda
|
e8ba390fe9
|
Merge branch '2018-12-29-update-frontend' into 'develop'
update frontend
See merge request pleroma/pleroma!606
|
6 years ago |
|
lain
|
e1227d812c
|
update frontend
|
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 |
|
spctrl
|
ab9cda315f
|
Change 'name' to 'instance_name' so option is used when running non-interactive
|
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 |
|
kaniini
|
7117ab43af
|
Merge branch 'support/issue_480' into 'develop'
[#480] Salmon# fixed publish an activity to remote accounts
See merge request pleroma/pleroma!605
|
6 years ago |
|
Maksim Pechnikov
|
523848d1fd
|
Salmon# fixed publish an activity to remote accounts
|
6 years ago |
|
Ivan Tashkinov
|
242cc9a658
|
[#483] User.get_by_nickname/1: ensured case-insensitive matching for local FQN. Added tests.
|
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 |
|
kaniini
|
89fbed8821
|
Merge branch 'systemd-drop-sysadmin-privilege' into 'develop'
Security/Drops the sysadmin privilege from the daemon
See merge request pleroma/pleroma!604
|
6 years ago |
|
shibayashi
|
64035201b5
|
Security/Drops the sysadmin privilege from the daemon
|
6 years ago |
