rinpatch
|
34fa709015
|
Merge branch 'configurable-federator' into 'develop'
Make Federator options configurable.
See merge request pleroma/pleroma!615
|
2019-01-01 18:55:59 +00:00 |
|
lambda
|
b9ac7067eb
|
Merge branch '2019-1-1-update-frontend' into 'develop'
update frontend
See merge request pleroma/pleroma!616
|
2019-01-01 16:55:37 +00:00 |
|
lain
|
1dd0e0ed4c
|
update frontend
|
2019-01-01 17:45:03 +01:00 |
|
lain
|
1a0391c8a4
|
Add documentation.
|
2019-01-01 17:40:42 +01:00 |
|
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
|
2019-01-01 13:48:59 +00:00 |
|
lain
|
400337b0a7
|
Make Federator options configurable.
|
2019-01-01 14:46:55 +01:00 |
|
lain
|
096a927805
|
Merge remote-tracking branch 'origin/develop' into pool-usage
|
2019-01-01 14:19:55 +01:00 |
|
lain
|
91afbbe4ea
|
Update Tesla and Hackney.
|
2019-01-01 13:49:48 +01:00 |
|
lain
|
d4799e0dc2
|
Remove default pool, it's used automatically anyway.
|
2019-01-01 13:49:24 +01:00 |
|
Haelwenn (lanodan) Monnier
|
1e6c102bfc
|
Web.AdminAPI.AdminAPIController: Remove a useless if in user_delete
|
2018-12-31 19:50:14 +01:00 |
|
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
|
2018-12-31 15:49:34 +00:00 |
|
kaniini
|
1b1e928667
|
Merge branch 'docs/admin-api' into 'develop'
Add docs/Admin-API.md
See merge request pleroma/pleroma!611
|
2018-12-31 15:49:01 +00:00 |
|
kaniini
|
ede3fd7459
|
Merge branch 'maintenance/copyright-2019' into 'develop'
update copyright years to 2019
See merge request pleroma/pleroma!613
|
2018-12-31 15:43:07 +00:00 |
|
William Pitcock
|
980b5288ed
|
update copyright years to 2019
|
2018-12-31 15:41:47 +00:00 |
|
Haelwenn (lanodan) Monnier
|
286632dfa2
|
Add docs/Admin-API.md
[ci skip]
|
2018-12-31 12:27:46 +01:00 |
|
lambda
|
33e3a7ba7d
|
Merge branch 'fix/scrubber-cache' into 'develop'
[#481] Store scrubbed posts in Cachex
Closes #481
See merge request pleroma/pleroma!610
|
2018-12-31 09:56:26 +00:00 |
|
Rin Toshaka
|
9f5881cbb1
|
Fix a typo in user_test.ex
|
2018-12-31 08:34:14 +01:00 |
|
Rin Toshaka
|
6ed9b31a5f
|
Eh?
|
2018-12-31 08:25:48 +01:00 |
|
Rin Toshaka
|
7e09c2bd7d
|
Move scrubber cache-related functions to Pleroma.HTML
|
2018-12-31 08:19:48 +01:00 |
|
kaniini
|
8e7da98b18
|
Merge branch 'mr/retry-queue' into 'develop'
Improves RetryQueue behavior
See merge request pleroma/pleroma!609
|
2018-12-30 21:47:50 +00:00 |
|
rinpatch
|
05743e2000
|
Get default scrubbers from config instead of hardcoded
|
2018-12-31 00:12:14 +03:00 |
|
rinpatch
|
91d5a7e81c
|
Fix test failure
|
2018-12-31 00:03:03 +03:00 |
|
Rin Toshaka
|
dec23500d8
|
Resolve merge conflict
|
2018-12-30 21:00:40 +01:00 |
|
Rin Toshaka
|
ab3089d6a7
|
Fix comment in object.ex
|
2018-12-30 20:51:31 +01:00 |
|
kaniini
|
dfde2622d0
|
Merge branch 'activitypub-c2s' into 'develop'
Activitypub c2s
See merge request pleroma/pleroma!608
|
2018-12-30 19:50:15 +00:00 |
|
Rin Toshaka
|
c50353e6ae
|
shame on me for not testing after revert
|
2018-12-30 20:44:17 +01:00 |
|
Rin Toshaka
|
3f9da55adc
|
Fix formating. Aparently my pre-commit hook broke.
|
2018-12-30 20:16:42 +01:00 |
|
Rin Toshaka
|
62af23bd26
|
Revert some changes in html.ex
|
2018-12-30 20:12:12 +01:00 |
|
Rin Toshaka
|
c119ea3a57
|
Friendship ended with Postgresql now Cachex is my best friend
|
2018-12-30 20:00:01 +01:00 |
|
Rin Toshaka
|
535fddd286
|
Friendship ended with Postgresql now Cachex is my best friend
|
2018-12-30 19:33:36 +01:00 |
|
Rin Toshaka
|
d9f40b05b3
|
Added get_stripped_html_for_object. Renamed a few things
|
2018-12-30 16:51:16 +01:00 |
|
Michael Loftis
|
cb286fdeba
|
Improves RetryQueue behavior
reduces to one single timer firing once a second
switches to a parallel worker model
|
2018-12-30 15:16:26 +00:00 |
|
Rin Toshaka
|
bce152aba0
|
Tidy up the code. Rename key to signature
|
2018-12-30 15:58:19 +01:00 |
|
Rin Toshaka
|
66d1c31461
|
Fix some stupid typos
|
2018-12-30 13:51:01 +01:00 |
|
sxsdv1
|
f40562b4e1
|
Respond with full activity to outbox post
|
2018-12-30 12:01:39 +01:00 |
|
sxsdv1
|
1e781715c8
|
Limit activity types accepted to outbox to only 'Create'
|
2018-12-30 12:01:39 +01:00 |
|
sxsdv1
|
569bad8210
|
Create activity when client posts to outbox
|
2018-12-30 12:01:39 +01:00 |
|
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
|
2018-12-30 12:01:39 +01:00 |
|
Rin Toshaka
|
a32e23905a
|
Use Object.change instead of Ecto.Changeset.change
|
2018-12-30 11:08:19 +01:00 |
|
sxsdv1
|
aa082ca7b6
|
Wire up stub routes for client calls of activitypub inbox/outbox
Code style: remove wrapping function of outbox
|
2018-12-29 22:22:03 +01:00 |
|
Rin Toshaka
|
9a0163db53
|
use Kernel.put_in instead of Map.merge
|
2018-12-29 21:50:34 +01:00 |
|
vaartis
|
816db3f494
|
Remove the debugging IO.inspect
|
2018-12-29 17:44:26 +00:00 |
|
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
|
2018-12-29 17:30:31 +00:00 |
|
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
|
2018-12-29 17:45:50 +01:00 |
|
lambda
|
e8ba390fe9
|
Merge branch '2018-12-29-update-frontend' into 'develop'
update frontend
See merge request pleroma/pleroma!606
|
2018-12-29 13:47:45 +00:00 |
|
lain
|
e1227d812c
|
update frontend
|
2018-12-29 14:30:44 +01:00 |
|
kaniini
|
3dc5f04976
|
Merge branch 'carrot-bullying' into 'develop'
Add some hard limits on inserted activities.
See merge request pleroma/pleroma!595
|
2018-12-29 11:46:06 +00:00 |
|
spctrl
|
ab9cda315f
|
Change 'name' to 'instance_name' so option is used when running non-interactive
|
2018-12-29 12:43:54 +01:00 |
|
kaniini
|
dd8f2196f6
|
Merge branch '483_blocks_import_export' into 'develop'
[#483] Blocked users list import & export
Closes #483
See merge request pleroma/pleroma!603
|
2018-12-29 11:34:51 +00:00 |
|
kaniini
|
7117ab43af
|
Merge branch 'support/issue_480' into 'develop'
[#480] Salmon# fixed publish an activity to remote accounts
See merge request pleroma/pleroma!605
|
2018-12-29 11:32:24 +00:00 |
|