Shpuld Shpuldson [Mon, 11 Mar 2019 13:10:42 +0000 (15:10 +0200)]
Remove chromium input hilight that clashes with our own
Shpuld Shpuldson [Mon, 11 Mar 2019 12:57:04 +0000 (14:57 +0200)]
Style again the login page to fit pleroma more
rinpatch [Mon, 11 Mar 2019 05:27:14 +0000 (05:27 +0000)]
Merge branch 'patch-2' into 'develop'
[Doc] Rename Mastalab -> Fedilab in Clients.md
See merge request pleroma/pleroma!918
Hakaba Hitoyo [Mon, 11 Mar 2019 01:40:34 +0000 (01:40 +0000)]
Rename Mastalab -> Fedilab in Clients.md
kaniini [Fri, 8 Mar 2019 23:02:55 +0000 (23:02 +0000)]
Merge branch 'bugfix/tesla-safety' into 'develop'
tesla hardening
Closes #712 and #672
See merge request pleroma/pleroma!912
William Pitcock [Fri, 8 Mar 2019 22:59:10 +0000 (22:59 +0000)]
http: connection: unify adapter configuration and defaults
William Pitcock [Fri, 8 Mar 2019 22:50:43 +0000 (22:50 +0000)]
http: connection: relax the timeouts a little
William Pitcock [Thu, 7 Mar 2019 23:49:02 +0000 (23:49 +0000)]
http: rework connection timeouts to match hackney docs, enforce 1 second max TCP connection timeout
William Pitcock [Thu, 7 Mar 2019 23:32:58 +0000 (23:32 +0000)]
http: actually pass the options list to the Connection factory
William Pitcock [Thu, 7 Mar 2019 23:31:59 +0000 (23:31 +0000)]
http: connection: merge hackney option lists instead of concatenating them
this ensures the right pools are used
William Pitcock [Thu, 7 Mar 2019 23:18:59 +0000 (23:18 +0000)]
http: safely catch erlang exits and elixir errors from hackney (ref #672)
kaniini [Fri, 8 Mar 2019 22:53:12 +0000 (22:53 +0000)]
Merge branch 'fix-tlsv1.3' into 'develop'
Fix supported TLS versions as TLS 1.3 support seems buggy.
Closes #708
See merge request pleroma/pleroma!892
kaniini [Fri, 8 Mar 2019 22:47:41 +0000 (22:47 +0000)]
Merge branch 'delete-status' into 'develop'
Allow an admin to delete a user status #721 (MastoAPI)
See merge request pleroma/pleroma!914
kaniini [Fri, 8 Mar 2019 22:33:31 +0000 (22:33 +0000)]
Merge branch 'fetch-posts-on-first-federation' into 'develop'
Fetch user's outbox posts on first federation with that user
Closes #131
See merge request pleroma/pleroma!907
eugenijm [Fri, 8 Mar 2019 17:21:56 +0000 (20:21 +0300)]
Allow an admin to delete a user status
Ekaterina Vaartis [Fri, 8 Mar 2019 13:26:16 +0000 (16:26 +0300)]
Add tests for fetch_ordered_collection
Ekaterina Vaartis [Wed, 6 Mar 2019 21:13:26 +0000 (00:13 +0300)]
Fetch user's outbox posts on first federation with that user
kaniini [Fri, 8 Mar 2019 00:42:17 +0000 (00:42 +0000)]
Merge branch 'update-mastofe/glitch-soc-2019-03-07' into 'develop'
Update Mastodon Frontend to 2019-03-07 bundle
See merge request pleroma/pleroma!911
Haelwenn (lanodan) Monnier [Thu, 7 Mar 2019 10:56:02 +0000 (11:56 +0100)]
Update Mastodon Frontend to 2019-03-07 bundle
See: https://git.pleroma.social/pleroma/mastofe/tags/bundle-2019-03-07
[ci skip]
rinpatch [Thu, 7 Mar 2019 16:42:05 +0000 (16:42 +0000)]
Merge branch 'bugfix/mrf-antifollowbot-nil-bio' into 'develop'
MRF: anti followbot: gracefully handle nil display names
See merge request pleroma/pleroma!909
kaniini [Thu, 7 Mar 2019 13:36:50 +0000 (13:36 +0000)]
Merge branch 'update/pleroma-fe-
20190307' into 'develop'
update pleroma frontend
See merge request pleroma/pleroma!910
William Pitcock [Thu, 7 Mar 2019 13:31:03 +0000 (13:31 +0000)]
update pleroma frontend
William Pitcock [Thu, 7 Mar 2019 12:20:04 +0000 (12:20 +0000)]
tests: add regression test
William Pitcock [Thu, 7 Mar 2019 12:13:48 +0000 (12:13 +0000)]
MRF: anti followbot: gracefully handle accounts without a display name
rinpatch [Thu, 7 Mar 2019 11:31:08 +0000 (11:31 +0000)]
Merge branch 'bugfix/delete-activity-audience' into 'develop'
expand the audience of delete activities to all recipients of the deleted object
Closes #682
See merge request pleroma/pleroma!891
Karen Konou [Thu, 7 Mar 2019 11:26:03 +0000 (12:26 +0100)]
Adjust delete activity audience to match the deleted object
Karen Konou [Thu, 7 Mar 2019 10:53:15 +0000 (11:53 +0100)]
Revert existing object check
lambda [Thu, 7 Mar 2019 09:33:54 +0000 (09:33 +0000)]
Merge branch 'preserve-link-headers' into 'develop'
Preserves parameters in link headers
Closes #716
See merge request pleroma/pleroma!908
eugenijm [Thu, 7 Mar 2019 02:29:42 +0000 (05:29 +0300)]
Preserve parameters in link headers (Mastodon API)
kaniini [Wed, 6 Mar 2019 22:27:42 +0000 (22:27 +0000)]
Merge branch 'chore/merge-search-into-list-users' into 'develop'
Merge search endpoint into /users
See merge request pleroma/pleroma!898
kaniini [Wed, 6 Mar 2019 13:22:02 +0000 (13:22 +0000)]
Merge branch 'bugfix/connect-src-https' into 'develop'
Plugs.HTTPSecurityPlug: Add static_url to CSP's connect-src
See merge request pleroma/pleroma!900
kaniini [Wed, 6 Mar 2019 13:20:51 +0000 (13:20 +0000)]
Merge branch 'bugfix/rel-me_list' into 'develop'
Web.RelMe: Fix having other values in rel attr
See merge request pleroma/pleroma!901
kaniini [Wed, 6 Mar 2019 13:20:12 +0000 (13:20 +0000)]
Merge branch 'feature/647' into 'develop'
[#647] tests for web push
See merge request pleroma/pleroma!904
Maksim [Wed, 6 Mar 2019 13:20:12 +0000 (13:20 +0000)]
[#647] tests for web push
kaniini [Wed, 6 Mar 2019 13:19:26 +0000 (13:19 +0000)]
Merge branch 'features/masto_fe-config' into 'develop'
Add default config for masto_fe
See merge request pleroma/pleroma!906
Maxim Filippov [Wed, 6 Mar 2019 02:01:38 +0000 (05:01 +0300)]
Keep heading short
Haelwenn [Wed, 6 Mar 2019 01:45:17 +0000 (01:45 +0000)]
Merge branch 'fix/escape-reserved-chars-in-filenames' into 'develop'
Properly escape reserved URI charachters in upload urls
Closes #700
See merge request pleroma/pleroma!905
Haelwenn (lanodan) Monnier [Wed, 6 Mar 2019 01:25:13 +0000 (02:25 +0100)]
Add default config for masto_fe
Related to: https://git.pleroma.social/pleroma/mastofe/merge_requests/22
Karen Konou [Tue, 5 Mar 2019 22:15:22 +0000 (23:15 +0100)]
Add handling of objects not in database
rinpatch [Tue, 5 Mar 2019 16:28:58 +0000 (19:28 +0300)]
Add tests for reserved char escaping in upload
rinpatch [Tue, 5 Mar 2019 15:09:23 +0000 (18:09 +0300)]
Properly escape reserved URI charachters in upload urls
rinpatch [Tue, 5 Mar 2019 07:05:44 +0000 (07:05 +0000)]
Merge branch 'add-admin-to-node-info' into 'develop'
Include admins in nodeinfo
Closes #689
See merge request pleroma/pleroma!899
Haelwenn (lanodan) Monnier [Tue, 5 Mar 2019 01:03:44 +0000 (02:03 +0100)]
Web.RelMe: Fix having other values in rel attr
One example of this is Github which puts a rel="nofollow me" on the
profile link.
Haelwenn (lanodan) Monnier [Tue, 5 Mar 2019 00:44:24 +0000 (01:44 +0100)]
Plugs.HTTPSecurityPlug: Add static_url to CSP's connect-src
Closes: https://git.pleroma.social/pleroma/pleroma/merge_requests/469
Haelwenn [Tue, 5 Mar 2019 00:33:04 +0000 (00:33 +0000)]
Merge branch 'bugfix/rich-media-uri-validation' into 'develop'
rich media: don't crawl bogus URIs
See merge request pleroma/pleroma!864
eugenijm [Mon, 4 Mar 2019 19:14:04 +0000 (22:14 +0300)]
Include admins in nodeinfo
Maxim Filippov [Mon, 4 Mar 2019 23:11:15 +0000 (02:11 +0300)]
Typo
William Pitcock [Mon, 4 Mar 2019 18:38:23 +0000 (18:38 +0000)]
rich media: helpers: rework validate_page_url()
Maxim Filippov [Mon, 4 Mar 2019 18:36:47 +0000 (21:36 +0300)]
local -> only_local
Maxim Filippov [Mon, 4 Mar 2019 18:33:53 +0000 (21:33 +0300)]
Format & update docs
William Pitcock [Sat, 2 Mar 2019 12:22:02 +0000 (12:22 +0000)]
helpers: use AutoLinker to validate URIs as well as the other tests
William Pitcock [Sun, 24 Feb 2019 19:39:27 +0000 (19:39 +0000)]
tests: add tests for rich media helper functions
William Pitcock [Sun, 24 Feb 2019 19:13:46 +0000 (19:13 +0000)]
rich media: don't crawl bogus URIs
kaniini [Mon, 4 Mar 2019 18:29:13 +0000 (18:29 +0000)]
Merge branch 'feature/add-status-text-to-notifications' into 'develop'
Add status text to notifications (mentions and reposts)
Closes #696
See merge request pleroma/pleroma!897
Maxim Filippov [Mon, 4 Mar 2019 18:26:32 +0000 (21:26 +0300)]
Merge search endpoint into /users
Maxim Filippov [Mon, 4 Mar 2019 17:49:20 +0000 (20:49 +0300)]
Remove unused code
Maxim Filippov [Mon, 4 Mar 2019 17:47:34 +0000 (20:47 +0300)]
Add status text to notifications (mentions and reposts)
kaniini [Mon, 4 Mar 2019 15:59:57 +0000 (15:59 +0000)]
Merge branch 'fix/like-adressing' into 'develop'
Stop adresssing like activities to actor's follower collection on non-public posts
See merge request pleroma/pleroma!896
rinpatch [Mon, 4 Mar 2019 15:09:58 +0000 (18:09 +0300)]
Stop adresssing like activities to actor's follower collection on non-public posts
kaniini [Mon, 4 Mar 2019 13:25:32 +0000 (13:25 +0000)]
Merge branch 'unify-follow' into 'develop'
Unify follow code with CommonAPI
Closes #690
See merge request pleroma/pleroma!889
kaniini [Mon, 4 Mar 2019 13:20:17 +0000 (13:20 +0000)]
Merge branch 'dm-visibility-for-blocking-users' into 'develop'
Fix DM visibility for blocking users #698
Closes #698
See merge request pleroma/pleroma!890
KokaKiwi [Sun, 3 Mar 2019 17:33:02 +0000 (18:33 +0100)]
Fix supported TLS versions as TLS 1.3 support seems buggy.
Karen Konou [Mon, 4 Mar 2019 10:22:17 +0000 (11:22 +0100)]
Merge branch 'bugfix/delete-activity-audience' of git.pleroma.social:pleroma/pleroma into bugfix/delete-activity-audience
Karen Konou [Mon, 4 Mar 2019 10:18:16 +0000 (11:18 +0100)]
fix format
Karen Konou [Mon, 4 Mar 2019 09:47:04 +0000 (10:47 +0100)]
Expand "to" of delete activities
Karen Konou [Mon, 4 Mar 2019 09:47:04 +0000 (10:47 +0100)]
Expand "to" of delete activities
eugenijm [Sun, 3 Mar 2019 23:59:54 +0000 (02:59 +0300)]
Fix DM visibility for blocking users
eugenijm [Sun, 3 Mar 2019 21:50:00 +0000 (00:50 +0300)]
Unify Mastodon and Twitter follow implementations using CommonAPI
kaniini [Sun, 3 Mar 2019 21:10:10 +0000 (21:10 +0000)]
Merge branch 'muting' into 'develop'
Don't stream muted accounts
See merge request pleroma/pleroma!888
William Pearson [Sun, 20 Jan 2019 04:28:34 +0000 (04:28 +0000)]
Don't stream muted accounts
rinpatch [Sun, 3 Mar 2019 17:39:46 +0000 (17:39 +0000)]
Merge branch 'remove-todo-txt' into 'develop'
Remove TODO.txt
See merge request pleroma/pleroma!887
rinpatch [Sun, 3 Mar 2019 17:32:46 +0000 (20:32 +0300)]
Remove TODO.txt
kaniini [Sun, 3 Mar 2019 16:00:49 +0000 (16:00 +0000)]
Merge branch 'features/bio_rel_me' into 'develop'
Add rel=me to the User bio
Closes #423
See merge request pleroma/pleroma!813
kaniini [Sun, 3 Mar 2019 15:59:15 +0000 (15:59 +0000)]
Merge branch 'feature/add-pagination-to-users-admin-api' into 'develop'
Add pagination and search to users
See merge request pleroma/pleroma!873
kaniini [Sun, 3 Mar 2019 15:51:32 +0000 (15:51 +0000)]
Merge branch 'get-follow-requests-sql' into 'develop'
Use sql query in User.get_follow_requests/1 for filtering logic
See merge request pleroma/pleroma!883
kaniini [Sun, 3 Mar 2019 15:50:41 +0000 (15:50 +0000)]
Merge branch 'atomic-note-count-updates' into 'develop'
Atomic update for note count and follower count
See merge request pleroma/pleroma!885
kaniini [Sun, 3 Mar 2019 15:49:19 +0000 (15:49 +0000)]
Merge branch 'count-only-public-statuses' into 'develop'
Increment user note count only on public activities #703
See merge request pleroma/pleroma!884
kaniini [Sun, 3 Mar 2019 15:48:00 +0000 (15:48 +0000)]
Merge branch 'remove-follow-request-count' into 'develop'
Remove follow_request_count as it's not needed for FE anymore.
See merge request pleroma/pleroma!886
eugenijm [Sun, 3 Mar 2019 15:39:37 +0000 (18:39 +0300)]
Remove follow_request_count as it's not needed for FE anymore.
MastoFE uses `GET /api/v1/follow_requests` and PleromaFE uses
`GET /api/pleroma/friend_requests` which they query on the initial page
load.
eugenijm [Sun, 3 Mar 2019 14:27:09 +0000 (17:27 +0300)]
Use atomic update for note count and follower count
eugenijm [Sun, 3 Mar 2019 12:35:32 +0000 (15:35 +0300)]
Added migration to update existing user note counters
lambda [Sun, 3 Mar 2019 11:13:59 +0000 (11:13 +0000)]
Merge branch 'fix/dont-show-dms-in-mentions-timeline' into 'develop'
[#675] Do not show DMs in mentions timeline
See merge request pleroma/pleroma!877
eugenijm [Sun, 3 Mar 2019 10:21:03 +0000 (13:21 +0300)]
Increment user note count only on public activities
eugenijm [Sat, 2 Mar 2019 19:18:51 +0000 (22:18 +0300)]
Use sql query in User.get_follow_requests/1 for filtering logic
Maxim Filippov [Sat, 2 Mar 2019 14:32:46 +0000 (17:32 +0300)]
Add docs
Maxim Filippov [Sat, 2 Mar 2019 14:32:40 +0000 (17:32 +0300)]
We do not guarantee the order of elements when we search
Maxim Filippov [Sat, 2 Mar 2019 14:21:18 +0000 (17:21 +0300)]
Add pagination to search
rinpatch [Sat, 2 Mar 2019 06:39:07 +0000 (06:39 +0000)]
Merge branch 'bugfix/oauth-scopes-join' into 'develop'
Bugfix: OAuth scopes formatting
Closes #702
See merge request pleroma/pleroma!881
Haelwenn (lanodan) Monnier [Sat, 2 Mar 2019 06:04:49 +0000 (07:04 +0100)]
Pleroma.User: mix format
Haelwenn (lanodan) Monnier [Sat, 2 Mar 2019 05:59:09 +0000 (06:59 +0100)]
Pleroma.UserTest: Add tests for rel=me
Haelwenn (lanodan) Monnier [Sat, 2 Mar 2019 05:58:42 +0000 (06:58 +0100)]
RelMe.maybe_put_rel_me/2: When true put "me" otherwise nil
Haelwenn (lanodan) Monnier [Sat, 2 Mar 2019 05:57:28 +0000 (06:57 +0100)]
Pleroma.User: Fix syntax and user.ap_id call
Haelwenn (lanodan) Monnier [Sat, 2 Mar 2019 05:33:15 +0000 (06:33 +0100)]
Pleroma.User: Pass an array to profile_urls
Haelwenn (lanodan) Monnier [Sat, 2 Mar 2019 05:32:03 +0000 (06:32 +0100)]
Pleroma.Web.RelMe: fixups
Haelwenn (lanodan) Monnier [Sat, 2 Mar 2019 05:13:04 +0000 (06:13 +0100)]
Pleroma.Web.RelMeTest: Add test against Pleroma.Web.RelMe
Haelwenn (lanodan) Monnier [Mon, 11 Feb 2019 21:27:02 +0000 (22:27 +0100)]
Pleroma.User: Add rel=me to URLs where it linkbacks to the profile
Haelwenn (lanodan) Monnier [Sat, 2 Mar 2019 03:10:43 +0000 (04:10 +0100)]
Web.OAuth.OAuthControllerTest: Add test against token formatting
Haelwenn (lanodan) Monnier [Sat, 2 Mar 2019 03:04:16 +0000 (04:04 +0100)]
Web.OAuth.OAuthController: Fix scopes Enum.join for OAuth response
Maxim Filippov [Fri, 1 Mar 2019 18:17:20 +0000 (21:17 +0300)]
Refactor a little bit
Maxim Filippov [Fri, 1 Mar 2019 18:07:05 +0000 (21:07 +0300)]
Format
projects / akkoma / log