Mark Felder [Thu, 9 Jul 2020 15:53:51 +0000 (10:53 -0500)]
Use the Pleroma.Config alias
feld [Thu, 9 Jul 2020 14:33:24 +0000 (14:33 +0000)]
Merge branch 'fix/csp-for-captcha' into 'develop'
Add Captcha endpoint to CSP headers when MediaProxy is enabled.
See merge request pleroma/pleroma!2718
Mark Felder [Thu, 9 Jul 2020 14:08:59 +0000 (09:08 -0500)]
Merge branch 'develop' into fix/csp-for-captcha
lain [Thu, 9 Jul 2020 13:10:05 +0000 (13:10 +0000)]
Merge branch '1723-token-fixes' into 'develop'
AccountController: Return scope in proper format.
Closes #1723
See merge request pleroma/pleroma!2694
lain [Thu, 9 Jul 2020 13:09:31 +0000 (13:09 +0000)]
Merge branch 'features/favicons' into 'develop'
Add support for remote favicons
See merge request pleroma/pleroma!2261
Haelwenn [Thu, 9 Jul 2020 12:10:26 +0000 (12:10 +0000)]
Merge branch '1925-muting-reblogs' into 'develop'
AccountController: Fix muting / unmuting reblogs.
Closes #1925
See merge request pleroma/pleroma!2732
Haelwenn [Thu, 9 Jul 2020 10:32:24 +0000 (10:32 +0000)]
Merge branch 'follow-pipeline' into 'develop'
Handle `Follow` activities with the pipeline
See merge request pleroma/pleroma!2734
Haelwenn [Thu, 9 Jul 2020 09:50:08 +0000 (09:50 +0000)]
Merge branch 'patch-2' into 'develop'
fix wide2x emojis within nicknames
See merge request pleroma/pleroma!2737
lain [Thu, 9 Jul 2020 09:42:39 +0000 (09:42 +0000)]
Merge branch 'patch-1' into 'develop'
added link to changelog, removed repetition
See merge request pleroma/pleroma!2736
lain [Thu, 9 Jul 2020 09:37:52 +0000 (09:37 +0000)]
Merge branch 'bugfix/status-deletion' into 'develop'
#1920 fix activity deletion
See merge request pleroma/pleroma!2721
Dym Sohin [Thu, 9 Jul 2020 09:37:50 +0000 (09:37 +0000)]
[static-fe] limit according to- and within- existing ruleset
lain [Thu, 9 Jul 2020 09:31:15 +0000 (09:31 +0000)]
Merge branch 'issue/1880' into 'develop'
[#1880] fixed delete `Like` activity in remove user
See merge request pleroma/pleroma!2725
lain [Thu, 9 Jul 2020 09:30:15 +0000 (09:30 +0000)]
Update static-fe.css
lain [Thu, 9 Jul 2020 09:25:10 +0000 (09:25 +0000)]
Merge branch 'patch-3' into 'develop'
missed `:` (colon) before mrf_steal_emoji
See merge request pleroma/pleroma!2738
Dym Sohin [Thu, 9 Jul 2020 09:23:21 +0000 (09:23 +0000)]
missed `:` (colon) before mrf_steal_emoji
Dym Sohin [Thu, 9 Jul 2020 09:03:24 +0000 (09:03 +0000)]
fix wide2x emojis within nicknames
Maksim Pechnikov [Thu, 9 Jul 2020 04:16:52 +0000 (07:16 +0300)]
fix test
Dym Sohin [Thu, 9 Jul 2020 03:15:51 +0000 (03:15 +0000)]
added link to changelog, removed repetition
lain [Wed, 8 Jul 2020 15:07:24 +0000 (17:07 +0200)]
ActivityPub: Remove `follow` and fix issues.
lain [Wed, 8 Jul 2020 13:40:56 +0000 (15:40 +0200)]
CommonAPI: Switch to pipeline for following.
lain [Wed, 8 Jul 2020 12:30:53 +0000 (14:30 +0200)]
Transmogrifier: Move following to the pipeline.
lain [Wed, 8 Jul 2020 12:29:29 +0000 (14:29 +0200)]
Notification: For follows, notify the followed.
lain [Wed, 8 Jul 2020 11:23:07 +0000 (13:23 +0200)]
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into follow-pipeline
lain [Wed, 8 Jul 2020 11:21:58 +0000 (13:21 +0200)]
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into issue/1880
lain [Wed, 8 Jul 2020 10:55:03 +0000 (10:55 +0000)]
Merge branch '1895-hashtag-timeline-restrict-unauthenticated-fix' into 'develop'
[#1895] Made hashtag timeline respect `:restrict_unauthenticated` instance setting
Closes #1895
See merge request pleroma/pleroma!2731
Ivan Tashkinov [Wed, 8 Jul 2020 09:54:23 +0000 (12:54 +0300)]
[#1895] credo fix.
lain [Wed, 8 Jul 2020 09:52:29 +0000 (11:52 +0200)]
AccountController: Fix muting / unmuting reblogs.
Ivan Tashkinov [Wed, 8 Jul 2020 09:36:44 +0000 (12:36 +0300)]
[#1895] Applied code review suggestion.
Maksim Pechnikov [Tue, 7 Jul 2020 06:10:02 +0000 (09:10 +0300)]
fixed delete `Like` activity in remove user
Haelwenn (lanodan) Monnier [Wed, 8 Jul 2020 04:09:39 +0000 (06:09 +0200)]
Add changelog and documentation
Haelwenn (lanodan) Monnier [Wed, 8 Jul 2020 03:56:24 +0000 (05:56 +0200)]
Add [:instances_favicons, :enabled] setting, defaults to false
Haelwenn (lanodan) Monnier [Tue, 7 Jul 2020 10:07:30 +0000 (12:07 +0200)]
instance: Prevent loop of updates
Haelwenn (lanodan) Monnier [Tue, 7 Jul 2020 09:13:38 +0000 (11:13 +0200)]
Use instances table instead of Cachex
Haelwenn (lanodan) Monnier [Mon, 2 Mar 2020 04:38:25 +0000 (05:38 +0100)]
Move get_favicon to Pleroma.Instances, use /
Haelwenn (lanodan) Monnier [Sun, 1 Mar 2020 08:48:32 +0000 (09:48 +0100)]
Add support for remote favicons
Haelwenn [Wed, 8 Jul 2020 03:25:30 +0000 (03:25 +0000)]
Merge branch '1918-avatar-background-header-reset-2' into 'develop'
Resolve "Better support for resetting avatar/header/background"
Closes #1918
See merge request pleroma/pleroma!2729
Haelwenn [Wed, 8 Jul 2020 03:05:20 +0000 (03:05 +0000)]
Merge branch 'fix/twitter-rich-media-preview' into 'develop'
Add "Bot" to User Agent to coerce Twitter into serving OGP <meta> tags.
Closes #1923
See merge request pleroma/pleroma!2730
lain [Tue, 7 Jul 2020 18:26:07 +0000 (18:26 +0000)]
Merge branch 'remove-twitter-api' into 'develop'
Remove some TwitterAPI endpoints
See merge request pleroma/pleroma!2327
Ivan Tashkinov [Tue, 7 Jul 2020 17:44:16 +0000 (20:44 +0300)]
[#1895] Documentation hints on private instances and instance/restrict_unauthenticated setting.
Ivan Tashkinov [Tue, 7 Jul 2020 17:37:11 +0000 (20:37 +0300)]
[#1895] Made hashtag timeline respect `:restrict_unauthenticated` instance setting.
Mark Felder [Tue, 7 Jul 2020 16:21:05 +0000 (11:21 -0500)]
Add "Bot" to User Agent to coerce Twitter into serving OGP <meta> tags.
lain [Tue, 7 Jul 2020 15:13:23 +0000 (17:13 +0200)]
Update frontend
lain [Tue, 7 Jul 2020 14:51:44 +0000 (16:51 +0200)]
Changelog: Add info about avatar removal
lain [Tue, 7 Jul 2020 14:48:47 +0000 (16:48 +0200)]
AccountController: Remove unused `update_?` routes.
These were not documented and are also not used anymore.
lain [Tue, 7 Jul 2020 14:26:57 +0000 (16:26 +0200)]
Docs: Document resetting of images
lain [Tue, 7 Jul 2020 14:20:50 +0000 (16:20 +0200)]
AccountController: Allow removal / reset of user images.
lain [Tue, 7 Jul 2020 11:41:56 +0000 (11:41 +0000)]
Merge branch 'develop' into 'develop'
added hyper:// to default protocols
See merge request pleroma/pleroma!2727
lain [Tue, 7 Jul 2020 09:14:50 +0000 (09:14 +0000)]
Merge branch 'bugfix/peertube-videos' into 'develop'
Fix getting videos from peertube
See merge request pleroma/pleroma!2728
Haelwenn [Tue, 7 Jul 2020 08:23:49 +0000 (08:23 +0000)]
Merge branch 'feature/1392-support-irreversible-filters' into 'develop'
Updates for Feature/1392 support irreversible filters
Closes #1392
See merge request pleroma/pleroma!2186
Haelwenn (lanodan) Monnier [Mon, 25 May 2020 11:13:42 +0000 (13:13 +0200)]
Fix getting videos from peertube
DYM [Tue, 7 Jul 2020 07:05:54 +0000 (09:05 +0200)]
added hyper:// to default protocols
Haelwenn [Tue, 7 Jul 2020 03:00:52 +0000 (03:00 +0000)]
Merge branch 'description-limits' into 'develop'
Add limits to image descriptions
See merge request pleroma/pleroma!2724
Haelwenn [Tue, 7 Jul 2020 00:04:24 +0000 (00:04 +0000)]
Merge branch '1507-static-fe-prioritize-json' into 'develop'
StaticFE: Prioritize json in requests.
Closes #1507
See merge request pleroma/pleroma!2695
Mark Felder [Mon, 6 Jul 2020 16:28:08 +0000 (11:28 -0500)]
IO list, not concatenation
Mark Felder [Mon, 6 Jul 2020 15:59:41 +0000 (10:59 -0500)]
Simplify the logic
lain [Mon, 6 Jul 2020 13:57:19 +0000 (15:57 +0200)]
FollowValidator: Add basic validation.
lain [Mon, 6 Jul 2020 13:44:35 +0000 (15:44 +0200)]
BlockValidation test: Rename.
lain [Mon, 6 Jul 2020 13:14:58 +0000 (15:14 +0200)]
ObjectValidator tests: Extract block validation tests.
lain [Mon, 6 Jul 2020 13:13:11 +0000 (15:13 +0200)]
ObjectValidator tests: Extract update validation tests.
lain [Mon, 6 Jul 2020 13:11:49 +0000 (15:11 +0200)]
ObjectValidation tests: Extract announce validation tests.
lain [Mon, 6 Jul 2020 13:09:41 +0000 (15:09 +0200)]
ObjectValidator tests: Extract undo validation tests.
lain [Mon, 6 Jul 2020 13:08:11 +0000 (15:08 +0200)]
ObjectValidation tests: Extract like validation tests.
lain [Mon, 6 Jul 2020 13:05:02 +0000 (15:05 +0200)]
ObjectValidation tests: Extract delete validation tests.
lain [Mon, 6 Jul 2020 13:02:35 +0000 (15:02 +0200)]
ObjectValidator tests: Extract emoji react testing
lain [Mon, 6 Jul 2020 11:01:44 +0000 (13:01 +0200)]
ObjectValidator tests: Extract chat tests
lain [Mon, 6 Jul 2020 10:59:06 +0000 (12:59 +0200)]
ObjectValidator Test: Extract attachments.
lain [Mon, 6 Jul 2020 10:25:25 +0000 (12:25 +0200)]
Config: Remove Statusnet preloader.
lain [Mon, 6 Jul 2020 10:24:45 +0000 (12:24 +0200)]
Preloaders: Remove status_net preloader
lain [Mon, 6 Jul 2020 10:20:20 +0000 (12:20 +0200)]
Update frontend
lain [Mon, 6 Jul 2020 10:17:08 +0000 (12:17 +0200)]
Update frontend
lain [Mon, 6 Jul 2020 10:15:59 +0000 (12:15 +0200)]
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into remove-twitter-api
lain [Mon, 6 Jul 2020 10:11:10 +0000 (12:11 +0200)]
StaticFE Plug: Use phoenix helper to get the requested format.
lain [Mon, 6 Jul 2020 10:07:56 +0000 (12:07 +0200)]
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into 1507-static-fe-prioritize-json
rinpatch [Mon, 6 Jul 2020 09:21:03 +0000 (09:21 +0000)]
Merge branch '1915-dont-filter-announce-notifications' into 'develop'
Streamer: Don't filter out announce notifications.
Closes #1915
See merge request pleroma/pleroma!2719
lain [Mon, 6 Jul 2020 09:20:10 +0000 (09:20 +0000)]
Merge branch 'filter-tesla-config' into 'develop'
Filter tesla config
See merge request pleroma/pleroma!2722
lain [Mon, 6 Jul 2020 09:18:01 +0000 (11:18 +0200)]
Changelog: Document description limits.
lain [Mon, 6 Jul 2020 09:16:58 +0000 (11:16 +0200)]
Docs: document instance differences
lain [Mon, 6 Jul 2020 09:12:37 +0000 (11:12 +0200)]
InstanceView: Add chat limit, description limit
lain [Mon, 6 Jul 2020 09:08:53 +0000 (11:08 +0200)]
Docs: Add description limits to cheat sheet
lain [Mon, 6 Jul 2020 09:08:13 +0000 (11:08 +0200)]
Upload: Restrict description length
Alexander Strizhakov [Wed, 17 Jun 2020 09:34:27 +0000 (12:34 +0300)]
test fixes
Alexander Strizhakov [Fri, 1 May 2020 06:20:54 +0000 (09:20 +0300)]
tests fixes
Alexander Strizhakov [Tue, 31 Mar 2020 13:53:11 +0000 (16:53 +0300)]
adding benchmarks in new format
Alexander Strizhakov [Wed, 26 Feb 2020 14:50:56 +0000 (17:50 +0300)]
renaming back and reject nil on create
Alexander Strizhakov [Wed, 26 Feb 2020 14:00:38 +0000 (14:00 +0000)]
Apply suggestion to test/notification_test.exs
Alexander Strizhakov [Wed, 26 Feb 2020 14:00:28 +0000 (14:00 +0000)]
Apply suggestion to test/notification_test.exs
Alexander Strizhakov [Wed, 26 Feb 2020 13:59:07 +0000 (13:59 +0000)]
Apply suggestion to lib/pleroma/filter.ex
Alexander Strizhakov [Fri, 7 Feb 2020 15:16:39 +0000 (18:16 +0300)]
don't filter notifications for follow and move types
Sergey Suprunenko [Mon, 25 Nov 2019 15:59:55 +0000 (16:59 +0100)]
Restrict thread statuses that contain user's irreversible filters
Sergey Suprunenko [Fri, 22 Nov 2019 18:52:50 +0000 (19:52 +0100)]
Skip notifications for statuses that contain an irreversible filtered word
Sergey Suprunenko [Sat, 16 Nov 2019 21:54:13 +0000 (22:54 +0100)]
Restrict statuses that contain user's irreversible filters
Alexander Strizhakov [Mon, 6 Jul 2020 06:12:29 +0000 (09:12 +0300)]
migration to delete migrated tesla setting
Alexander Strizhakov [Mon, 6 Jul 2020 05:48:20 +0000 (08:48 +0300)]
don't save tesla settings into db
Roman Chvanikov [Sun, 5 Jul 2020 21:01:25 +0000 (00:01 +0300)]
Delete activity before sending response to client
Mark Felder [Sun, 5 Jul 2020 15:11:43 +0000 (10:11 -0500)]
Ensure all CSP parameters for remote hosts have a scheme
lain [Sat, 4 Jul 2020 15:11:37 +0000 (17:11 +0200)]
Streamer: Don't filter out announce notifications.
Mark Felder [Fri, 3 Jul 2020 22:19:43 +0000 (17:19 -0500)]
Document the Captcha CSP fix
Mark Felder [Fri, 3 Jul 2020 22:18:22 +0000 (17:18 -0500)]
Rename function and clarify that CSP is only strict with MediaProxy enabled
Mark Felder [Fri, 3 Jul 2020 22:06:20 +0000 (17:06 -0500)]
Add Captcha endpoint to CSP headers when MediaProxy is enabled.
Our CSP rules are lax when MediaProxy enabled, but lenient otherwise.
This fixes broken captcha on instances not using MediaProxy.
lain [Fri, 3 Jul 2020 15:06:33 +0000 (15:06 +0000)]
Merge branch 'features/mastoapi-2.9.0-status_text' into 'develop'
MastoAPI 2.9.0: status text on deletion
See merge request pleroma/pleroma!2690
projects / akkoma / log