Egor Kislitsyn [Mon, 7 Jan 2019 13:45:33 +0000 (20:45 +0700)]
add pinned posts
kaniini [Sat, 5 Jan 2019 22:54:25 +0000 (22:54 +0000)]
Merge branch 'fix/multiple-follow-notifications-from-same-user' into 'develop'
Add check to prevent multiple follow notifications from the same user
Closes #397
See merge request pleroma/pleroma!591
Sadposter [Sat, 5 Jan 2019 22:54:25 +0000 (22:54 +0000)]
Add check to prevent multiple follow notifications from the same user
kaniini [Sat, 5 Jan 2019 22:34:47 +0000 (22:34 +0000)]
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
kaniini [Sat, 5 Jan 2019 22:33:38 +0000 (22:33 +0000)]
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
kaniini [Sat, 5 Jan 2019 22:29:08 +0000 (22:29 +0000)]
Merge branch 'activitypub-tombstone-fix' into 'develop'
Don't crash on AP request for tombstone
See merge request pleroma/pleroma!630
scarlett [Sat, 5 Jan 2019 21:52:02 +0000 (21:52 +0000)]
Merge branch 'emoji-in-summary' into 'develop'
Strip HTML in and allow emoji in summaries.
See merge request pleroma/pleroma!631
scarlett [Sat, 5 Jan 2019 21:46:42 +0000 (21:46 +0000)]
Add tests for emoji and lack of HTML in summaries.
scarlett [Sat, 5 Jan 2019 18:25:36 +0000 (18:25 +0000)]
Remove redundant comma.
scarlett [Sat, 5 Jan 2019 18:20:42 +0000 (18:20 +0000)]
Resolve some test failures.
scarlett [Sat, 5 Jan 2019 17:35:39 +0000 (17:35 +0000)]
add some brakets to the emoji list.
scarlett [Sat, 5 Jan 2019 17:28:47 +0000 (17:28 +0000)]
Strip HTML in and allow emoji in summaries.
sxsdv1 [Sat, 5 Jan 2019 09:38:38 +0000 (10:38 +0100)]
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
cascode [Sat, 5 Jan 2019 04:32:55 +0000 (20:32 -0800)]
Merge branch 'develop' of git.pleroma.social:cascode/pleroma into fix/user-search-null-name
rinpatch [Fri, 4 Jan 2019 23:56:42 +0000 (23:56 +0000)]
Merge branch 'feature/rich-media-cachex' into 'develop'
rich media: use cachex to avoid flooding remote servers
See merge request pleroma/pleroma!629
William Pitcock [Fri, 4 Jan 2019 23:50:54 +0000 (23:50 +0000)]
rich media: disable cachex in test mode
kaniini [Fri, 4 Jan 2019 23:35:56 +0000 (23:35 +0000)]
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
William Pitcock [Fri, 4 Jan 2019 23:23:47 +0000 (23:23 +0000)]
rich media: use cachex to avoid flooding remote servers
Rin Toshaka [Fri, 4 Jan 2019 23:25:31 +0000 (00:25 +0100)]
oopsies
Rin Toshaka [Fri, 4 Jan 2019 23:19:46 +0000 (00:19 +0100)]
Different caches based on the module. Remove scrubber version since it is not relevant anymore
spctrl [Fri, 4 Jan 2019 21:11:46 +0000 (22:11 +0100)]
fix 486: Add option --assume-yes to allow it to work non-interactive
kaniini [Fri, 4 Jan 2019 20:50:18 +0000 (20:50 +0000)]
Merge branch 'feature/rich-media' into 'develop'
URL previews in posts
Closes #402
See merge request pleroma/pleroma!617
kaniini [Fri, 4 Jan 2019 20:32:10 +0000 (20:32 +0000)]
Merge branch 'activitypub-c2s-delete-activity' into 'develop'
Activitypub c2s delete activity
See merge request pleroma/pleroma!618
cascode [Fri, 4 Jan 2019 18:18:43 +0000 (10:18 -0800)]
formatted
cascode [Fri, 4 Jan 2019 18:14:13 +0000 (10:14 -0800)]
added test for #499
cascode [Fri, 4 Jan 2019 09:35:26 +0000 (01:35 -0800)]
handle null
kaniini [Thu, 3 Jan 2019 22:30:02 +0000 (22:30 +0000)]
Merge branch 'mr/retry-queue-remove-fold' into 'develop'
rewrites List.foldl to Enum.each in RetryQueue
See merge request pleroma/pleroma!621
kaniini [Thu, 3 Jan 2019 22:29:36 +0000 (22:29 +0000)]
Merge branch 'media-proxy-remove-empty-conf-defaults' into 'develop'
Remove media proxy examples in config/config.exs
See merge request pleroma/pleroma!624
href [Thu, 3 Jan 2019 19:20:11 +0000 (20:20 +0100)]
Remove media proxy examples in config/config.exs
1. this was overriding the real defaults
2. it's documented in `config/config.md`
kaniini [Thu, 3 Jan 2019 18:53:30 +0000 (18:53 +0000)]
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
rinpatch [Thu, 3 Jan 2019 17:04:27 +0000 (17:04 +0000)]
Merge branch 'captcha' into 'develop'
Make captcha (kocaptcha) stateless
See merge request pleroma/pleroma!585
rinpatch [Thu, 3 Jan 2019 08:59:05 +0000 (08:59 +0000)]
Merge branch 'fix-chat' into 'develop'
Add handler for Phoenix-style socket.
See merge request pleroma/pleroma!619
William Pitcock [Wed, 2 Jan 2019 22:47:12 +0000 (22:47 +0000)]
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.
Michael Loftis [Tue, 1 Jan 2019 15:40:57 +0000 (15:40 +0000)]
rewrites List.foldl to Enum.each
rinpatch [Wed, 2 Jan 2019 16:23:46 +0000 (16:23 +0000)]
Merge branch 'fix/reserve-media-username' into 'develop'
Reserve /media
See merge request pleroma/pleroma!620
Rin Toshaka [Wed, 2 Jan 2019 16:16:26 +0000 (17:16 +0100)]
reserve /media
Maxim Filippov [Wed, 2 Jan 2019 14:02:50 +0000 (17:02 +0300)]
Add RichMediaController and tests
lain [Wed, 2 Jan 2019 10:39:11 +0000 (11:39 +0100)]
Add handler for Phoenix-style socket.
sxsdv1 [Tue, 1 Jan 2019 22:19:40 +0000 (23:19 +0100)]
Implement delete activity
sxsdv1 [Tue, 1 Jan 2019 21:16:46 +0000 (22:16 +0100)]
Split create activity specifics from update_outbox
Maxim Filippov [Tue, 1 Jan 2019 20:29:47 +0000 (23:29 +0300)]
Better variable name
Maxim Filippov [Tue, 1 Jan 2019 20:26:40 +0000 (23:26 +0300)]
Add OGP parser
kaniini [Tue, 1 Jan 2019 20:12:34 +0000 (20:12 +0000)]
Merge branch 'pool-usage' into 'develop'
Update of hackney and tesla, removal of superflous default options.
See merge request pleroma/pleroma!614
rinpatch [Tue, 1 Jan 2019 18:55:59 +0000 (18:55 +0000)]
Merge branch 'configurable-federator' into 'develop'
Make Federator options configurable.
See merge request pleroma/pleroma!615
lambda [Tue, 1 Jan 2019 16:55:37 +0000 (16:55 +0000)]
Merge branch '2019-1-1-update-frontend' into 'develop'
update frontend
See merge request pleroma/pleroma!616
lain [Tue, 1 Jan 2019 16:45:03 +0000 (17:45 +0100)]
update frontend
lain [Tue, 1 Jan 2019 16:40:42 +0000 (17:40 +0100)]
Add documentation.
lambda [Tue, 1 Jan 2019 13:48:59 +0000 (13:48 +0000)]
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
lain [Tue, 1 Jan 2019 13:46:55 +0000 (14:46 +0100)]
Make Federator options configurable.
lain [Tue, 1 Jan 2019 13:19:55 +0000 (14:19 +0100)]
Merge remote-tracking branch 'origin/develop' into pool-usage
lain [Tue, 1 Jan 2019 12:49:48 +0000 (13:49 +0100)]
Update Tesla and Hackney.
lain [Tue, 1 Jan 2019 12:49:24 +0000 (13:49 +0100)]
Remove default pool, it's used automatically anyway.
Haelwenn (lanodan) Monnier [Mon, 31 Dec 2018 11:18:59 +0000 (12:18 +0100)]
Web.AdminAPI.AdminAPIController: Remove a useless if in user_delete
kaniini [Mon, 31 Dec 2018 15:49:34 +0000 (15:49 +0000)]
Merge branch 'features/admin-api-user-views' into 'develop'
User/Account views: Add rights.admin
Closes #472
See merge request pleroma/pleroma!589
kaniini [Mon, 31 Dec 2018 15:49:01 +0000 (15:49 +0000)]
Merge branch 'docs/admin-api' into 'develop'
Add docs/Admin-API.md
See merge request pleroma/pleroma!611
kaniini [Mon, 31 Dec 2018 15:43:07 +0000 (15:43 +0000)]
Merge branch 'maintenance/copyright-2019' into 'develop'
update copyright years to 2019
See merge request pleroma/pleroma!613
William Pitcock [Mon, 31 Dec 2018 15:41:47 +0000 (15:41 +0000)]
update copyright years to 2019
Haelwenn (lanodan) Monnier [Mon, 31 Dec 2018 11:13:17 +0000 (12:13 +0100)]
Add docs/Admin-API.md
[ci skip]
lambda [Mon, 31 Dec 2018 09:56:26 +0000 (09:56 +0000)]
Merge branch 'fix/scrubber-cache' into 'develop'
[#481] Store scrubbed posts in Cachex
Closes #481
See merge request pleroma/pleroma!610
Rin Toshaka [Mon, 31 Dec 2018 07:34:14 +0000 (08:34 +0100)]
Fix a typo in user_test.ex
Rin Toshaka [Mon, 31 Dec 2018 07:25:48 +0000 (08:25 +0100)]
Eh?
Rin Toshaka [Mon, 31 Dec 2018 07:19:48 +0000 (08:19 +0100)]
Move scrubber cache-related functions to Pleroma.HTML
kaniini [Sun, 30 Dec 2018 21:47:50 +0000 (21:47 +0000)]
Merge branch 'mr/retry-queue' into 'develop'
Improves RetryQueue behavior
See merge request pleroma/pleroma!609
rinpatch [Sun, 30 Dec 2018 21:12:14 +0000 (00:12 +0300)]
Get default scrubbers from config instead of hardcoded
rinpatch [Sun, 30 Dec 2018 21:03:03 +0000 (00:03 +0300)]
Fix test failure
Rin Toshaka [Sun, 30 Dec 2018 20:00:40 +0000 (21:00 +0100)]
Resolve merge conflict
Rin Toshaka [Sun, 30 Dec 2018 19:51:31 +0000 (20:51 +0100)]
Fix comment in object.ex
kaniini [Sun, 30 Dec 2018 19:50:15 +0000 (19:50 +0000)]
Merge branch 'activitypub-c2s' into 'develop'
Activitypub c2s
See merge request pleroma/pleroma!608
Rin Toshaka [Sun, 30 Dec 2018 19:44:17 +0000 (20:44 +0100)]
shame on me for not testing after revert
Rin Toshaka [Sun, 30 Dec 2018 19:16:42 +0000 (20:16 +0100)]
Fix formating. Aparently my pre-commit hook broke.
Rin Toshaka [Sun, 30 Dec 2018 19:12:12 +0000 (20:12 +0100)]
Revert some changes in html.ex
Rin Toshaka [Sun, 30 Dec 2018 19:00:01 +0000 (20:00 +0100)]
Friendship ended with Postgresql now Cachex is my best friend
Rin Toshaka [Sun, 30 Dec 2018 18:33:36 +0000 (19:33 +0100)]
Friendship ended with Postgresql now Cachex is my best friend
Rin Toshaka [Sun, 30 Dec 2018 15:51:16 +0000 (16:51 +0100)]
Added get_stripped_html_for_object. Renamed a few things
Michael Loftis [Sun, 30 Dec 2018 15:16:26 +0000 (15:16 +0000)]
Improves RetryQueue behavior
reduces to one single timer firing once a second
switches to a parallel worker model
Rin Toshaka [Sun, 30 Dec 2018 14:58:19 +0000 (15:58 +0100)]
Tidy up the code. Rename key to signature
Rin Toshaka [Sun, 30 Dec 2018 12:51:01 +0000 (13:51 +0100)]
Fix some stupid typos
sxsdv1 [Sun, 30 Dec 2018 10:19:53 +0000 (11:19 +0100)]
Respond with full activity to outbox post
sxsdv1 [Sat, 29 Dec 2018 17:22:40 +0000 (18:22 +0100)]
Limit activity types accepted to outbox to only 'Create'
sxsdv1 [Sat, 29 Dec 2018 17:21:45 +0000 (18:21 +0100)]
Create activity when client posts to outbox
sxsdv1 [Sat, 29 Dec 2018 17:15:28 +0000 (18:15 +0100)]
Implement ActivityPub inbox view
More or less verbatim copied from the outbox template with only changes
to the activities fetched and url reported
Rin Toshaka [Sun, 30 Dec 2018 10:08:19 +0000 (11:08 +0100)]
Use Object.change instead of Ecto.Changeset.change
sxsdv1 [Sat, 29 Dec 2018 17:01:15 +0000 (18:01 +0100)]
Wire up stub routes for client calls of activitypub inbox/outbox
Code style: remove wrapping function of outbox
Rin Toshaka [Sat, 29 Dec 2018 20:50:34 +0000 (21:50 +0100)]
use Kernel.put_in instead of Map.merge
vaartis [Sat, 29 Dec 2018 17:44:26 +0000 (17:44 +0000)]
Remove the debugging IO.inspect
Haelwenn [Sat, 29 Dec 2018 17:30:31 +0000 (17:30 +0000)]
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
Rin Toshaka [Sat, 29 Dec 2018 16:45:50 +0000 (17:45 +0100)]
I am not sure what's going on anymore so I'll just commit and reset all the other files to HEAD
lambda [Sat, 29 Dec 2018 13:47:45 +0000 (13:47 +0000)]
Merge branch '2018-12-29-update-frontend' into 'develop'
update frontend
See merge request pleroma/pleroma!606
lain [Sat, 29 Dec 2018 13:30:44 +0000 (14:30 +0100)]
update frontend
kaniini [Sat, 29 Dec 2018 11:46:06 +0000 (11:46 +0000)]
Merge branch 'carrot-bullying' into 'develop'
Add some hard limits on inserted activities.
See merge request pleroma/pleroma!595
spctrl [Sat, 29 Dec 2018 11:43:54 +0000 (12:43 +0100)]
Change 'name' to 'instance_name' so option is used when running non-interactive
kaniini [Sat, 29 Dec 2018 11:34:51 +0000 (11:34 +0000)]
Merge branch '483_blocks_import_export' into 'develop'
[#483] Blocked users list import & export
Closes #483
See merge request pleroma/pleroma!603
kaniini [Sat, 29 Dec 2018 11:32:24 +0000 (11:32 +0000)]
Merge branch 'support/issue_480' into 'develop'
[#480] Salmon# fixed publish an activity to remote accounts
See merge request pleroma/pleroma!605
Maksim Pechnikov [Sat, 29 Dec 2018 09:48:54 +0000 (12:48 +0300)]
Salmon# fixed publish an activity to remote accounts
Ivan Tashkinov [Sat, 29 Dec 2018 09:26:23 +0000 (12:26 +0300)]
[#483] User.get_by_nickname/1: ensured case-insensitive matching for local FQN. Added tests.
Ivan Tashkinov [Sat, 29 Dec 2018 09:26:23 +0000 (12:26 +0300)]
[#483] User.get_by_nickname/1: ensured case-insensitive matching for local FQN. Added tests.
Ivan Tashkinov [Sat, 29 Dec 2018 09:15:46 +0000 (12:15 +0300)]
[#483] User.get_by_nickname/1: allowed retrieving user by fully-qualified local nickname
(<nick>@<our_instance_host>).
Ivan Tashkinov [Sat, 29 Dec 2018 09:02:37 +0000 (12:02 +0300)]
[#483] Refactored blocks and follows import, added tests.
kaniini [Sat, 29 Dec 2018 03:03:18 +0000 (03:03 +0000)]
Merge branch '471_invalid_accounts_rendering' into 'develop'
[#471] Prevented rendering of inactive local accounts
Closes #471
See merge request pleroma/pleroma!599
kaniini [Fri, 28 Dec 2018 20:14:29 +0000 (20:14 +0000)]
Merge branch 'systemd-drop-sysadmin-privilege' into 'develop'
Security/Drops the sysadmin privilege from the daemon
See merge request pleroma/pleroma!604
projects / akkoma / log