kaniini [Thu, 10 Jan 2019 01:08:33 +0000 (01:08 +0000)]
Merge branch 'fix-alphasort' into 'develop'
Alpha sort the restricted nicknames
See merge request pleroma/pleroma!650
Mark Felder [Thu, 10 Jan 2019 00:06:03 +0000 (00:06 +0000)]
Alpha sort the restricted nicknames
rinpatch [Wed, 9 Jan 2019 18:42:00 +0000 (18:42 +0000)]
Merge branch 'hotfix/ogp-cachex-fix' into 'develop'
Rich media: Remove :commit since a tuple is already returned
See merge request pleroma/pleroma!649
rinpatch [Wed, 9 Jan 2019 18:35:01 +0000 (21:35 +0300)]
Remove :commit since a tuple is already returned
lambda [Wed, 9 Jan 2019 16:26:38 +0000 (16:26 +0000)]
Merge branch 'scarlett/pleroma-summary-html-api' into 'develop'
Scarlett/pleroma summary html api
See merge request pleroma/pleroma!647
lain [Wed, 9 Jan 2019 16:18:37 +0000 (17:18 +0100)]
Add test for summary_html
kaniini [Wed, 9 Jan 2019 07:09:39 +0000 (07:09 +0000)]
Merge branch 'hotfix/media-proxy-uri' into 'develop'
user: fix local vs remote determination in remote_or_auth_active?/1
See merge request pleroma/pleroma!640
William Pitcock [Wed, 9 Jan 2019 07:03:32 +0000 (07:03 +0000)]
test: user: add tests for visible_for?/2
William Pitcock [Wed, 9 Jan 2019 06:50:31 +0000 (06:50 +0000)]
tests: user: add tests for superuser?/1
William Pitcock [Wed, 9 Jan 2019 06:45:17 +0000 (06:45 +0000)]
user: fix auth_active?/1 for remote users
William Pitcock [Wed, 9 Jan 2019 06:41:25 +0000 (06:41 +0000)]
user: factor out illogical User.Info.superuser?/1.
any actual callee will be dealing with a User struct to begin with, so
just check the child struct inside User.superuser?/1 with pattern matching.
William Pitcock [Wed, 9 Jan 2019 06:36:50 +0000 (06:36 +0000)]
user: remove entirely redundant remote_or_auth_active?/1.
auth_active?/1 can check remote users and return true directly.
William Pitcock [Wed, 9 Jan 2019 06:21:21 +0000 (06:21 +0000)]
user: harden auth_active?/1, superuser?/1, visible_for?/1
William Pitcock [Wed, 9 Jan 2019 05:02:00 +0000 (05:02 +0000)]
tests: user: add regression test for remote_or_auth_active?/1
William Pitcock [Wed, 9 Jan 2019 04:46:03 +0000 (04:46 +0000)]
user: use pattern matching to determine if user is local or remote instead of the previous hairy logic
rinpatch [Tue, 8 Jan 2019 22:58:19 +0000 (22:58 +0000)]
Merge branch 'autofollow' into 'develop'
Add a setting for users to autofollow on sign up.
See merge request pleroma/pleroma!639
lain [Tue, 8 Jan 2019 08:55:33 +0000 (09:55 +0100)]
Add a setting for users to autofollow on sign up.
kaniini [Mon, 7 Jan 2019 22:25:02 +0000 (22:25 +0000)]
Merge branch 'features/syslog_logger' into 'develop'
Add logging to syslog
See merge request pleroma/pleroma!622
kaniini [Mon, 7 Jan 2019 20:39:46 +0000 (20:39 +0000)]
Merge branch 'spc-fix-2' into 'develop'
Actually put some onformation in the error user, make it actually properly parse in conversations.
See merge request pleroma/pleroma!638
lain [Mon, 7 Jan 2019 19:59:30 +0000 (20:59 +0100)]
Actually put some onformation in the error user, make it actually properly parse
in conversations.
kaniini [Mon, 7 Jan 2019 17:09:52 +0000 (17:09 +0000)]
Merge branch 'resilient-user-view' into 'develop'
Make TwAPI UserView more resilient to issues.
See merge request pleroma/pleroma!634
lambda [Mon, 7 Jan 2019 12:20:15 +0000 (12:20 +0000)]
Merge branch 'scarlett/pleroma-search-visibility-check' into 'develop'
Scarlett/pleroma search visibility check
See merge request pleroma/pleroma!635
lain [Mon, 7 Jan 2019 12:13:37 +0000 (13:13 +0100)]
MastoAPI: Add test.
lain [Mon, 7 Jan 2019 11:41:31 +0000 (12:41 +0100)]
Make TwAPI UserView more resilient to issues.
Will work for missing users and badly migrated users.
scarlett [Mon, 7 Jan 2019 10:30:30 +0000 (10:30 +0000)]
Check visible_for_user when performing a search using a direct link.
scarlett [Sun, 6 Jan 2019 10:16:40 +0000 (10:16 +0000)]
Twitter API: Add a summary_html field.
The intention here is to allow proper subject copying when it contains
emoji, obviously this will require minor frontend changes, though.
Haelwenn (lanodan) Monnier [Wed, 2 Jan 2019 22:07:48 +0000 (23:07 +0100)]
config/config.exs: Add syslog backends
Haelwenn (lanodan) Monnier [Wed, 2 Jan 2019 21:57:37 +0000 (22:57 +0100)]
Install ex_syslogger
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
projects / akkoma / log