diff --git a/README.FLIPBOARD b/README.FLIPBOARD new file mode 100644 index 00000000000000..fe76d1b1158170 --- /dev/null +++ b/README.FLIPBOARD @@ -0,0 +1,17 @@ +- added updater_post_install.sh script +- added jenkins build script + +############## +# To sync fork +############## +$ git fetch upstream +$ git checkout main +$ git merge upstream/main +$ git push + +############## +# To get tags from upstream +############## +$ git fetch --tags upstream +$ git push --tags + diff --git a/app/controllers/auth/registrations_controller.rb b/app/controllers/auth/registrations_controller.rb index e70ae5b1b8b371..e7724e3e0afbbc 100644 --- a/app/controllers/auth/registrations_controller.rb +++ b/app/controllers/auth/registrations_controller.rb @@ -55,7 +55,7 @@ def build_resource(hash = nil) def configure_sign_up_params devise_parameter_sanitizer.permit(:sign_up) do |user_params| - user_params.permit({ account_attributes: [:username, :display_name], invite_request_attributes: [:text] }, :email, :password, :password_confirmation, :invite_code, :agreement, :website, :confirm_password) + user_params.permit({ account_attributes: [:username, :display_name], invite_request_attributes: [:text, :flipboard_username] }, :email, :password, :password_confirmation, :invite_code, :agreement, :website, :confirm_password) end end diff --git a/app/helpers/branding_helper.rb b/app/helpers/branding_helper.rb index 2b9c233c23bcfa..860934a3f80a65 100644 --- a/app/helpers/branding_helper.rb +++ b/app/helpers/branding_helper.rb @@ -11,7 +11,7 @@ def logo_as_symbol(version = :icon) end def _logo_as_symbol_wordmark - content_tag(:svg, tag.use(href: '#logo-symbol-wordmark'), viewBox: '0 0 261 66', class: 'logo logo--wordmark') + content_tag(:svg, tag.use(href: '#logo-symbol-wordmark'), viewBox: '0 0 500 500', class: 'logo logo--wordmark') end def _logo_as_symbol_icon diff --git a/app/javascript/images/app-icon.svg b/app/javascript/images/app-icon.svg index 1035bd076e873b..09e1cae9ec00ab 100644 --- a/app/javascript/images/app-icon.svg +++ b/app/javascript/images/app-icon.svg @@ -1,28 +1 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - +Logomark_DIGITAL_Red_500X500 \ No newline at end of file diff --git a/app/javascript/images/logo-symbol-icon.svg b/app/javascript/images/logo-symbol-icon.svg index c4c14f098afa02..09e1cae9ec00ab 100644 --- a/app/javascript/images/logo-symbol-icon.svg +++ b/app/javascript/images/logo-symbol-icon.svg @@ -1,2 +1 @@ - - +Logomark_DIGITAL_Red_500X500 \ No newline at end of file diff --git a/app/javascript/images/logo-symbol-wordmark.svg b/app/javascript/images/logo-symbol-wordmark.svg index ee0b636d936fa3..98833d696623b7 100644 --- a/app/javascript/images/logo-symbol-wordmark.svg +++ b/app/javascript/images/logo-symbol-wordmark.svg @@ -1,11 +1 @@ - - - - - - - - - - - +Vertical-Lockup_DIGITAL_Red_500px diff --git a/app/javascript/images/logo.svg b/app/javascript/images/logo.svg index 11d0c30c56271b..09e1cae9ec00ab 100644 --- a/app/javascript/images/logo.svg +++ b/app/javascript/images/logo.svg @@ -1,10 +1 @@ - - - - - - - - - - +Logomark_DIGITAL_Red_500X500 \ No newline at end of file diff --git a/app/javascript/images/mailer/logo.png b/app/javascript/images/mailer/logo.png index 784be9539f3474..89b030a691a337 100644 Binary files a/app/javascript/images/mailer/logo.png and b/app/javascript/images/mailer/logo.png differ diff --git a/app/javascript/images/mailer/wordmark.png b/app/javascript/images/mailer/wordmark.png index 6772b3318dc35c..2a0ca522f2d596 100644 Binary files a/app/javascript/images/mailer/wordmark.png and b/app/javascript/images/mailer/wordmark.png differ diff --git a/app/javascript/images/preview.png b/app/javascript/images/preview.png index 3d3a17b23c5591..9e247425f264f4 100644 Binary files a/app/javascript/images/preview.png and b/app/javascript/images/preview.png differ diff --git a/app/javascript/mastodon/features/compose/components/poll_form.jsx b/app/javascript/mastodon/features/compose/components/poll_form.jsx index 1a4d30abe71393..394faeae2e1b01 100644 --- a/app/javascript/mastodon/features/compose/components/poll_form.jsx +++ b/app/javascript/mastodon/features/compose/components/poll_form.jsx @@ -164,7 +164,7 @@ class PollForm extends ImmutablePureComponent {
- + {/* eslint-disable-next-line jsx-a11y/no-onchange */}