decidim-core 0.28.2 → 0.29.0.rc2
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +4 -4
- data/README.md +1 -1
- data/app/cells/decidim/activities_cell.rb +0 -1
- data/app/cells/decidim/activity_cell.rb +5 -7
- data/app/cells/decidim/address_cell.rb +3 -5
- data/app/cells/decidim/amendable/amend_button_card_cell.rb +0 -2
- data/app/cells/decidim/amendable/amendments_cell.rb +0 -2
- data/app/cells/decidim/amendable/announcement_cell.rb +10 -14
- data/app/cells/decidim/amendable/emendation_actions_cell.rb +0 -2
- data/app/cells/decidim/amendable/promote_button_card_cell.rb +0 -2
- data/app/cells/decidim/amendable/wizard_step_form_cell.rb +6 -19
- data/app/cells/decidim/announcement/show.erb +1 -1
- data/app/cells/decidim/announcement_cell.rb +6 -2
- data/app/cells/decidim/attachments_file_tab/show.erb +3 -0
- data/app/cells/decidim/attachments_file_tab_cell.rb +11 -0
- data/app/cells/decidim/attachments_link_tab/show.erb +12 -0
- data/app/cells/decidim/attachments_link_tab_cell.rb +21 -0
- data/app/cells/decidim/author/flag.erb +2 -2
- data/app/cells/decidim/author_cell.rb +0 -2
- data/app/cells/decidim/authorization_modal_cell.rb +0 -3
- data/app/cells/decidim/badge_cell.rb +0 -4
- data/app/cells/decidim/badges_cell.rb +0 -2
- data/app/cells/decidim/button_cell.rb +0 -3
- data/app/cells/decidim/card_cell.rb +1 -5
- data/app/cells/decidim/card_g_cell.rb +2 -2
- data/app/cells/decidim/card_l/space.erb +1 -1
- data/app/cells/decidim/card_l_cell.rb +1 -3
- data/app/cells/decidim/card_metadata_cell.rb +1 -5
- data/app/cells/decidim/card_s_cell.rb +1 -4
- data/app/cells/decidim/coauthorships_cell.rb +0 -2
- data/app/cells/decidim/comments_button_cell.rb +0 -2
- data/app/cells/decidim/content_blocks/footer_sub_hero/show.erb +1 -1
- data/app/cells/decidim/content_blocks/footer_sub_hero_cell.rb +0 -3
- data/app/cells/decidim/content_blocks/hero/show.erb +1 -1
- data/app/cells/decidim/content_blocks/hero_cell.rb +0 -1
- data/app/cells/decidim/content_blocks/highlighted_content_banner_cell.rb +0 -2
- data/app/cells/decidim/content_blocks/how_to_participate/show.erb +1 -1
- data/app/cells/decidim/content_blocks/how_to_participate_cell.rb +0 -1
- data/app/cells/decidim/content_blocks/participatory_space_documents/content.erb +1 -1
- data/app/cells/decidim/content_blocks/participatory_space_documents_cell.rb +17 -1
- data/app/cells/decidim/content_blocks/participatory_space_hero_cell.rb +0 -2
- data/app/cells/decidim/content_blocks/participatory_space_last_activity_cell.rb +1 -3
- data/app/cells/decidim/content_blocks/stats/show.erb +1 -1
- data/app/cells/decidim/content_blocks/sub_hero_cell.rb +0 -3
- data/app/cells/decidim/date_range/show.erb +10 -10
- data/app/cells/decidim/date_range_cell.rb +0 -2
- data/app/cells/decidim/diff_cell.rb +0 -1
- data/app/cells/decidim/documents_panel/show.erb +4 -0
- data/app/cells/decidim/documents_panel_cell.rb +9 -1
- data/app/cells/decidim/endorsement_buttons_cell.rb +5 -13
- data/app/cells/decidim/flag_modal/flag_user.erb +3 -3
- data/app/cells/decidim/followers_cell.rb +0 -1
- data/app/cells/decidim/following_cell.rb +0 -1
- data/app/cells/decidim/footer_topics/show.erb +8 -0
- data/app/cells/decidim/footer_topics_cell.rb +39 -0
- data/app/cells/decidim/groups_cell.rb +0 -3
- data/app/cells/decidim/linked_resources_for_cell.rb +0 -3
- data/app/cells/decidim/members_cell.rb +0 -1
- data/app/cells/decidim/navbar_admin_link_cell.rb +0 -2
- data/app/cells/decidim/newsletter_templates/base_cell.rb +0 -1
- data/app/cells/decidim/newsletter_templates/basic_only_text/show.erb +2 -2
- data/app/cells/decidim/newsletter_templates/image_text_cta/show.erb +2 -2
- data/app/cells/decidim/notification/show.erb +5 -0
- data/app/cells/decidim/notification_actions/base_cell.rb +13 -0
- data/app/cells/decidim/notification_actions/buttons/show.erb +5 -0
- data/app/cells/decidim/notification_actions/buttons_cell.rb +41 -0
- data/app/cells/decidim/notification_cell.rb +9 -3
- data/app/cells/decidim/notifications_cell.rb +0 -1
- data/app/cells/decidim/pad_iframe/show.erb +2 -2
- data/app/cells/decidim/pad_iframe_cell.rb +0 -1
- data/app/cells/decidim/participatory_space_dropdown_metadata_cell.rb +1 -2
- data/app/cells/decidim/photo_cell.rb +1 -5
- data/app/cells/decidim/photos_list_cell.rb +0 -2
- data/app/cells/decidim/profile_cell.rb +0 -2
- data/app/cells/decidim/profile_sidebar/show.erb +20 -20
- data/app/cells/decidim/profile_sidebar_cell.rb +1 -10
- data/app/cells/decidim/progress_bar/show.erb +8 -6
- data/app/cells/decidim/public_participation/show.erb +1 -1
- data/app/cells/decidim/report_button/flag_modal.erb +1 -1
- data/app/cells/decidim/resource_types_filter_cell.rb +0 -2
- data/app/cells/decidim/scopes_picker/show.erb +1 -1
- data/app/cells/decidim/scopes_picker_cell.rb +0 -1
- data/app/cells/decidim/search_results_cell.rb +1 -1
- data/app/cells/decidim/statistic_cell.rb +0 -2
- data/app/cells/decidim/tab_panels/show.erb +1 -1
- data/app/cells/decidim/tab_panels_cell.rb +12 -2
- data/app/cells/decidim/tags_cell.rb +0 -2
- data/app/cells/decidim/tos_page_cell.rb +0 -3
- data/app/cells/decidim/translation_bar/show.erb +1 -1
- data/app/cells/decidim/translation_bar_cell.rb +0 -2
- data/app/cells/decidim/upload_modal/files.erb +1 -1
- data/app/cells/decidim/upload_modal_cell.rb +1 -3
- data/app/cells/decidim/user_conversation/new.erb +1 -1
- data/app/cells/decidim/user_conversation/show.erb +1 -1
- data/app/cells/decidim/user_conversation_cell.rb +0 -1
- data/app/cells/decidim/user_conversations/show.erb +1 -1
- data/app/cells/decidim/user_conversations_cell.rb +0 -1
- data/app/cells/decidim/user_group_pending_invitations_list_cell.rb +0 -1
- data/app/cells/decidim/user_group_pending_requests_list_cell.rb +0 -1
- data/app/cells/decidim/user_timeline/show.erb +1 -1
- data/app/cells/decidim/version_cell.rb +3 -5
- data/app/cells/decidim/versions_list_cell.rb +1 -3
- data/app/cells/decidim/versions_list_item_cell.rb +2 -4
- data/app/cells/decidim/wizard_step_form/wizard_aside.erb +2 -2
- data/app/cells/decidim/wizard_step_form/wizard_header.erb +2 -3
- data/app/cells/decidim/wizard_step_form_cell.rb +0 -8
- data/app/commands/decidim/amendable/create_draft.rb +4 -3
- data/app/commands/decidim/amendable/promote.rb +3 -2
- data/app/commands/decidim/amendable/publish_draft.rb +3 -2
- data/app/commands/decidim/amendable/update_draft.rb +4 -3
- data/app/commands/decidim/amendable/withdraw.rb +1 -1
- data/app/commands/decidim/create_follow.rb +4 -4
- data/app/commands/decidim/create_report.rb +3 -3
- data/app/commands/decidim/create_user_report.rb +5 -5
- data/app/commands/decidim/delete_follow.rb +4 -4
- data/app/commands/decidim/demote_membership.rb +2 -2
- data/app/commands/decidim/destroy_account.rb +21 -19
- data/app/commands/decidim/endorse_resource.rb +1 -1
- data/app/commands/decidim/invite_user_to_group.rb +5 -4
- data/app/commands/decidim/update_account.rb +24 -22
- data/app/commands/decidim/update_notifications_settings.rb +13 -11
- data/app/commands/decidim/update_password.rb +7 -7
- data/app/commands/decidim/update_user_interests.rb +9 -7
- data/app/controllers/concerns/decidim/devise_controllers.rb +2 -0
- data/app/controllers/concerns/decidim/filter_resource.rb +1 -1
- data/app/controllers/concerns/decidim/needs_rtl_direction.rb +23 -0
- data/app/controllers/concerns/decidim/participatory_space_context.rb +1 -23
- data/app/controllers/concerns/decidim/payload_info.rb +2 -1
- data/app/controllers/concerns/decidim/registers_permissions.rb +4 -4
- data/app/controllers/concerns/decidim/use_organization_time_zone.rb +1 -1
- data/app/controllers/concerns/decidim/withdrawable.rb +1 -1
- data/app/controllers/decidim/account_controller.rb +2 -2
- data/app/controllers/{concerns/decidim → decidim}/amendments_controller.rb +3 -16
- data/app/controllers/decidim/application_controller.rb +1 -0
- data/app/controllers/decidim/components/base_controller.rb +1 -1
- data/app/controllers/decidim/devise/invitations_controller.rb +1 -1
- data/app/controllers/decidim/devise/passwords_controller.rb +2 -2
- data/app/controllers/decidim/endorsements_controller.rb +1 -1
- data/app/controllers/decidim/favicon_controller.rb +1 -1
- data/app/controllers/decidim/follows_controller.rb +2 -2
- data/app/controllers/decidim/group_invites_controller.rb +36 -9
- data/app/controllers/decidim/newsletters_opt_in_controller.rb +1 -1
- data/app/controllers/decidim/notifications_settings_controller.rb +1 -1
- data/app/controllers/decidim/report_users_controller.rb +1 -1
- data/app/controllers/decidim/reports_controller.rb +1 -1
- data/app/controllers/decidim/user_interests_controller.rb +1 -1
- data/app/events/decidim/change_nickname_event.rb +0 -1
- data/app/events/decidim/invited_to_group_event.rb +29 -0
- data/app/events/decidim/welcome_notification_event.rb +2 -4
- data/app/forms/decidim/form.rb +4 -0
- data/app/forms/decidim/omniauth_registration_form.rb +1 -1
- data/app/forms/decidim/upload_validation_form.rb +1 -1
- data/app/helpers/concerns/decidim/flash_helper_extensions.rb +1 -1
- data/app/helpers/decidim/amendments_helper.rb +4 -14
- data/app/helpers/decidim/application_helper.rb +8 -0
- data/app/helpers/decidim/authorization_form_helper.rb +2 -2
- data/app/helpers/decidim/breadcrumb_helper.rb +1 -1
- data/app/helpers/decidim/cells_helper.rb +1 -1
- data/app/helpers/decidim/check_boxes_tree_helper.rb +1 -1
- data/app/helpers/decidim/datalist_select_helper.rb +1 -1
- data/app/helpers/decidim/decidim_form_helper.rb +3 -3
- data/app/helpers/decidim/filters_helper.rb +1 -1
- data/app/helpers/decidim/layout_helper.rb +1 -36
- data/app/helpers/decidim/localized_locales_helper.rb +1 -1
- data/app/helpers/decidim/menu_helper.rb +8 -0
- data/app/helpers/decidim/meta_tags_helper.rb +26 -23
- data/app/helpers/decidim/modal_helper.rb +1 -1
- data/app/helpers/decidim/orders_helper.rb +1 -1
- data/app/helpers/decidim/organization_helper.rb +55 -0
- data/app/helpers/decidim/paginate_helper.rb +1 -1
- data/app/helpers/decidim/resource_helper.rb +0 -7
- data/app/helpers/decidim/scopes_helper.rb +4 -2
- data/app/helpers/decidim/searches_helper.rb +1 -1
- data/app/helpers/decidim/short_link_helper.rb +2 -2
- data/app/helpers/decidim/translations_helper.rb +2 -2
- data/app/helpers/decidim/twitter_search_helper.rb +1 -1
- data/app/helpers/decidim/user_profile_helper.rb +0 -1
- data/app/jobs/decidim/email_notifications_digest_generator_job.rb +2 -2
- data/app/mailers/decidim/application_mailer.rb +6 -2
- data/app/mailers/decidim/block_user_mailer.rb +1 -1
- data/app/mailers/decidim/decidim_devise_mailer.rb +7 -1
- data/app/mailers/decidim/newsletter_mailer.rb +1 -4
- data/app/mailers/decidim/newsletters_opt_in_mailer.rb +2 -2
- data/app/mailers/decidim/notification_mailer.rb +0 -1
- data/app/mailers/decidim/notifications_digest_mailer.rb +0 -1
- data/app/mailers/decidim/reported_mailer.rb +6 -3
- data/app/mailers/decidim/user_report_mailer.rb +1 -1
- data/app/models/decidim/action_log.rb +1 -1
- data/app/models/decidim/area_type.rb +1 -1
- data/app/models/decidim/attachment.rb +26 -2
- data/app/models/decidim/authorization.rb +1 -1
- data/app/models/decidim/authorization_transfer.rb +1 -0
- data/app/models/decidim/component.rb +2 -2
- data/app/models/decidim/content_block.rb +1 -1
- data/app/models/decidim/messaging/message.rb +2 -2
- data/app/models/decidim/newsletter.rb +9 -9
- data/app/models/decidim/notification.rb +2 -2
- data/app/models/decidim/organization.rb +23 -2
- data/app/models/decidim/push_notification_message.rb +1 -1
- data/app/models/decidim/resource_link.rb +1 -1
- data/app/models/decidim/user.rb +2 -2
- data/app/models/decidim/user_group.rb +2 -2
- data/app/packs/src/decidim/a11y.js +46 -0
- data/app/packs/src/decidim/attachments/file_or_link_tabs.js +55 -0
- data/app/packs/src/decidim/attachments/index.js +1 -0
- data/app/packs/src/decidim/back_to_list.js +1 -1
- data/app/packs/src/decidim/check_boxes_tree.js +1 -1
- data/app/packs/src/decidim/data_consent/consent_manager.js +1 -1
- data/app/packs/src/decidim/data_consent/consent_manager.test.js +6 -6
- data/app/packs/src/decidim/data_consent/index.js +1 -1
- data/app/packs/src/decidim/datepicker/datepicker_functions.js +243 -0
- data/app/packs/src/decidim/datepicker/datepicker_listeners.js +78 -0
- data/app/packs/src/decidim/datepicker/form_datepicker.js +91 -0
- data/app/packs/src/decidim/datepicker/generate_datepicker.js +148 -0
- data/app/packs/src/decidim/datepicker/generate_timepicker.js +298 -0
- data/app/packs/src/decidim/datepicker/test/date.test.js +118 -0
- data/app/packs/src/decidim/datepicker/test/time.test.js +227 -0
- data/app/packs/src/decidim/editor/extensions/indent/index.js +1 -1
- data/app/packs/src/decidim/editor/extensions/video_embed/index.js +4 -4
- data/app/packs/src/decidim/editor/test/extensions/decidim_kit.test.js +0 -15
- data/app/packs/src/decidim/editor/test/extensions/indent.test.js +1 -1
- data/app/packs/src/decidim/editor/test/fixtures/upload_templates.js +1 -1
- data/app/packs/src/decidim/editor/test/helpers.js +1 -14
- data/app/packs/src/decidim/editor/utilities/paste_transform.js +2 -2
- data/app/packs/src/decidim/external_domain_warning.js +2 -2
- data/app/packs/src/decidim/external_domain_warning.test.js +4 -4
- data/app/packs/src/decidim/form_filter.js +4 -4
- data/app/packs/src/decidim/impersonation.js +1 -1
- data/app/packs/src/decidim/index.js +11 -5
- data/app/packs/src/decidim/input_character_counter.js +1 -1
- data/app/packs/src/decidim/input_emoji.js +171 -72
- data/app/packs/src/decidim/input_hashtags.js +1 -1
- data/app/packs/src/decidim/input_mentions.js +1 -1
- data/app/packs/src/decidim/notifications_actions.js +40 -0
- data/app/packs/src/decidim/sticky_header.js +87 -0
- data/app/packs/src/decidim/sw/sw.js +8 -6
- data/app/packs/src/decidim/tooltips.js +1 -1
- data/app/packs/stylesheets/decidim/_datepicker.scss +193 -0
- data/app/packs/stylesheets/decidim/_dropdown.scss +36 -0
- data/app/packs/stylesheets/decidim/_emoji.scss +36 -0
- data/app/packs/stylesheets/decidim/_filters.scss +4 -2
- data/app/packs/stylesheets/decidim/_flash.scss +2 -2
- data/app/packs/stylesheets/decidim/_footer.scss +1 -3
- data/app/packs/stylesheets/decidim/_forms.scss +9 -1
- data/app/packs/stylesheets/decidim/_header.scss +70 -50
- data/app/packs/stylesheets/decidim/_home.scss +1 -1
- data/app/packs/stylesheets/decidim/_layout.scss +13 -0
- data/app/packs/stylesheets/decidim/_modal.scss +1 -1
- data/app/packs/stylesheets/decidim/_modal_update.scss +1 -1
- data/app/packs/stylesheets/decidim/_notifications.scss +4 -0
- data/app/packs/stylesheets/decidim/_tabs_x.scss +5 -1
- data/app/packs/stylesheets/decidim/application.scss +4 -0
- data/app/packs/stylesheets/decidim/legacy/leaflet.scss +1 -1
- data/app/packs/stylesheets/decidim/vendor/_datepicker_light.scss +228 -0
- data/app/permissions/decidim/default_permissions.rb +2 -2
- data/app/presenters/decidim/admin_log/organization_presenter.rb +1 -1
- data/app/presenters/decidim/admin_log/static_page_presenter.rb +1 -1
- data/app/presenters/decidim/authorization_transfer_presenter.rb +1 -1
- data/app/presenters/decidim/component_attachment_collection_presenter.rb +81 -0
- data/app/presenters/decidim/footer_menu_presenter.rb +1 -1
- data/app/presenters/decidim/home_stats_presenter.rb +1 -1
- data/app/presenters/decidim/organization_presenter.rb +1 -1
- data/app/queries/decidim/metric_measure.rb +1 -1
- data/app/queries/decidim/public_activities.rb +1 -1
- data/app/queries/decidim/user_groups/admin_memberships.rb +1 -1
- data/app/queries/decidim/user_groups/member_memberships.rb +1 -1
- data/app/services/decidim/action_logger.rb +3 -3
- data/app/services/decidim/log/diff_changeset_calculator.rb +2 -2
- data/app/services/decidim/notifications_digest_sending_decider.rb +1 -1
- data/app/uploaders/decidim/organization_favicon_uploader.rb +1 -1
- data/app/uploaders/decidim/record_image_uploader.rb +2 -2
- data/app/validators/organization_present_validator.rb +1 -1
- data/app/validators/passthru_validator.rb +1 -1
- data/app/validators/uploader_image_dimensions_validator.rb +2 -2
- data/app/views/decidim/account/show.html.erb +1 -1
- data/app/views/decidim/amendments/_wizard_header.html.erb +1 -2
- data/app/views/decidim/application/_collection.html.erb +3 -1
- data/app/views/decidim/application/_component_documents.html.erb +4 -0
- data/app/views/decidim/application/_document.html.erb +23 -9
- data/app/views/decidim/block_user_mailer/notify.html.erb +2 -2
- data/app/views/decidim/devise/invitations/edit.html.erb +2 -2
- data/app/views/decidim/devise/omniauth_registrations/new.html.erb +1 -1
- data/app/views/decidim/devise/registrations/new.html.erb +1 -1
- data/app/views/decidim/devise/shared/_login_boxes.html.erb +1 -1
- data/app/views/decidim/doorkeeper/authorizations/new.html.erb +1 -1
- data/app/views/decidim/endorsements/_identity.html.erb +1 -1
- data/app/views/decidim/gamification/badges/index.html.erb +1 -1
- data/app/views/decidim/messaging/conversations/_add_conversation_users.html.erb +2 -2
- data/app/views/decidim/messaging/conversations/_error_modal.html.erb +5 -5
- data/app/views/decidim/newsletter_mailer/newsletter.html.erb +1 -1
- data/app/views/decidim/newsletters/show.html.erb +1 -1
- data/app/views/decidim/newsletters_opt_in_mailer/notify.html.erb +2 -2
- data/app/views/decidim/pages/index.html.erb +1 -2
- data/app/views/decidim/reported_mailer/report.html.erb +4 -2
- data/app/views/decidim/scopes/picker.html.erb +5 -5
- data/app/views/decidim/searches/_resources_filter_block.html.erb +6 -6
- data/app/views/decidim/shared/_extended_navigation_bar.html.erb +8 -8
- data/app/views/decidim/shared/_login_modal.html.erb +1 -1
- data/app/views/decidim/user_interests/_areas.html.erb +2 -2
- data/app/views/decidim/user_report_mailer/notify.html.erb +2 -2
- data/app/views/decidim/user_update_mailer/notify.html.erb +1 -1
- data/app/views/decidim/widgets/_data_picker.html.erb +1 -1
- data/app/views/devise/mailer/invitation_instructions.html.erb +1 -1
- data/app/views/devise/mailer/invitation_instructions.text.erb +1 -1
- data/app/views/devise/mailer/invite_admin.html.erb +2 -2
- data/app/views/devise/mailer/invite_admin.text.erb +2 -2
- data/app/views/devise/mailer/invite_collaborator.html.erb +2 -2
- data/app/views/devise/mailer/invite_collaborator.text.erb +2 -2
- data/app/views/devise/mailer/invite_private_user.html.erb +2 -2
- data/app/views/devise/mailer/invite_private_user.text.erb +2 -2
- data/app/views/devise/mailer/organization_admin_invitation_instructions.html.erb +1 -1
- data/app/views/devise/mailer/organization_admin_invitation_instructions.text.erb +1 -1
- data/app/views/layouts/decidim/_application.html.erb +3 -6
- data/app/views/layouts/decidim/_data_consent_warning.html.erb +2 -2
- data/app/views/layouts/decidim/_decidim_javascript.html.erb +1 -1
- data/app/views/layouts/decidim/_head_extra.html.erb +2 -2
- data/app/views/layouts/decidim/_impersonation_warning.html.erb +1 -1
- data/app/views/layouts/decidim/_js_configuration.html.erb +7 -2
- data/app/views/layouts/decidim/_logo.html.erb +2 -2
- data/app/views/layouts/decidim/_logo_mobile.html.erb +11 -0
- data/app/views/layouts/decidim/_mailer_logo.html.erb +2 -2
- data/app/views/layouts/decidim/_meta_tags_config.html.erb +1 -1
- data/app/views/layouts/decidim/_wrapper.html.erb +16 -9
- data/app/views/layouts/decidim/footer/_main.html.erb +2 -3
- data/app/views/layouts/decidim/footer/_main_intro.html.erb +2 -2
- data/app/views/layouts/decidim/footer/_main_legal.html.erb +2 -3
- data/app/views/layouts/decidim/footer/_main_links.html.erb +13 -11
- data/app/views/layouts/decidim/footer/_main_social_media_links.html.erb +8 -8
- data/app/views/layouts/decidim/header/_main.html.erb +9 -22
- data/app/views/layouts/decidim/header/_main_links_desktop.html.erb +3 -4
- data/app/views/layouts/decidim/header/_main_links_mobile_account.html.erb +10 -3
- data/app/views/layouts/decidim/header/_main_links_mobile_item_account.html.erb +24 -0
- data/app/views/layouts/decidim/header/_main_links_mobile_search.html.erb +0 -21
- data/app/views/layouts/decidim/header/_main_menu_mobile.html.erb +12 -0
- data/app/views/layouts/decidim/header/_menu_breadcrumb_desktop.html.erb +1 -1
- data/app/views/layouts/decidim/header/_menu_breadcrumb_main_dropdown_mobile.html.erb +17 -0
- data/app/views/layouts/decidim/header/_menu_breadcrumb_main_dropdown_top_left.html.erb +1 -1
- data/app/views/layouts/decidim/header/_menu_breadcrumb_mobile_tablet.html.erb +1 -1
- data/app/views/layouts/decidim/header/_menu_form_search_mobile.html.erb +16 -0
- data/app/views/layouts/decidim/header/_mobile_language_choose.html.erb +25 -0
- data/app/views/layouts/decidim/mailer.html.erb +2 -2
- data/app/views/layouts/decidim/shared/_layout_center.html.erb +1 -1
- data/app/views/layouts/decidim/shared/_layout_item.html.erb +0 -14
- data/config/initializers/active_storage.rb +3 -0
- data/config/initializers/devise.rb +1 -1
- data/config/initializers/new_framework_defaults_7_0.rb +145 -0
- data/config/locales/ar.yml +2 -42
- data/config/locales/bg.yml +55 -57
- data/config/locales/ca.yml +65 -54
- data/config/locales/cs.yml +53 -55
- data/config/locales/de.yml +63 -52
- data/config/locales/el.yml +0 -29
- data/config/locales/en.yml +68 -57
- data/config/locales/es-MX.yml +67 -56
- data/config/locales/es-PY.yml +67 -56
- data/config/locales/es.yml +66 -55
- data/config/locales/eu.yml +67 -56
- data/config/locales/fi-plain.yml +66 -55
- data/config/locales/fi.yml +65 -54
- data/config/locales/fr-CA.yml +60 -55
- data/config/locales/fr.yml +55 -50
- data/config/locales/ga-IE.yml +0 -11
- data/config/locales/gl.yml +0 -18
- data/config/locales/hu.yml +36 -56
- data/config/locales/id-ID.yml +0 -14
- data/config/locales/is-IS.yml +0 -10
- data/config/locales/it.yml +0 -25
- data/config/locales/ja.yml +67 -56
- data/config/locales/lb.yml +0 -25
- data/config/locales/lt.yml +0 -48
- data/config/locales/lv.yml +0 -21
- data/config/locales/nl.yml +0 -24
- data/config/locales/no.yml +0 -25
- data/config/locales/pl.yml +67 -56
- data/config/locales/pt-BR.yml +4 -51
- data/config/locales/pt.yml +0 -25
- data/config/locales/ro-RO.yml +1 -28
- data/config/locales/ru.yml +0 -15
- data/config/locales/sk.yml +0 -21
- data/config/locales/sl.yml +0 -8
- data/config/locales/sv.yml +0 -33
- data/config/locales/tr-TR.yml +4 -27
- data/config/locales/uk.yml +0 -10
- data/config/locales/zh-CN.yml +0 -22
- data/config/locales/zh-TW.yml +0 -47
- data/config/routes.rb +0 -1
- data/db/migrate/20170128112958_change_user_groups_verified_to_timestamp.rb +1 -1
- data/db/migrate/20240110150230_rename_external_domain_whitelist_to_external_domain_allowlist.rb +7 -0
- data/db/migrate/20240326104215_remove_show_in_footer_in_static_pages.rb +7 -0
- data/db/migrate/20240401192628_change_name_on_decidim_organizations.rb +31 -0
- data/db/seeds/avatars/001.jpg +0 -0
- data/db/seeds/avatars/002.jpg +0 -0
- data/db/seeds/avatars/003.jpg +0 -0
- data/db/seeds/avatars/004.jpg +0 -0
- data/db/seeds/avatars/005.jpg +0 -0
- data/db/seeds/avatars/006.jpg +0 -0
- data/db/seeds/avatars/007.jpg +0 -0
- data/db/seeds/avatars/008.jpg +0 -0
- data/db/seeds/avatars/009.jpg +0 -0
- data/db/seeds/avatars/010.jpg +0 -0
- data/db/seeds/avatars/011.jpg +0 -0
- data/db/seeds/avatars/012.jpg +0 -0
- data/db/seeds/avatars/013.jpg +0 -0
- data/db/seeds/avatars/014.jpg +0 -0
- data/db/seeds/avatars/015.jpg +0 -0
- data/db/seeds/avatars/016.jpg +0 -0
- data/db/seeds/avatars/017.jpg +0 -0
- data/db/seeds/avatars/018.jpg +0 -0
- data/db/seeds/avatars/019.jpg +0 -0
- data/db/seeds/avatars/020.jpg +0 -0
- data/db/seeds/avatars/021.jpg +0 -0
- data/db/seeds/avatars/022.jpg +0 -0
- data/db/seeds/avatars/023.jpg +0 -0
- data/db/seeds/avatars/024.jpg +0 -0
- data/db/seeds/avatars/025.jpg +0 -0
- data/db/seeds/avatars/026.jpg +0 -0
- data/db/seeds/avatars/027.jpg +0 -0
- data/db/seeds/avatars/028.jpg +0 -0
- data/db/seeds/avatars/029.jpg +0 -0
- data/db/seeds/avatars/030.jpg +0 -0
- data/db/seeds/avatars/031.jpg +0 -0
- data/db/seeds/avatars/032.jpg +0 -0
- data/db/seeds/avatars/033.jpg +0 -0
- data/db/seeds/avatars/034.jpg +0 -0
- data/db/seeds/avatars/035.jpg +0 -0
- data/db/seeds/avatars/036.jpg +0 -0
- data/db/seeds/avatars/037.jpg +0 -0
- data/db/seeds/avatars/038.jpg +0 -0
- data/db/seeds/avatars/039.jpg +0 -0
- data/db/seeds/avatars/040.jpg +0 -0
- data/db/seeds/avatars/041.jpg +0 -0
- data/db/seeds/avatars/042.jpg +0 -0
- data/db/seeds/avatars/043.jpg +0 -0
- data/db/seeds/avatars/044.jpg +0 -0
- data/db/seeds/avatars/045.jpg +0 -0
- data/db/seeds/avatars/046.jpg +0 -0
- data/db/seeds/avatars/047.jpg +0 -0
- data/db/seeds/avatars/048.jpg +0 -0
- data/db/seeds/avatars/049.jpg +0 -0
- data/db/seeds/avatars/050.jpg +0 -0
- data/db/seeds/avatars/051.jpg +0 -0
- data/db/seeds/avatars/052.jpg +0 -0
- data/db/seeds/avatars/053.jpg +0 -0
- data/db/seeds/avatars/054.jpg +0 -0
- data/db/seeds/avatars/055.jpg +0 -0
- data/db/seeds/avatars/056.jpg +0 -0
- data/db/seeds/avatars/057.jpg +0 -0
- data/db/seeds/avatars/058.jpg +0 -0
- data/db/seeds/avatars/059.jpg +0 -0
- data/db/seeds/avatars/060.jpg +0 -0
- data/db/seeds/avatars/061.jpg +0 -0
- data/db/seeds/avatars/062.jpg +0 -0
- data/db/seeds/avatars/063.jpg +0 -0
- data/db/seeds/avatars/064.jpg +0 -0
- data/db/seeds/avatars/065.jpg +0 -0
- data/db/seeds/avatars/066.jpg +0 -0
- data/db/seeds/avatars/067.jpg +0 -0
- data/db/seeds/avatars/068.jpg +0 -0
- data/db/seeds/avatars/069.jpg +0 -0
- data/db/seeds/avatars/070.jpg +0 -0
- data/db/seeds/avatars/071.jpg +0 -0
- data/db/seeds/avatars/072.jpg +0 -0
- data/db/seeds/avatars/073.jpg +0 -0
- data/db/seeds/avatars/074.jpg +0 -0
- data/db/seeds/avatars/075.jpg +0 -0
- data/db/seeds/avatars/076.jpg +0 -0
- data/db/seeds/avatars/077.jpg +0 -0
- data/db/seeds/avatars/078.jpg +0 -0
- data/db/seeds/avatars/079.jpg +0 -0
- data/db/seeds/avatars/080.jpg +0 -0
- data/db/seeds/avatars/081.jpg +0 -0
- data/db/seeds/avatars/082.jpg +0 -0
- data/db/seeds/avatars/083.jpg +0 -0
- data/db/seeds/avatars/084.jpg +0 -0
- data/db/seeds/avatars/085.jpg +0 -0
- data/db/seeds/avatars/086.jpg +0 -0
- data/db/seeds/avatars/087.jpg +0 -0
- data/db/seeds/avatars/088.jpg +0 -0
- data/db/seeds/avatars/089.jpg +0 -0
- data/db/seeds/avatars/090.jpg +0 -0
- data/db/seeds/avatars/091.jpg +0 -0
- data/db/seeds/avatars/092.jpg +0 -0
- data/db/seeds/avatars/093.jpg +0 -0
- data/db/seeds/avatars/094.jpg +0 -0
- data/db/seeds/avatars/095.jpg +0 -0
- data/db/seeds/avatars/096.jpg +0 -0
- data/db/seeds/avatars/097.jpg +0 -0
- data/db/seeds/avatars/098.jpg +0 -0
- data/db/seeds/avatars/099.jpg +0 -0
- data/db/seeds/avatars/100.jpg +0 -0
- data/db/seeds/avatars/CREDITS.md +114 -0
- data/db/seeds/avatars/README.md +25 -0
- data/decidim-core.gemspec +6 -5
- data/lib/decidim/acts_as_author.rb +1 -1
- data/lib/decidim/admin_filter.rb +44 -0
- data/lib/decidim/admin_filters_registry.rb +55 -0
- data/lib/decidim/amendable.rb +1 -2
- data/lib/decidim/api/functions/component_finder_base.rb +1 -1
- data/lib/decidim/api/functions/needs_api_filter_and_order.rb +3 -3
- data/lib/decidim/api/functions/participatory_space_finder_base.rb +1 -1
- data/lib/decidim/api/functions/participatory_space_list_base.rb +1 -1
- data/lib/decidim/api/input_filters/user_entity_input_filter.rb +3 -3
- data/lib/decidim/api/interfaces/author_interface.rb +1 -1
- data/lib/decidim/api/types/organization_type.rb +1 -1
- data/lib/decidim/api/types/user_group_type.rb +1 -1
- data/lib/decidim/api/types/user_type.rb +1 -1
- data/lib/decidim/asset_router/pipeline.rb +2 -2
- data/lib/decidim/assets/tailwind/instance.rb +1 -1
- data/lib/decidim/assets/tailwind/tailwind.config.js.erb +8 -3
- data/lib/decidim/attribute_object/model.rb +2 -2
- data/lib/decidim/attribute_object/type_resolver.rb +1 -3
- data/lib/decidim/attribute_object.rb +2 -2
- data/lib/decidim/attributes.rb +0 -4
- data/lib/decidim/authorable.rb +5 -0
- data/lib/decidim/command.rb +2 -2
- data/lib/decidim/commands/create_resource.rb +63 -0
- data/lib/decidim/commands/destroy_resource.rb +74 -0
- data/lib/decidim/commands/hook_error.rb +8 -0
- data/lib/decidim/commands/resource_handler.rb +85 -0
- data/lib/decidim/commands/update_resource.rb +64 -0
- data/lib/decidim/component_manifest.rb +3 -1
- data/lib/decidim/component_validator.rb +1 -1
- data/lib/decidim/content_blocks/has_related_components.rb +1 -1
- data/lib/decidim/content_parsers/resource_parser.rb +2 -2
- data/lib/decidim/content_processor.rb +1 -1
- data/lib/decidim/content_security_policy.rb +1 -1
- data/lib/decidim/core/engine.rb +12 -15
- data/lib/decidim/core/menu.rb +13 -3
- data/lib/decidim/core/seeds.rb +120 -147
- data/lib/decidim/core/test/factories.rb +24 -3
- data/lib/decidim/core/test/shared_examples/acts_as_author_examples.rb +1 -1
- data/lib/decidim/core/test/shared_examples/amendable/withdraw_amendment_examples.rb +2 -2
- data/lib/decidim/core/test/shared_examples/announcements_examples.rb +3 -3
- data/lib/decidim/core/test/shared_examples/assembly_announcements_examples.rb +4 -4
- data/lib/decidim/core/test/shared_examples/comments_examples.rb +88 -82
- data/lib/decidim/core/test/shared_examples/comments_reports_examples.rb +4 -4
- data/lib/decidim/core/test/shared_examples/digest_mail_examples.rb +1 -1
- data/lib/decidim/core/test/shared_examples/edit_link_shared_examples.rb +1 -1
- data/lib/decidim/core/test/shared_examples/editor_shared_examples.rb +7 -7
- data/lib/decidim/core/test/shared_examples/fingerprint_examples.rb +1 -1
- data/lib/decidim/core/test/shared_examples/follows_examples.rb +3 -3
- data/lib/decidim/core/test/shared_examples/has_attachment_collections.rb +4 -2
- data/lib/decidim/core/test/shared_examples/has_attachments.rb +3 -2
- data/lib/decidim/core/test/shared_examples/has_contextual_help.rb +4 -4
- data/lib/decidim/core/test/shared_examples/has_reference.rb +1 -1
- data/lib/decidim/core/test/shared_examples/logo_email.rb +1 -1
- data/lib/decidim/core/test/shared_examples/manage_component_share_tokens.rb +9 -9
- data/lib/decidim/core/test/shared_examples/map_examples.rb +5 -5
- data/lib/decidim/core/test/shared_examples/paginated_resource_examples.rb +2 -2
- data/lib/decidim/core/test/shared_examples/participatory_space_dropdown_metadata_cell_examples.rb +3 -3
- data/lib/decidim/core/test/shared_examples/preview_component_with_share_token_examples.rb +3 -3
- data/lib/decidim/core/test/shared_examples/process_announcements_examples.rb +4 -4
- data/lib/decidim/core/test/shared_examples/reports_examples.rb +5 -5
- data/lib/decidim/core/test/shared_examples/rich_text_editor_examples.rb +10 -10
- data/lib/decidim/core/test/shared_examples/searchable_participatory_space_examples.rb +1 -1
- data/lib/decidim/core/test/shared_examples/searchable_results_examples.rb +8 -8
- data/lib/decidim/core/test/shared_examples/share_link_examples.rb +2 -2
- data/lib/decidim/core/test/shared_examples/simple_event.rb +1 -1
- data/lib/decidim/core/test/shared_examples/space_cell_changes_button_text_cta.rb +3 -3
- data/lib/decidim/core/test/shared_examples/system_endorse_resource_examples.rb +11 -11
- data/lib/decidim/core/test/shared_examples/translated_event_examples.rb +2 -2
- data/lib/decidim/core/test/shared_examples/uncommentable_component_examples.rb +2 -2
- data/lib/decidim/core/test/shared_examples/with_endorsable_permissions_examples.rb +1 -1
- data/lib/decidim/core/version.rb +1 -1
- data/lib/decidim/core.rb +24 -6
- data/lib/decidim/dependency_resolver.rb +3 -3
- data/lib/decidim/diffy_extension.rb +1 -1
- data/lib/decidim/download_your_data_serializers/download_your_data_user_serializer.rb +2 -1
- data/lib/decidim/engine_router.rb +2 -2
- data/lib/decidim/events/base_event.rb +19 -0
- data/lib/decidim/events/simple_event.rb +1 -0
- data/lib/decidim/exporters/export_manifest.rb +1 -1
- data/lib/decidim/faker/localized.rb +3 -3
- data/lib/decidim/form_builder.rb +4 -4
- data/lib/decidim/hashtag.rb +1 -1
- data/lib/decidim/jsonb_attributes.rb +4 -4
- data/lib/decidim/manifest_messages.rb +2 -2
- data/lib/decidim/organization_settings.rb +5 -5
- data/lib/decidim/paddable.rb +1 -1
- data/lib/decidim/participable.rb +1 -1
- data/lib/decidim/participatory_space_manifest.rb +1 -1
- data/lib/decidim/resourceable.rb +1 -1
- data/lib/decidim/search_resource_fields_mapper.rb +2 -2
- data/lib/decidim/searchable.rb +3 -3
- data/lib/decidim/seeds.rb +62 -0
- data/lib/decidim/stats_registry.rb +2 -2
- data/lib/decidim/translatable_attributes.rb +3 -3
- data/lib/decidim/translatable_resource.rb +1 -1
- data/lib/decidim/view_hooks.rb +1 -1
- data/lib/decidim/view_model.rb +4 -0
- data/lib/decidim/webpacker/esbuild.config.js +14 -0
- data/lib/decidim/webpacker/shakapacker.yml +2 -2
- data/lib/decidim/webpacker/tsconfig.json +11 -0
- data/lib/decidim/webpacker/webpack/custom.js +13 -35
- data/lib/devise/models/decidim_newsletterable.rb +1 -1
- data/lib/tasks/decidim_download_your_data_tasks.rake +2 -2
- data/lib/tasks/decidim_locales_tasks.rake +1 -1
- data/lib/tasks/decidim_mailers_tasks.rake +2 -2
- data/lib/tasks/decidim_metrics_tasks.rake +6 -6
- data/lib/tasks/decidim_procfile.rake +9 -3
- data/lib/tasks/decidim_tasks.rake +5 -4
- data/lib/tasks/decidim_webpacker_tasks.rake +126 -117
- data/lib/tasks/upgrade/decidim_active_storage_migration_tasks.rake +80 -0
- data/lib/tasks/upgrade/decidim_content_blocks_tasks.rake +50 -0
- data/lib/tasks/upgrade/decidim_deduplicate_endorsements.rake +1 -1
- data/lib/tasks/upgrade/decidim_fix_categorization.rake +1 -1
- data/lib/tasks/upgrade/decidim_fix_nickname_uniqueness.rake +1 -1
- data/lib/tasks/upgrade/decidim_fix_short_url_resolver.rake +1 -1
- data/lib/tasks/upgrade/decidim_moderation_tasks.rake +1 -1
- data/lib/tasks/upgrade/decidim_user_moderation.rake +1 -1
- metadata +202 -75
- data/app/cells/decidim/content_blocks/cta/show.erb +0 -12
- data/app/cells/decidim/content_blocks/cta_cell.rb +0 -31
- data/app/cells/decidim/footer_pages/pages.erb +0 -3
- data/app/cells/decidim/footer_pages/topics.erb +0 -12
- data/app/cells/decidim/footer_pages_cell.rb +0 -68
- data/app/packs/src/decidim/vendor/modernizr.js +0 -5
- data/app/queries/decidim/similar_emendations.rb +0 -56
- data/app/uploaders/decidim/cw/application_uploader.rb +0 -77
- data/app/uploaders/decidim/cw/attachment_uploader.rb +0 -56
- data/app/uploaders/decidim/cw/avatar_uploader.rb +0 -24
- data/app/uploaders/decidim/cw/banner_image_uploader.rb +0 -7
- data/app/uploaders/decidim/cw/download_your_data_uploader.rb +0 -15
- data/app/uploaders/decidim/cw/downloader.rb +0 -9
- data/app/uploaders/decidim/cw/hero_image_uploader.rb +0 -10
- data/app/uploaders/decidim/cw/homepage_image_uploader.rb +0 -14
- data/app/uploaders/decidim/cw/image_uploader.rb +0 -78
- data/app/uploaders/decidim/cw/newsletter_template_image_uploader.rb +0 -38
- data/app/uploaders/decidim/cw/oauth_application_logo_uploader.rb +0 -10
- data/app/uploaders/decidim/cw/official_image_footer_uploader.rb +0 -10
- data/app/uploaders/decidim/cw/official_image_header_uploader.rb +0 -10
- data/app/uploaders/decidim/cw/open_data_uploader.rb +0 -23
- data/app/uploaders/decidim/cw/organization_favicon_uploader.rb +0 -18
- data/app/uploaders/decidim/cw/organization_logo_uploader.rb +0 -10
- data/app/uploaders/decidim/cw/record_image_uploader.rb +0 -15
- data/app/uploaders/decidim/downloader.rb +0 -9
- data/app/views/decidim/amendments/compare_draft.html.erb +0 -18
- data/app/views/layouts/decidim/_edit_link.html.erb +0 -0
- data/app/views/layouts/decidim/header/_main_links_mobile.html.erb +0 -36
- data/config/initializers/carrierwave.rb +0 -15
- data/lib/decidim/carrier_wave_migrator_service.rb +0 -287
- data/lib/tasks/decidim_active_storage_migration_tasks.rake +0 -114
- data/lib/tasks/decidim_content_blocks_tasks.rake +0 -48
- /data/app/views/layouts/decidim/header/{_menu_breadcrumb_main_dropdown.html.erb → _menu_breadcrumb_main_dropdown_desktop.html.erb} +0 -0
data/lib/decidim/core.rb
CHANGED
@@ -53,6 +53,8 @@ module Decidim
|
|
53
53
|
autoload :Menu, "decidim/menu"
|
54
54
|
autoload :MenuItem, "decidim/menu_item"
|
55
55
|
autoload :MenuRegistry, "decidim/menu_registry"
|
56
|
+
autoload :AdminFilter, "decidim/admin_filter"
|
57
|
+
autoload :AdminFiltersRegistry, "decidim/admin_filters_registry"
|
56
58
|
autoload :ManifestRegistry, "decidim/manifest_registry"
|
57
59
|
autoload :AssetRouter, "decidim/asset_router"
|
58
60
|
autoload :EngineRouter, "decidim/engine_router"
|
@@ -102,7 +104,6 @@ module Decidim
|
|
102
104
|
autoload :ShareableWithToken, "decidim/shareable_with_token"
|
103
105
|
autoload :RecordEncryptor, "decidim/record_encryptor"
|
104
106
|
autoload :AttachmentAttributes, "decidim/attachment_attributes"
|
105
|
-
autoload :CarrierWaveMigratorService, "decidim/carrier_wave_migrator_service"
|
106
107
|
autoload :ReminderRegistry, "decidim/reminder_registry"
|
107
108
|
autoload :ReminderManifest, "decidim/reminder_manifest"
|
108
109
|
autoload :ManifestMessages, "decidim/manifest_messages"
|
@@ -124,6 +125,14 @@ module Decidim
|
|
124
125
|
autoload :IconRegistry, "decidim/icon_registry"
|
125
126
|
autoload :HasConversations, "decidim/has_conversations"
|
126
127
|
|
128
|
+
module Commands
|
129
|
+
autoload :CreateResource, "decidim/commands/create_resource"
|
130
|
+
autoload :UpdateResource, "decidim/commands/update_resource"
|
131
|
+
autoload :DestroyResource, "decidim/commands/destroy_resource"
|
132
|
+
autoload :ResourceHandler, "decidim/commands/resource_handler"
|
133
|
+
autoload :HookError, "decidim/commands/hook_error"
|
134
|
+
end
|
135
|
+
|
127
136
|
include ActiveSupport::Configurable
|
128
137
|
# Loads seeds from all engines.
|
129
138
|
def self.seed!
|
@@ -171,7 +180,7 @@ module Decidim
|
|
171
180
|
|
172
181
|
def self.seed_gamification_badges!
|
173
182
|
Gamification.badges.each do |badge|
|
174
|
-
puts "Setting random values for the \"#{badge.name}\" badge..."
|
183
|
+
puts "Setting random values for the \"#{badge.name}\" badge..." # rubocop:disable Rails/Output
|
175
184
|
User.all.find_each do |user|
|
176
185
|
Gamification::BadgeScore.find_or_create_by!(
|
177
186
|
user:,
|
@@ -305,7 +314,7 @@ module Decidim
|
|
305
314
|
end
|
306
315
|
end
|
307
316
|
|
308
|
-
# Exposes a configuration option: the
|
317
|
+
# Exposes a configuration option: the IPs that are allowed to access the system
|
309
318
|
config_accessor :system_accesslist_ips do
|
310
319
|
[]
|
311
320
|
end
|
@@ -432,7 +441,7 @@ module Decidim
|
|
432
441
|
";"
|
433
442
|
end
|
434
443
|
|
435
|
-
# Exposes a configuration option:
|
444
|
+
# Exposes a configuration option: HTTP_X_FORWARDED_HOST header follow-up.
|
436
445
|
# If a caching system is in place, it can also allow cache and log poisoning attacks,
|
437
446
|
# allowing attackers to control the contents of caches and logs that could be used for other attacks.
|
438
447
|
config_accessor :follow_http_x_forwarded_host do
|
@@ -552,6 +561,11 @@ module Decidim
|
|
552
561
|
%w(terms-of-service)
|
553
562
|
end
|
554
563
|
|
564
|
+
# The default max last activity users to be shown
|
565
|
+
config_accessor :default_max_last_activity_users do
|
566
|
+
6
|
567
|
+
end
|
568
|
+
|
555
569
|
# List of additional content security policies to be appended to the default ones
|
556
570
|
# This is useful for adding custom CSPs for external services like Here Maps, YouTube, etc.
|
557
571
|
# Read more: https://docs.decidim.org/en/develop/configure/initializer#_content_security_policy
|
@@ -757,6 +771,10 @@ module Decidim
|
|
757
771
|
@icons ||= Decidim::IconRegistry.new
|
758
772
|
end
|
759
773
|
|
774
|
+
def self.admin_filter(name, &)
|
775
|
+
AdminFiltersRegistry.register(name.to_sym, &)
|
776
|
+
end
|
777
|
+
|
760
778
|
# Public: Stores an instance of ViewHooks
|
761
779
|
def self.view_hooks
|
762
780
|
@view_hooks ||= ViewHooks.new
|
@@ -821,11 +839,11 @@ module Decidim
|
|
821
839
|
end
|
822
840
|
|
823
841
|
def self.register_assets_path(path)
|
824
|
-
Rails.autoloaders.main.ignore(path)
|
842
|
+
Rails.autoloaders.main.ignore(path)
|
825
843
|
end
|
826
844
|
|
827
845
|
# Checks if a particular decidim gem is installed and needed by this
|
828
|
-
# particular instance.
|
846
|
+
# particular instance. Preferably this happens through bundler by inspecting
|
829
847
|
# the Gemfile of the instance but when Decidim is used without bundler, this
|
830
848
|
# will check:
|
831
849
|
# 1. If the gem is globally available or not in the loaded specs, i.e. the
|
@@ -86,7 +86,7 @@ module Decidim
|
|
86
86
|
File.exist?(path)
|
87
87
|
end
|
88
88
|
|
89
|
-
# Checks if the module for the gem
|
89
|
+
# Checks if the module for the gem specification has been loaded through
|
90
90
|
# `require "decidim/foo"`.
|
91
91
|
#
|
92
92
|
# @param spec [Bundler::LazySpecification, Gem::Specification, String] The
|
@@ -179,8 +179,8 @@ module Decidim
|
|
179
179
|
# @yield [dependency] Yields each dependency to be processed to the
|
180
180
|
# provided block to check if that dependency needs to be processed or
|
181
181
|
# not.
|
182
|
-
# @
|
183
|
-
# @
|
182
|
+
# @yield param [Gem::Dependency] The runtime dependency being processed.
|
183
|
+
# @yield return [Boolean] A boolean indicating whether this dependency
|
184
184
|
# needs to be processed or not. True indicates it needs to be processed
|
185
185
|
# and false indicates processing is not needed.
|
186
186
|
# @return [Bundler::LazySpecification, nil] The specification for the gem
|
@@ -23,7 +23,7 @@ module Decidim
|
|
23
23
|
end
|
24
24
|
end
|
25
25
|
|
26
|
-
# The private "split" method SplitDiff needs to be
|
26
|
+
# The private "split" method SplitDiff needs to be overridden to take into
|
27
27
|
# account the new :unescaped_html format, and the fact that the tags
|
28
28
|
# <ins> <del> are not there anymore
|
29
29
|
Diffy::SplitDiff.module_eval do
|
@@ -5,6 +5,7 @@ module Decidim
|
|
5
5
|
module DownloadYourDataSerializers
|
6
6
|
class DownloadYourDataUserSerializer < Decidim::Exporters::Serializer
|
7
7
|
include Decidim::ResourceHelper
|
8
|
+
include Decidim::TranslatableAttributes
|
8
9
|
|
9
10
|
# Public: Exports a hash with the serialized data for this user.
|
10
11
|
def serialize
|
@@ -16,7 +17,7 @@ module Decidim
|
|
16
17
|
locale: resource.locale,
|
17
18
|
organization: {
|
18
19
|
id: resource.organization.try(:id),
|
19
|
-
name: resource.organization.try(:name)
|
20
|
+
name: translated_attribute(resource.organization.try(:name))
|
20
21
|
},
|
21
22
|
newsletter_notifications_at: resource.newsletter_notifications_at,
|
22
23
|
notifications_sending_frequency: resource.notifications_sending_frequency,
|
@@ -42,12 +42,12 @@ module Decidim
|
|
42
42
|
route_helper?(method_name) || super
|
43
43
|
end
|
44
44
|
|
45
|
-
def method_missing(method_name, *
|
45
|
+
def method_missing(method_name, *)
|
46
46
|
return super unless route_helper?(method_name)
|
47
47
|
|
48
48
|
filter_slug_params!(method_name)
|
49
49
|
|
50
|
-
send(engine).send(method_name, *
|
50
|
+
send(engine).send(method_name, *)
|
51
51
|
end
|
52
52
|
|
53
53
|
private
|
@@ -77,6 +77,25 @@ module Decidim
|
|
77
77
|
|
78
78
|
def resource_text; end
|
79
79
|
|
80
|
+
# The cell that will be used to render the action or nil if not action needs to be rendered.
|
81
|
+
#
|
82
|
+
# @return [nil] - if no action needs to be rendered
|
83
|
+
# @return [String] - if String, it is the cell to be rendered. Make it return with "decidim/notification_actions/buttons"
|
84
|
+
# in your event implementation to render the buttons cell
|
85
|
+
def action_cell; end
|
86
|
+
|
87
|
+
# The data that will be passed to the action cell
|
88
|
+
#
|
89
|
+
# @return [nil] - If no data needs to be rendered
|
90
|
+
# @return [Array<Hash{Symbol => String}>] - For the buttons cell, it should be an array of hashes with the following keys:
|
91
|
+
# - url: the URL to which the button will point
|
92
|
+
# - label: the label of the button (optional if i18n_label is present)
|
93
|
+
# - i18n_label: the i18n key of the label (optional if label is present)
|
94
|
+
# - icon: the icon of the button (optional)
|
95
|
+
# - method: the HTTP method of the request (optional)
|
96
|
+
# - class: the class of the button (optional)
|
97
|
+
def action_data; end
|
98
|
+
|
80
99
|
def organization
|
81
100
|
resource.try(:organization)
|
82
101
|
end
|
@@ -32,7 +32,7 @@ module Decidim
|
|
32
32
|
end
|
33
33
|
|
34
34
|
# Public: Sets the +collection block+ when a block is given, or returns
|
35
|
-
# the previously
|
35
|
+
# the previously set +collection block+ if no block is provided.
|
36
36
|
#
|
37
37
|
# The +collection block+ knows how to obtain the collection of elements
|
38
38
|
# to be serialized by the +Serializer+.
|
@@ -135,9 +135,9 @@ module Decidim
|
|
135
135
|
end.with_indifferent_access
|
136
136
|
end
|
137
137
|
|
138
|
-
#
|
138
|
+
# Wraps a text build by the block with some other text.
|
139
139
|
#
|
140
|
-
# before - The String text to inject at the
|
140
|
+
# before - The String text to inject at the beginning of each value.
|
141
141
|
# after - The String text to inject at the end of each value.
|
142
142
|
# block - A Block that generates a Hash with a text for each locale.
|
143
143
|
#
|
@@ -164,7 +164,7 @@ module Decidim
|
|
164
164
|
end
|
165
165
|
|
166
166
|
# Runs the given block for each of the available locales in Decidim,
|
167
|
-
#
|
167
|
+
# momentarily setting the locale to the current one.
|
168
168
|
#
|
169
169
|
# Returns a Hash with a value for each locale.
|
170
170
|
def self.localized
|
data/lib/decidim/form_builder.rb
CHANGED
@@ -122,7 +122,7 @@ module Decidim
|
|
122
122
|
def hashtaggable_text_field(type, name, locale, options = {})
|
123
123
|
options[:hashtaggable] = true if type.to_sym == :editor
|
124
124
|
|
125
|
-
content_tag(:div
|
125
|
+
content_tag(:div) do
|
126
126
|
if options[:value]
|
127
127
|
send(type, name_with_locale(name, locale), options.merge(label: options[:label], value: options[:value][locale]))
|
128
128
|
else
|
@@ -202,7 +202,7 @@ module Decidim
|
|
202
202
|
|
203
203
|
content_tag(
|
204
204
|
:div,
|
205
|
-
class: "editor
|
205
|
+
class: "editor",
|
206
206
|
id: "#{sanitize_for_dom_selector(@object_name)}_#{sanitize_for_dom_selector(name)}"
|
207
207
|
) do
|
208
208
|
template = ""
|
@@ -416,9 +416,9 @@ module Decidim
|
|
416
416
|
# options - A Hash with options to build the field.
|
417
417
|
# * max_file_size: Maximum size for the file (If you really want to change max
|
418
418
|
# file size you should probably change it in validator).
|
419
|
-
# *
|
419
|
+
# * resource_name: Name of the resource (e.g. user)
|
420
420
|
# * resource_class: Attribute's resource class (e.g. Decidim::User)
|
421
|
-
# *
|
421
|
+
# * resource_class: Class of the resource (e.g. user)
|
422
422
|
# * required: Whether the file is required or not (false by default).
|
423
423
|
# * titled: Whether the file can have title or not.
|
424
424
|
# * show_current: Whether the current file is displayed next to the button.
|
data/lib/decidim/hashtag.rb
CHANGED
@@ -4,7 +4,7 @@ require "active_support/concern"
|
|
4
4
|
|
5
5
|
module Decidim
|
6
6
|
# A set of convenient methods to generate dynamic jsonb objects in a way is
|
7
|
-
# compatible with
|
7
|
+
# compatible with AttributeObject and ActiveModel thus making it easy to
|
8
8
|
# integrate into Rails forms and similar workflows.
|
9
9
|
module JsonbAttributes
|
10
10
|
extend ActiveSupport::Concern
|
@@ -20,15 +20,15 @@ module Decidim
|
|
20
20
|
# jsonb_attribute(:settings, [[:custom_setting, String], [:another_setting, Boolean])
|
21
21
|
# # This will generate `custom_setting`, `custom_setting=` and
|
22
22
|
# # `another_setting`, `another_setting=` and will keep them
|
23
|
-
# #
|
23
|
+
# # synchronized with a hash in `settings`:
|
24
24
|
# # settings = { "custom_setting" => "demo", "another_setting" => "demo"}
|
25
25
|
#
|
26
26
|
# Returns nothing.
|
27
|
-
def jsonb_attribute(name, fields, *
|
27
|
+
def jsonb_attribute(name, fields, *)
|
28
28
|
attribute(name, { String => Object }, default: {})
|
29
29
|
|
30
30
|
fields.each do |f, type|
|
31
|
-
attribute
|
31
|
+
attribute(f, type, *)
|
32
32
|
define_method f do
|
33
33
|
field = public_send(name) || {}
|
34
34
|
field[f.to_s] || field[f.to_sym]
|
@@ -16,8 +16,8 @@ module Decidim
|
|
16
16
|
@store[key] = block
|
17
17
|
end
|
18
18
|
|
19
|
-
def render(key, context = nil, **
|
20
|
-
context.instance_exec(
|
19
|
+
def render(key, context = nil, **)
|
20
|
+
context.instance_exec(**, &@store[key]) if @store[key]
|
21
21
|
end
|
22
22
|
end
|
23
23
|
end
|
@@ -79,7 +79,7 @@ module Decidim
|
|
79
79
|
# Decidim.organization_settings(org).target_config_accessor
|
80
80
|
# #=> returns the organization specific setting
|
81
81
|
#
|
82
|
-
# Decidim.organization_settings(
|
82
|
+
# Decidim.organization_settings(model_belonging_to_org).target_config_accessor
|
83
83
|
# #=> returns the organization specific setting for model's organization
|
84
84
|
#
|
85
85
|
# Decidim.organization_settings(nil).target_config_accessor
|
@@ -104,9 +104,9 @@ module Decidim
|
|
104
104
|
{
|
105
105
|
"upload" => {
|
106
106
|
"allowed_file_extensions" => {
|
107
|
-
"default" => %w(jpg jpeg png pdf rtf txt),
|
108
|
-
"admin" => %w(jpg jpeg png pdf doc docx xls xlsx ppt pptx ppx rtf txt odt ott odf otg ods ots),
|
109
|
-
"image" => %w(jpg jpeg png)
|
107
|
+
"default" => %w(jpg jpeg png webp pdf rtf txt),
|
108
|
+
"admin" => %w(jpg jpeg png webp pdf doc docx xls xlsx ppt pptx ppx rtf txt odt ott odf otg ods ots),
|
109
|
+
"image" => %w(jpg jpeg png webp)
|
110
110
|
},
|
111
111
|
"allowed_content_types" => {
|
112
112
|
"default" => %w(
|
@@ -190,7 +190,7 @@ module Decidim
|
|
190
190
|
|
191
191
|
private
|
192
192
|
|
193
|
-
# Generates a final
|
193
|
+
# Generates a final settings configuration struct from the given settings
|
194
194
|
# hash. Combines the given defaults with the settings hash.
|
195
195
|
#
|
196
196
|
# @param hash [Hash] The configurations hash.
|
data/lib/decidim/paddable.rb
CHANGED
@@ -59,7 +59,7 @@ module Decidim
|
|
59
59
|
@pad_id ||= [reference, token].join("-").slice(0, 50)
|
60
60
|
end
|
61
61
|
|
62
|
-
#
|
62
|
+
# compatibility with old versions if no salt available (less secure)
|
63
63
|
def token
|
64
64
|
if defined?(salt) && salt.present?
|
65
65
|
tokenizer = Decidim::Tokenizer.new(salt:)
|
data/lib/decidim/participable.rb
CHANGED
@@ -98,7 +98,7 @@ module Decidim
|
|
98
98
|
#
|
99
99
|
# Returns nothing.
|
100
100
|
def seed!
|
101
|
-
print "Creating seeds for the #{name} space...\n" unless Rails.env.test?
|
101
|
+
print "Creating seeds for the #{name} space...\n" unless Rails.env.test? # rubocop:disable Rails/Output
|
102
102
|
@seeds&.call
|
103
103
|
end
|
104
104
|
|
data/lib/decidim/resourceable.rb
CHANGED
@@ -111,7 +111,7 @@ module Decidim
|
|
111
111
|
end
|
112
112
|
|
113
113
|
# Check only the resource visibility not its hierarchy.
|
114
|
-
# This method is intended to be
|
114
|
+
# This method is intended to be overridden by classes that include this module and have the
|
115
115
|
# need to impose its own visibility rules.
|
116
116
|
#
|
117
117
|
# @return If the resource is also Publicable checks if the resource is published, otherwise returns true by default.
|
@@ -13,8 +13,8 @@ module Decidim
|
|
13
13
|
#
|
14
14
|
# @param declared_fields: A Hash with the mappings between a SearchableResource attributes and
|
15
15
|
# any given model. Mapped fields are:
|
16
|
-
# - scope_id: The field where the scope is
|
17
|
-
# - participatory_space: The field where the ParticipatorySpace is
|
16
|
+
# - scope_id: The field where the scope is set in the model, if any.
|
17
|
+
# - participatory_space: The field where the ParticipatorySpace is set in the model.
|
18
18
|
# - datetime: The field that describes where in time the model is placed.
|
19
19
|
# - A, B, C, D: Weighted text fields.
|
20
20
|
#
|
data/lib/decidim/searchable.rb
CHANGED
@@ -74,7 +74,7 @@ module Decidim
|
|
74
74
|
after_destroy do |searchable|
|
75
75
|
remove_from_index(searchable) if self.class.search_resource_fields_mapper
|
76
76
|
end
|
77
|
-
# after_create and after_update callbacks are dynamically
|
77
|
+
# after_create and after_update callbacks are dynamically set in `searchable_fields` method.
|
78
78
|
|
79
79
|
# Public: after_create callback to index the model as a SearchableResource, if configured so.
|
80
80
|
#
|
@@ -178,8 +178,8 @@ module Decidim
|
|
178
178
|
# }
|
179
179
|
#
|
180
180
|
# `conditions` must be a Hash that only accepts a boolean or a Proc that will be evaluated on runtime and returns a boolean for the following keys:
|
181
|
-
# - index_on_create: Whether to index, or not, the current
|
182
|
-
# - index_on_update: Whether to index, or not, the current
|
181
|
+
# - index_on_create: Whether to index, or not, the current searchable when it is created. Defaults to true.
|
182
|
+
# - index_on_update: Whether to index, or not, the current searchable when it is updated. Defaults to true.
|
183
183
|
#
|
184
184
|
def searchable_fields(declared_fields, conditions = {})
|
185
185
|
@search_resource_indexable_fields = SearchResourceFieldsMapper.new(declared_fields)
|
data/lib/decidim/seeds.rb
CHANGED
@@ -17,6 +17,27 @@ module Decidim
|
|
17
17
|
@admin_user ||= Decidim::User.find_by(organization:, email: "admin@example.org")
|
18
18
|
end
|
19
19
|
|
20
|
+
def find_or_initialize_user_by(email:)
|
21
|
+
user = Decidim::User.find_or_initialize_by(email:)
|
22
|
+
user.update!(
|
23
|
+
name: ::Faker::Name.name,
|
24
|
+
nickname: ::Faker::Twitter.unique.screen_name,
|
25
|
+
password: "decidim123456789",
|
26
|
+
organization:,
|
27
|
+
confirmed_at: Time.current,
|
28
|
+
locale: I18n.default_locale,
|
29
|
+
personal_url: ::Faker::Internet.url,
|
30
|
+
about: ::Faker::Lorem.paragraph(sentence_count: 2),
|
31
|
+
avatar: random_avatar,
|
32
|
+
accepted_tos_version: organization.tos_version + 1.hour,
|
33
|
+
newsletter_notifications_at: Time.current,
|
34
|
+
tos_agreement: true,
|
35
|
+
password_updated_at: Time.current
|
36
|
+
)
|
37
|
+
|
38
|
+
user
|
39
|
+
end
|
40
|
+
|
20
41
|
def random_scope(participatory_space:)
|
21
42
|
if participatory_space.scope
|
22
43
|
scopes = participatory_space.scope.descendants
|
@@ -86,10 +107,51 @@ module Decidim
|
|
86
107
|
)
|
87
108
|
end
|
88
109
|
|
110
|
+
def create_report!(reportable:, current_user:)
|
111
|
+
moderation = Moderation.find_or_create_by!(reportable:, participatory_space: reportable.participatory_space)
|
112
|
+
|
113
|
+
Decidim::Report.create!(
|
114
|
+
moderation:,
|
115
|
+
user: current_user,
|
116
|
+
locale: I18n.locale,
|
117
|
+
reason: "spam",
|
118
|
+
details: "From the seeds"
|
119
|
+
)
|
120
|
+
rescue ActiveRecord::RecordInvalid
|
121
|
+
# Ignore in case we have an error in the report creation.
|
122
|
+
# Most likely is a "Validation failed: User has already been taken"
|
123
|
+
end
|
124
|
+
|
125
|
+
def hide_report!(reportable:)
|
126
|
+
moderation = Moderation.find_or_create_by!(reportable:, participatory_space: reportable.participatory_space)
|
127
|
+
moderation.update!(hidden_at: Time.zone.now)
|
128
|
+
end
|
129
|
+
|
130
|
+
def create_user_report!(reportable:, current_user:)
|
131
|
+
moderation = UserModeration.find_or_create_by!(user: reportable)
|
132
|
+
|
133
|
+
UserReport.create!(
|
134
|
+
moderation:,
|
135
|
+
user: current_user,
|
136
|
+
reason: "spam",
|
137
|
+
details: "From the seeds"
|
138
|
+
)
|
139
|
+
end
|
140
|
+
|
89
141
|
def seed_components_manifests!(participatory_space:)
|
90
142
|
Decidim.component_manifests.each do |manifest|
|
91
143
|
manifest.seed!(participatory_space.reload)
|
92
144
|
end
|
93
145
|
end
|
146
|
+
|
147
|
+
def random_avatar
|
148
|
+
file_number = format("%03d", rand(1...100))
|
149
|
+
|
150
|
+
create_blob!(seeds_file: "avatars/#{file_number}.jpg", filename: "#{file_number}.jpg", content_type: "image/jpeg")
|
151
|
+
end
|
152
|
+
|
153
|
+
def create_follow!(user, followable)
|
154
|
+
Decidim::Follow.create!(followable:, user:)
|
155
|
+
end
|
94
156
|
end
|
95
157
|
end
|
@@ -40,7 +40,7 @@ module Decidim
|
|
40
40
|
# Public: Returns a number returned by executing the corresponding block.
|
41
41
|
#
|
42
42
|
# name - The name of the stat
|
43
|
-
# context - An
|
43
|
+
# context - An arbitrary context object to compute the result.
|
44
44
|
# start_at - A date to filter resources created after it
|
45
45
|
# end_at - A date to filter resources created before it.
|
46
46
|
#
|
@@ -54,7 +54,7 @@ module Decidim
|
|
54
54
|
|
55
55
|
# Public: Resolves every stat with the given context and return an enumerator
|
56
56
|
#
|
57
|
-
# context - An
|
57
|
+
# context - An arbitrary context object to compute the result.
|
58
58
|
# start_at - A date to filter resources created after it
|
59
59
|
# end_at - A date to filter resources created before it
|
60
60
|
#
|
@@ -17,7 +17,7 @@ module Decidim
|
|
17
17
|
# type - The attribute's type
|
18
18
|
# options - Options to send to the form class when defining the attribute.
|
19
19
|
# block - An optional block to be called for each attribute name and
|
20
|
-
# locale. The block will receive two arguments, one with the
|
20
|
+
# locale. The block will receive two arguments, one with the attribute
|
21
21
|
# name and another with the locale.
|
22
22
|
#
|
23
23
|
#
|
@@ -34,12 +34,12 @@ module Decidim
|
|
34
34
|
# end
|
35
35
|
#
|
36
36
|
# Returns nothing.
|
37
|
-
def translatable_attribute(name, type, **
|
37
|
+
def translatable_attribute(name, type, **)
|
38
38
|
attribute(name, { String => Object }, default: {})
|
39
39
|
|
40
40
|
locales.each do |locale|
|
41
41
|
attribute_name = "#{name}_#{locale}".gsub("-", "__")
|
42
|
-
attribute
|
42
|
+
attribute(attribute_name, type, **)
|
43
43
|
|
44
44
|
define_method attribute_name do
|
45
45
|
field = public_send(name) || {}
|
@@ -19,7 +19,7 @@ module Decidim
|
|
19
19
|
method_name = "#{field}="
|
20
20
|
|
21
21
|
# We are overriding the attribute setter method so that we can reuse the
|
22
|
-
# machine translations. This is to fix a bug
|
22
|
+
# machine translations. This is to fix a bug encountered when updating
|
23
23
|
# the resource from a FormObject. The FormObject on the `#create`
|
24
24
|
# action in the controller does not have the machine translations loaded,
|
25
25
|
# so they are effectively lost whenever a resource is updated.
|
data/lib/decidim/view_hooks.rb
CHANGED
@@ -87,7 +87,7 @@ module Decidim
|
|
87
87
|
# Internal class to encapsulate each view registered on a view hook.
|
88
88
|
class ViewHook
|
89
89
|
# priority - a Number (Integer|Float) to sort the block.
|
90
|
-
# block - a block that will
|
90
|
+
# block - a block that will be rendered in a view context.
|
91
91
|
def initialize(priority, block)
|
92
92
|
@priority = priority
|
93
93
|
@block = block
|
data/lib/decidim/view_model.rb
CHANGED
@@ -17,8 +17,12 @@ module Decidim
|
|
17
17
|
include Decidim::MarkupHelper
|
18
18
|
include Decidim::LayoutHelper
|
19
19
|
include Decidim::SanitizeHelper
|
20
|
+
include Decidim::ApplicationHelper
|
21
|
+
include Decidim::IconHelper
|
20
22
|
|
23
|
+
delegate :helper_method, to: :controller
|
21
24
|
delegate :current_organization, to: :controller
|
25
|
+
delegate_missing_to :view_context
|
22
26
|
|
23
27
|
cache :show, if: :perform_caching?, expires_in: :cache_expiry_time do
|
24
28
|
cache_hash
|
@@ -22,12 +22,12 @@ default: &default
|
|
22
22
|
cache_manifest: false
|
23
23
|
|
24
24
|
# Select loader to use, available options are 'babel' (default), 'swc' or 'esbuild'
|
25
|
-
webpack_loader: '
|
25
|
+
webpack_loader: 'esbuild'
|
26
26
|
|
27
27
|
# Set to true to enable check for matching versions of shakapacker gem and NPM package - will raise an error if there is a mismatch or wildcard versioning is used
|
28
28
|
ensure_consistent_versioning: true
|
29
29
|
|
30
|
-
# Select whether the compiler will use SHA digest ('digest' option) or most
|
30
|
+
# Select whether the compiler will use SHA digest ('digest' option) or most recent modified timestamp ('mtime') to determine freshness
|
31
31
|
compiler_strategy: digest
|
32
32
|
|
33
33
|
# Select whether the compiler will always use a content hash and not just in production
|
@@ -0,0 +1,11 @@
|
|
1
|
+
{
|
2
|
+
"compilerOptions": {
|
3
|
+
"strict": true, /* Enable all strict type-checking options. */
|
4
|
+
"removeComments": true, /* Disable emitting comments. */
|
5
|
+
"allowJs": true, /* Allow JavaScript files to be a part of your program. Use the `checkJS` option to get errors from these files. */
|
6
|
+
"module": "commonjs", /* Specify what module code is generated. */
|
7
|
+
"incremental": true, /* Enable incremental compilation */
|
8
|
+
"target": "es6", /* Set the JavaScript language version for emitted JavaScript and include compatible library declarations. */
|
9
|
+
"skipLibCheck": true, /* Skip type checking all .d.ts files. */
|
10
|
+
}
|
11
|
+
}
|