mastodon

Commit Graph

Author	SHA1	Message	Date
Claire	7d3fe2b4c3	Add loading indicator and empty result message to advanced interface search (#30085 )	8 months ago
Matt Jankowski	ac7f4d57bb	Use composable query in `Status.without_replies` scope (#30086 )	8 months ago
Claire	95e9de5777	Prevent accidental serialization of `Account` and `User` records (#30079 )	8 months ago
Matt Jankowski	e336466894	Use shared form partial for `admin/rules` views (#30067 )	8 months ago
Matt Jankowski	a9816f051d	Use shared form partial for `admin/warning_presets` views (#30069 )	8 months ago
Renaud Chaput	b9b4db483c	Remove usage of deprecated `defaultTypes` on React functional components (#30099 )	8 months ago
Matt Jankowski	2739d8d5a4	Use shorter `render` call in `admin/webhooks` view (#30071 )	8 months ago
Matt Jankowski	bbf1b603e0	Remove unused `Account.popular` scope (#30068 )	8 months ago
Matt Jankowski	2123281f7c	Move `Account` limits to constants (#30087 )	8 months ago
Matt Jankowski	f0c9cbaf3b	Use `EXPIRATION_DURATIONS` constant in `CustomFilter` class (#30088 )	8 months ago
Renaud Chaput	4527e012da	Convert `entrypoints/sign_up` to Typescript (#30106 )	8 months ago
github-actions[bot]	9be7efedf0	New Crowdin Translations (automated) (#30092 ) Co-authored-by: GitHub Actions <noreply@github.com>	8 months ago
Renaud Chaput	36909065b5	Convert easy entrypoints files to Typescript (#30102 )	8 months ago
David Beck	4f4b77920e	Remove home marker updates (#22721 )	8 months ago
Renaud Chaput	65093c619f	Fix marker thunks to not ignore eslint directives for the whole file (#30089 )	8 months ago
Claire	de4a7bf531	Change moderation warning notification icon (#30081 )	8 months ago
Michael Stanclift	bb8c6346fb	Reword and rearrange Content Retention page (#27733 )	8 months ago
Claire	91ca90e25b	Fix Idempotency-Key ignored when scheduling a post (#30084 )	8 months ago
Claire	e845594878	Fix moderator account being exposed in account moderation notification (#30082 )	8 months ago
github-actions[bot]	5201882a23	New Crowdin Translations (automated) (#30077 ) Co-authored-by: GitHub Actions <noreply@github.com>	8 months ago
Claire	4ef0b48b95	Add in-app notifications for moderation actions/warnings (#30065 )	8 months ago
Eugen Rochko	0ec061aa8f	Change design of people tab on explore in web UI (#30059 )	8 months ago
github-actions[bot]	85fdbd0ad5	New Crowdin Translations (automated) (#30062 ) Co-authored-by: GitHub Actions <noreply@github.com>	8 months ago
Tim Rogers	b128474625	Fixed rendering of excess whitespace in status card titles (#30017 )	8 months ago
Matt Jankowski	f4a53f3fb4	Extract constants for column size length validation limits (#30045 )	8 months ago
github-actions[bot]	ebcf9840f4	New Crowdin Translations (automated) (#30050 ) Co-authored-by: GitHub Actions <noreply@github.com>	8 months ago
Eugen Rochko	74012831f6	Change mute options to be in dropdown on muted users list in web UI (#30049 )	8 months ago
Matt Jankowski	3f6887557b	Move JS source from `packs` to `entrypoints` (#30037 )	8 months ago
Matt Jankowski	32ead51e5a	Add material design icons to admin/settings views (#27780 ) Co-authored-by: Claire <claire.github-309c@sitedethib.com>	8 months ago
Claire	a2399046ca	Fix string interpolation for software updates admin mailer (#30035 )	8 months ago
Emelia Smith	049b159beb	Add read:me OAuth 2.0 scope, allowing more limited access to user data (#29087 )	8 months ago
github-actions[bot]	d754b15afb	New Crowdin Translations (automated) (#30034 ) Co-authored-by: GitHub Actions <noreply@github.com>	8 months ago
Matt Jankowski	33e829763d	Use shared `form` partial for `admin/domain_blocks` views (#29609 )	8 months ago
Tim Rogers	1ca6ff8ca5	Fixed crash when supplying FFMPEG_BINARY environment variable (#30022 )	8 months ago
Tim Rogers	75163d9daf	Fixed rendering error on /start when not logged in (#30023 )	8 months ago
github-actions[bot]	3655fb6a22	New Crowdin Translations (automated) (#30014 ) Co-authored-by: GitHub Actions <noreply@github.com>	8 months ago
github-actions[bot]	ec71c02c4b	New Crowdin Translations (automated) (#29994 ) Co-authored-by: GitHub Actions <noreply@github.com>	9 months ago
Matt Jankowski	4837bfcc6a	Use shared `form` partial for `admin/announcements` views (#29608 )	9 months ago
github-actions[bot]	443186ff40	New Crowdin Translations (automated) (#29980 ) Co-authored-by: GitHub Actions <noreply@github.com>	9 months ago
Matt Jankowski	11e0049b08	Use enum-generated scopes/queries for `BulkImport` (#29975 )	9 months ago
Matt Jankowski	650c548c31	Add `not_featured_by` scope to Tag (#28815 )	9 months ago
Matt Jankowski	1d3ecd3fba	Add `API::Pagination` concern (#28826 )	9 months ago
github-actions[bot]	c35042b7eb	New Crowdin Translations (automated) (#29972 ) Co-authored-by: GitHub Actions <noreply@github.com>	9 months ago
Claire	fc89ecc6ca	Change `/api/v1/announcements` to return regular `Status` entities (#26736 )	9 months ago
Matt Jankowski	6fed108703	Use Rails `upsert` to generate update_count! query in Counters concern (#28738 ) Co-authored-by: Claire <claire.github-309c@sitedethib.com>	9 months ago
Matt Jankowski	caad1e2628	Add scope `Status.distributable_visibility` (#29950 )	9 months ago
Matt Jankowski	6b33d3f81b	Add `CustomFilter.unexpired` scope (#29896 )	9 months ago
Claire	66ee0d4a1f	Fix incorrect label for filtered notifications badge (#29922 )	9 months ago
Matt Jankowski	3159c0a547	Add scope `Status.list_eligible_visibility` (#29951 )	9 months ago
github-actions[bot]	285d4123b5	New Crowdin Translations (automated) (#29955 ) Co-authored-by: GitHub Actions <noreply@github.com>	9 months ago
Claire	4117c8f6b8	Fix unfollow button being out of frame on small screens on old browsers (#29923 )	9 months ago
github-actions[bot]	4e78cb9988	New Crowdin Translations (automated) (#29939 ) Co-authored-by: GitHub Actions <noreply@github.com>	9 months ago
Renaud Chaput	ee4ea83a87	Remove `image_pack_tag` usage (#29925 )	9 months ago
Claire	c386c36866	Add `/` keyboard shortcut to focus the search field (#29921 )	9 months ago
Matt Jankowski	13bbde2246	Use existing `DEFAULT_FIELDS_SIZE` constant to limit `Account#fields` (#29911 )	9 months ago
github-actions[bot]	5992df0762	New Crowdin Translations (automated) (#29920 ) Co-authored-by: GitHub Actions <noreply@github.com>	9 months ago
Matt Jankowski	449f99e168	Fix repeated concat output buffer duplicating layout markup (#29918 )	9 months ago
github-actions[bot]	20b1e55f24	New Crowdin Translations (automated) (#29903 ) Co-authored-by: GitHub Actions <noreply@github.com>	9 months ago
github-actions[bot]	db5a5636d9	New Crowdin Translations (automated) (#29888 ) Co-authored-by: GitHub Actions <noreply@github.com>	9 months ago
Matt Jankowski	b57ee5cf5b	Fix `Style/MapIntoArray` cop in context helper (#29885 )	9 months ago
Matt Jankowski	285f63c02e	Use composable query in `User.active` scope (#29775 )	9 months ago
Claire	babbf6017d	Remove caching in `cache_collection` (#29862 )	9 months ago
Claire	f3430eebbb	Fix hashtag string interpolation in welcome email (#29879 )	9 months ago
github-actions[bot]	13faf26315	New Crowdin Translations (automated) (#29859 ) Co-authored-by: GitHub Actions <noreply@github.com>	9 months ago
Renaud Chaput	730e2127e1	Fix webpack warnings due to unhandled extensions (`LICENCE` and `README.md`) (#29869 )	9 months ago
Matt Jankowski	b61ae28f8d	Separate methods for theme style and meta color tags (#29802 )	9 months ago
Matt Jankowski	c0fe8a9f13	Extract shared callback behaviour to `CustomFilterCache` concern (#29695 )	9 months ago
Renaud Chaput	6ac90d4c5d	Add tests for our number formatting function (#29852 )	9 months ago
Renaud Chaput	906a399634	Fix wrong extension for a test file (#29853 )	9 months ago
Claire	38b9d31f63	Improve email address validation (#29838 )	9 months ago
Matt Jankowski	601834d746	Use partial collection render for welcome mailer features (#29843 )	9 months ago
Michael Stanclift	1c87cb8019	Add purple border to active compose field search inputs (#29839 )	9 months ago
Matt Jankowski	966d7f5bf9	Add missing snowflake range correction (#29841 )	9 months ago
Jeong Arm	4045c069f8	Use `public_visibility` (#29847 )	9 months ago
nicolas	c6da3ee828	Makes the star icon rotate around its actual centre axis (#29844 )	9 months ago
Matt Jankowski	cde3206478	Simplify feature loop in welcome mailer (#29760 )	9 months ago
renovate[bot]	37d984b8bf	Update eslint (non-major) (#29820 ) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> Co-authored-by: Renaud Chaput <renchap@gmail.com>	9 months ago
Michael Stanclift	e284417349	Fix blue border on emoji/language search in Safari & Chrome (#29832 )	9 months ago
Michael Stanclift	5d67247061	Fix language and emoji search field background colors on light theme (#29828 )	9 months ago
github-actions[bot]	56d13069cd	New Crowdin Translations (automated) (#29836 ) Co-authored-by: GitHub Actions <noreply@github.com>	9 months ago
Matt Jankowski	edde54e991	Update stoplight to version 4.1.0 (#28366 )	9 months ago
Matt Jankowski	921c4c1273	Match comment style of `FeedManager` list/tags checks (#29639 ) Co-authored-by: Renaud Chaput <renchap@gmail.com>	9 months ago
Claire	0b9d4103cb	Fix contrast in notification request badge (#29826 )	9 months ago
Matt Jankowski	34489591ec	Add `max_pinned_statuses` to instances serializer and api response (#29441 )	9 months ago
Matt Jankowski	f56309f5f0	Add `by_latest_used` scope, move admin area recent IPs to partial (#29497 )	9 months ago
Renaud Chaput	b4d991adaa	Use integers and not numbers in notification policy API counters (#29810 )	9 months ago
Renaud Chaput	e47a3d00fe	Add API types for status and related objects (#29792 )	9 months ago
Renaud Chaput	07635228e2	Fix Redux Middleware types (#29800 )	9 months ago
github-actions[bot]	c717747603	New Crowdin Translations (automated) (#29812 ) Co-authored-by: GitHub Actions <noreply@github.com>	9 months ago
Michael Stanclift	fa9574086d	Fix search box color on light theme (#29808 )	9 months ago
Michael Stanclift	90eb4a5d01	Fix light theme header on mobile (#29809 )	9 months ago
Michael Stanclift	430da03160	Fix background tint in single column light theme (#29803 )	9 months ago
Renaud Chaput	69e5771881	Handle `createAppAsyncThunk` rejected actions in the errors middleware (#29791 )	9 months ago
github-actions[bot]	f96648d41c	New Crowdin Translations (automated) (#29796 ) Co-authored-by: GitHub Actions <noreply@github.com>	9 months ago
Renaud Chaput	672c9f5f05	Change the `theme-color` value automatically when using a built-in theme (#29795 )	9 months ago
Renaud Chaput	67442f9039	Remove global `boosts` state and convert boosts modal to Typescript (#29774 )	9 months ago
github-actions[bot]	8a498f4e65	New Crowdin Translations (automated) (#29785 ) Co-authored-by: GitHub Actions <noreply@github.com>	9 months ago
Claire	4f068d4fcc	Fix logo pushing header buttons out of view on certain conditions in mobile layout (#29787 )	9 months ago
Matt Jankowski	e85f24174e	Simplify checklist step loop in welcome mailer (#29761 )	9 months ago
Renaud Chaput	961bb84e4c	Fix `<RelativeTimestamp>` types (#29781 )	9 months ago
Renaud Chaput	d088964761	Fix props for `<Button>` (#29780 )	9 months ago
Renaud Chaput	f2fd1da23f	Fix PropTypes for some record objects (#29786 )	9 months ago
github-actions[bot]	1025fff6b9	New Crowdin Translations (automated) (#29772 ) Co-authored-by: GitHub Actions <noreply@github.com>	9 months ago
Claire	c913e2f3e5	Fix language picker and privacy picker not having a backdrop filter (#29779 )	9 months ago
Renaud Chaput	b9982ce578	Fix notifications marker fetch (#29777 )	9 months ago
Renaud Chaput	9fbe8d3a0c	Rewrite PIP state in Typescript (#27645 ) Co-authored-by: Claire <claire.github-309c@sitedethib.com>	9 months ago
Matt Jankowski	b016f03637	Pull out constant from `AccountWarning.recent` scope (#29767 )	9 months ago
Renaud Chaput	27d014a7fa	Rewrite markers reducer in Typescript (#27644 )	9 months ago
Matt Jankowski	1d0a43f6a3	Use composable query in `Status.not_domain_blocked_by_account` scope (#29766 )	9 months ago
Claire	b2d841ce9a	Fix column borders disappearing in advanced interface on low width viewports (#29763 )	9 months ago
Matt Jankowski	c4feba4347	Use existing `MascotHelper#instance_presenter` instead of local var in `welcome` email template (#29759 )	9 months ago
Claire	9c24f2d6b1	Undo notification permissions on individual and domain blocks (#29570 )	9 months ago
Claire	7508472d84	Fix admin interface repeating rule title instead of showing hint text (#29758 )	9 months ago
Claire	cfea9cc172	Add list of pending releases directly in mail notifications for version updates (#29436 )	9 months ago
Matt Jankowski	32938dadd7	Add `not_allowed` scope for `PreviewCardTrend` (#29599 )	9 months ago
Matt Jankowski	cf76380c91	Add `AccountStat.by_recent_status`, use in `Account` (#29704 )	9 months ago
github-actions[bot]	b3d970bdb8	New Crowdin Translations (automated) (#29756 ) Co-authored-by: GitHub Actions <noreply@github.com>	9 months ago
Emelia Smith	eb926b7e60	Ensure case-insensitive fields are converted to lowercase in user imports (#29740 )	9 months ago
Emelia Smith	a3e8b78250	Ensure case-insensitive fields are converted to lowercase in Admin Imports (#29739 )	9 months ago
Renaud Chaput	02ea161506	Support "system" theme setting (light/dark theme depending on user system preference) (#29748 ) Co-authored-by: Nishiki Liu <hello@nshki.com>	9 months ago
Eugen Rochko	0cea7a623b	Fix background and icon on notification requests in web UI (#29706 )	9 months ago
Eugen Rochko	29f9dc742e	Change design of notification about lost connections in web UI (#29731 )	9 months ago
Eugen Rochko	dd061291b1	Change out-of-band hashtags design in web UI (#29732 )	9 months ago
github-actions[bot]	799e3be9bd	New Crowdin Translations (automated) (#29726 ) Co-authored-by: GitHub Actions <noreply@github.com>	9 months ago
Eugen Rochko	8e7e86ee35	Add ability to reorder uploaded media before posting in web UI (#28456 )	9 months ago
Renaud Chaput	6c381f20b1	Restore advanced filter bar setting (#29737 )	9 months ago
Claire	37ca59815c	Remove setting for unfollow confirmation modal, and make it unconditional (#29373 )	9 months ago
Claire	58376eedda	Remove obsolete `admin` and `moderator` columns from `users` table (#29718 )	9 months ago
Claire	d71d26a3c9	Reattribute notification-related records if possible when merging accounts (#29694 )	9 months ago
Claire	de6c9e0fcd	Change new modals to allow vertical scrolling (#29644 )	9 months ago
Claire	387c78ddf9	Change icon of severed relationships notifications (#29712 )	9 months ago
Claire	dfa43707eb	Change `AccountRelationshipSeveranceEvent` model to store lost followers and following counts separately (#29714 )	9 months ago
Matt Jankowski	34f293475e	Fix results/query in `api/v1/featured_tags/suggestions` (#29597 )	9 months ago
github-actions[bot]	5db5fa879b	New Crowdin Translations (automated) (#29708 ) Co-authored-by: GitHub Actions <noreply@github.com>	9 months ago
Matt Jankowski	8c1d29df7e	Use `has_many through` instead of `delegate` for ARSE<>SR (#29672 )	9 months ago
Renaud Chaput	ec1e770fea	Add the role ID to the badge component (#29707 )	9 months ago
Claire	05eda8d193	Remove severed relationship notifications for single account suspensions (#29700 )	10 months ago
Claire	75f34b80a8	Clean up notification requests when deleting accounts (#29693 )	10 months ago
Claire	885d0faf83	Fix duplicate translation string for severed relationships (#29689 )	10 months ago
github-actions[bot]	c007dd5dd2	New Crowdin Translations (automated) (#29687 ) Co-authored-by: GitHub Actions <noreply@github.com>	10 months ago
Matt Jankowski	77897cd24c	Use existing `SeveredRelationship.about_local_account` scope in more places (#29673 )	10 months ago
Matt Jankowski	cdd168f5d3	Update `enum` away from deprecated (#29678 )	10 months ago
Eugen Rochko	be52633ee4	Change back button to always appear in advanced web UI (#29669 )	10 months ago
Claire	f4d753aedf	Fix error in severed relationship event serializer (#29670 )	10 months ago
Claire	98a2bb8be2	Fix issue with severed relationships notifications (#29668 )	10 months ago
Claire	954b470fbc	Fix error when attempting to delete posts that triggered a notification request (#29666 )	10 months ago
Claire	d4449cc682	Fix account_relationship_severance_events unique indexes (#29665 )	10 months ago
Claire	44bf7b8128	Add notifications of severed relationships (#27511 )	10 months ago
Claire	8a1423a474	Allow unblocking email addresses from any matching account (#29305 )	10 months ago
Matt Jankowski	0a33be39c1	Reduce `LineLength` for `react_admin_component` helpers (#29650 )	10 months ago
Claire	3211e960ac	Fix “Explore” icon in navigation bar not being filled when selected (#29649 )	10 months ago
Claire	50fd94f481	Fix blockquote color in reply indicator (#29659 )	10 months ago
Claire	94f7ae192b	Fix emoji picker placement on limited-height viewports (#29651 )	10 months ago
Claire	e36e7ea243	Fix emoji picker dropdown background and borders (#29653 )	10 months ago
Claire	a583317df6	Fix icon and styling in browser notifications banner (#29658 )	10 months ago
github-actions[bot]	6c0b1a41a1	New Crowdin Translations (automated) (#29657 ) Co-authored-by: GitHub Actions <noreply@github.com>	10 months ago
Matt Jankowski	4c84891453	Pull out full `li` element into admin/status_edits/status_edit partial (#29499 )	10 months ago
Claire	ffc5be4820	Change filtered icon from “archive” to “inventory 2” (#29652 )	10 months ago
Matt Jankowski	62e266fbd6	Add `BrowserDetection` model concern (#29513 )	10 months ago
Matt Jankowski	d7ab5655ef	Replace `render_symbol` method with `inline_svg_tag` usage (#29647 )	10 months ago
Claire	bd06963c16	Slightly increase font weight of favorite/boost numbers in detailed statuses (#29648 )	10 months ago
Matt Jankowski	6c68c3c0ce	Introduce `inline_svg` gem, minimal usage, prep for material design icons (#29612 )	10 months ago
github-actions[bot]	4e61bce4e9	New Crowdin Translations (automated) (#29641 ) Co-authored-by: GitHub Actions <noreply@github.com>	10 months ago
Matt Jankowski	72e1162eb3	Flatten `olm` section of context helper extension map (#29638 )	10 months ago
Claire	cf08a438e7	Add badge on account card in report moderation interface when account is already suspended (#29592 )	10 months ago
Jeong Arm	39839baec3	Fix mute for 30 days (#29640 )	10 months ago
Matt Jankowski	6d2986017e	Remove unused `active_nav_class` helper method (#29617 )	10 months ago
Claire	d5063072c3	Revert friends-of-friends follow recommendation query to using a CTE (#29619 )	10 months ago
Matt Jankowski	b5115850bb	Move repeated `insert_pagination_headers` method to api base class (#29606 )	10 months ago
Matt Jankowski	92855948a0	Remove unused `show_landing_strip?` helper method (#29618 )	10 months ago
Matt Jankowski	ecdbf15ebe	Remove unused `link_to_older` and `link_to_newer` helper methods (#29620 )	10 months ago
github-actions[bot]	04817e965a	New Crowdin Translations (automated) (#29623 ) Co-authored-by: GitHub Actions <noreply@github.com>	10 months ago
Claire	82c2af0356	Fix `user_mailer.welcome.hashtags_recent_count` not having plural form (#29607 )	10 months ago
Claire	726e7ad024	Fix extra separator besides favourite count on private posts (#29605 )	10 months ago
Claire	d702a03a0c	Add “Learn more” on block modal to inform of federation caveats (#29614 )	10 months ago
Eugen Rochko	ec19d0a14b	Change mute, block and domain block confirmations in web UI (#29576 )	10 months ago
Claire	be7a68b095	Change Explore icon to compass in advanced interface (#29610 )	10 months ago
Renaud Chaput	c76ae7a5c0	Convert `packs/public.jsx` to Typescript (#29501 )	10 months ago
Eugen Rochko	407287573c	Add domain information to profiles in web UI (#29602 ) Co-authored-by: Claire <claire.github-309c@sitedethib.com>	10 months ago
Matt Jankowski	f445d33fd6	Fix haml-lint `LineLength` cops in app/views/admin (#28680 )	10 months ago
Matt Jankowski	7720c684c5	Move common module inclusion in sub classes to `ActivityPub::BaseController` (#29560 )	10 months ago
github-actions[bot]	6865fda593	New Crowdin Translations (automated) (#29603 ) Co-authored-by: GitHub Actions <noreply@github.com>	10 months ago
Matt Jankowski	838b0bdf2d	Remove unused `Account::Interactions#endorsed?` method (#29463 )	10 months ago
Matt Jankowski	d39d625561	Use inclusive range in `ActivityTracker#get` (#29413 )	10 months ago
Matt Jankowski	6c3e718b86	Remove setting of `sensitive` value (default false, not null) in Status model (#29589 )	10 months ago
Matt Jankowski	14aa7f1e15	Use `Account.activitypub` generated scope (#28157 )	10 months ago
Eugen Rochko	30483d618f	Fix back button appearing in column header unexpectedly in web UI (#29551 )	10 months ago
Claire	95a5713ff7	Fix accounts not getting imported into redux store for some filtered notification types (#29588 )	10 months ago
Matt Jankowski	0bc17a3d48	Use enum-generated `public_visibility` scope on Status (#28156 )	10 months ago
Matt Jankowski	19cbadfbd6	Use enum-generated scope for `IpBlock` in CLI (#28144 )	10 months ago
Eugen Rochko	4991198b70	Change design of metadata underneath posts in web UI (#29585 )	10 months ago
Matt Jankowski	f9100743ec	Add `Api::ErrorHandling` concern for api/base controller (#29574 )	10 months ago
Eugen Rochko	1e1d97a787	Fix wrong background color on search results in web UI (#29584 )	10 months ago
github-actions[bot]	5aea35de13	New Crowdin Translations (automated) (#29587 ) Co-authored-by: GitHub Actions <noreply@github.com>	10 months ago
mogaminsk	3156d04ec1	Use sender's `username` to column title in notification request if it's `display_name` is not set (#29575 )	10 months ago
Claire	a32a126cac	Hide media by default in notification requests (#29572 )	10 months ago
Matt Jankowski	c09b8a7164	Add `Account.without_internal` scope (#29559 ) Co-authored-by: Claire <claire.github-309c@sitedethib.com>	10 months ago
Renaud Chaput	acf3f410ae	Fix navigation panel icons missing classes (#29569 )	10 months ago
github-actions[bot]	171948b910	New Crowdin Translations (automated) (#29563 ) Co-authored-by: GitHub Actions <noreply@github.com>	10 months ago
Erik Uden	268856d5d9	Fix toggle button color for light (and dark/default) theme (#29553 )	10 months ago

... 2 3 4 5 6 ...

8723 Commits (a40831b3636fbca1e6d6b096e3d3cdd66569baf9)