lain
|
7382adf407
|
Make TwAPI UserView more resilient to issues.
Will work for missing users and badly migrated users.
|
2019-01-07 12:41:31 +01:00 |
kaniini
|
576368237c
|
Merge branch 'activitypub-tombstone-fix' into 'develop'
Don't crash on AP request for tombstone
See merge request pleroma/pleroma!630
|
2019-01-05 22:29:08 +00:00 |
scarlett
|
145d6fe6e9
|
Merge branch 'emoji-in-summary' into 'develop'
Strip HTML in and allow emoji in summaries.
See merge request pleroma/pleroma!631
|
2019-01-05 21:52:02 +00:00 |
scarlett
|
6556be344d
|
Resolve some test failures.
|
2019-01-05 18:20:42 +00:00 |
scarlett
|
3c86d907d4
|
add some brakets to the emoji list.
|
2019-01-05 17:35:39 +00:00 |
scarlett
|
0787f0dfbe
|
Strip HTML in and allow emoji in summaries.
|
2019-01-05 17:28:47 +00:00 |
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
|
2019-01-05 11:16:05 +01:00 |
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
|
2019-01-04 23:56:42 +00:00 |
William Pitcock
|
487c00d36d
|
rich media: disable cachex in test mode
|
2019-01-04 23:53:26 +00:00 |
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
|
2019-01-04 23:35:56 +00:00 |
William Pitcock
|
0964c207eb
|
rich media: use cachex to avoid flooding remote servers
|
2019-01-04 23:32:01 +00:00 |
Rin Toshaka
|
846082e54f
|
Different caches based on the module. Remove scrubber version since it is not relevant anymore
|
2019-01-05 00:19:46 +01:00 |
kaniini
|
4258dd8633
|
Merge branch 'feature/rich-media' into 'develop'
URL previews in posts
Closes #402
See merge request pleroma/pleroma!617
|
2019-01-04 20:50:18 +00:00 |
kaniini
|
ffea81b84f
|
Merge branch 'activitypub-c2s-delete-activity' into 'develop'
Activitypub c2s delete activity
See merge request pleroma/pleroma!618
|
2019-01-04 20:32:10 +00:00 |
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
|
2019-01-03 22:30:02 +00:00 |
rinpatch
|
b73a1a33de
|
Merge branch 'captcha' into 'develop'
Make captcha (kocaptcha) stateless
See merge request pleroma/pleroma!585
|
2019-01-03 17:04:27 +00:00 |
Michael Loftis
|
943211b035
|
rewrites List.foldl to Enum.each
|
2019-01-02 21:21:40 +00:00 |
Maxim Filippov
|
48e81d3d40
|
Add RichMediaController and tests
|
2019-01-02 17:02:50 +03:00 |
sxsdv1
|
4e1cc2bab6
|
Implement delete activity
|
2019-01-01 23:20:43 +01:00 |
sxsdv1
|
551c3d9391
|
Split create activity specifics from update_outbox
|
2019-01-01 23:20:28 +01:00 |
Maxim Filippov
|
917d48d09b
|
Better variable name
|
2019-01-01 23:29:47 +03:00 |
Maxim Filippov
|
2aab4e03c3
|
Add OGP parser
|
2019-01-01 23:26:40 +03:00 |
kaniini
|
32bed66471
|
Merge branch 'pool-usage' into 'develop'
Update of hackney and tesla, removal of superflous default options.
See merge request pleroma/pleroma!614
|
2019-01-01 20:12:34 +00:00 |
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
|
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
|
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 |
William Pitcock
|
980b5288ed
|
update copyright years to 2019
|
2018-12-31 15:41:47 +00: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
|
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 |
Rin Toshaka
|
dec23500d8
|
Resolve merge conflict
|
2018-12-30 21:00:40 +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 |
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 |
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 |