about summary refs log tree commit diff
path: root/app/javascript
AgeCommit message (Collapse)Author
2023-03-22Merge branch 'main' into glitch-soc/merge-upstreamClaire
Conflicts: - `app/models/status.rb`: Upstream added lines close to a glitch-soc only line, not a real conflict. Applied upstream's changes (added hooks) while keeping glitch-soc's changes (`local_only` scope). - `config/environments/production.rb`: Upstream removed a header, while we have glitch-soc specific ones. Removed the header removed upstream.
2023-03-20Fit the max-width of media in .prose to parent box (#24180)mogamin
2023-03-19Add getting-started-misc to route (#2141)Plastikmensch
* Add getting-started-misc to web_app_paths Signed-off-by: Plastikmensch <plastikmensch@users.noreply.github.com> * Add signed in check to navigation entries Enabling routing for getting-started-misc allows the column to be directly accessible, which showed every entry and threw unnecessary errors. Also fixed the keys as these were literally "i++". Signed-off-by: Plastikmensch <plastikmensch@users.noreply.github.com> * Remove "Extended information" from getting-started-misc I couldn't find any reference to this translation string, so I removed it too. Signed-off-by: Plastikmensch <plastikmensch@users.noreply.github.com> --------- Signed-off-by: Plastikmensch <plastikmensch@users.noreply.github.com>
2023-03-16[Glitch] Replace `Status#translatable?` with language matrix in separate ↵Christian Schmidt
endpoint Port bd047acc356671727c112336bb237f979bba517d to glitch-soc Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2023-03-16Merge branch 'main' into glitch-soc/merge-upstreamClaire
Conflicts: - `README.md`: Upstream changed their README, we have our own. Kept ours. - `app/helpers/application_helper.rb`: Minor code style fix upstream, on a line that is different in glitch-soc due to the different theming system. Applied the code style fix to our own code. - `app/views/settings/preferences/appearance/show.html.haml`: Code style fix on a line next to lines exclusive to glitch-soc. Applied upstream changes. - `yarn.lock`: Upstream updated a dependency textually close to a glitch-soc-only dependency. Updated the dependency like upstream did.
2023-03-16New Crowdin updates (#23904)Eugen Rochko
Co-authored-by: Yamagishi Kazutoshi <ykzts@desire.sh>
2023-03-16Replace `Status#translatable?` with language matrix in separate endpoint ↵Christian Schmidt
(#24037)
2023-03-15[Glitch] Center the text itself in upload areaRodion Borisov
Port a52ccd7ad98d7d60dffb520c0397ba8aa4c2eb9d to glitch-soc Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2023-03-15[Glitch] add modal message when editing tootPauloVilarinho
Port 8770473dbb92042f76e058469a76e5bb4beecb9f to glitch-soc Co-authored-by: PauloVilarinho <paulotarsobranco@hotmail.com> Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2023-03-15Merge branch 'main' into glitch-soc/merge-upstreamClaire
Conflicts: - `.github/workflows/build-image.yml`: Upstream switched to pushing to both DockerHub and GitHub Container Repository, while glitch-soc was already pushing to the latter only. Updated our configuration to be slightly more consistent with upstream's naming and styling, but kept our behavior. - `Gemfile.lock`: Updated dependencies textually too close to glitch-soc only hcaptcha dependency. Updated dependencies as upstream did. - `README.md`: Upstream updated its README, but we have a completely different one. Kept our README, though it probably should be reworked at some point. - `app/views/auth/sessions/two_factor.html.haml`: Minor style fix upstream that's on a line glitch-soc removed because of its different theming system. Kept our file as is. - `spec/controllers/health_controller_spec.rb`: This file apparently did not exist upstream, upstream created it with different contents but it is functionally the same. Switched to upstream's version of the file. - `spec/presenters/instance_presenter_spec.rb`: Upstream changed the specs around `GITHUB_REPOSITORY`, while glitch-soc had its own code because it's a fork and does not have the same default source URL. Took upstream's change, but with glitch-soc's repo as the default case. - `yarn.lock`: Upstream dependencies textually too close to a glitch-soc only one. Updated dependencies as upstream did.
2023-03-09Center the text itself in upload area (#24029)Rodion Borisov
2023-03-06add modal message when editing toot (#23936)PauloVilarinho
Co-authored-by: PauloVilarinho <paulotarsobranco@hotmail.com>
2023-03-05Refactor glitch-soc rich text SCSSClaire
2023-03-05[Glitch] Only offer translation for supported languagesChristian Schmidt
Port 5a8c651e8f0252c7135042e79396f782361302d9 to glitch-soc Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2023-03-05[Glitch] Switched bookmark and favourites aroundTerry Garcia
Port a1347f456e47e085ef1031b607cabd0683c496c2 to glitch-soc Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2023-03-05[Glitch] Fix duplicate “Publish” button on mobileClaire
Port b55fc883b6181fb8080fbafd53bc7a9f1896b295 to glitch-soc Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2023-03-05Merge branch 'main' into glitch-soc/merge-upstreamClaire
Conflicts: - `README.md`: Upstream README has been changed, but we have a completely different one. Kept our `README.md`. - `lib/sanitize_ext/sanitize_config.rb`: Upstream added support for more incoming HTML tags (a large subset of what glitch-soc accepts). Change the code style to match upstream's but otherwise do not change our code. - `spec/lib/sanitize_config_spec.rb`: Upstream added support for more incoming HTML tags (a large subset of what glitch-soc accepts). Kept our version, since the tests are mostly glitch-soc's, except for cases which are purposefuly different.
2023-03-05New Crowdin updates (#2118)Claire
* New translations en.json (Spanish) [ci skip] * New translations en.yml (Spanish) [ci skip]
2023-03-05[Glitch] Add `lang` attribute to media and poll optionsChristian Schmidt
Port d3eefead3014175b264cb56f6f4cb552cbaaeac6 to glitch-soc Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2023-03-04Do not leave Mastodon when clicking “Back” (#23953)Christian Schmidt
2023-03-03Only offer translation for supported languages (#23879)Christian Schmidt
2023-03-03Switched bookmark and favourites around (#23701)Terry Garcia
2023-03-03Fix duplicate “Publish” button on mobile (#23804)Claire
2023-03-03Add support for incoming rich text (#23913)Claire
2023-03-02Merge branch 'main' into glitch-soc/merge-upstreamClaire
2023-02-28New Crowdin updates (#23802)Eugen Rochko
Co-authored-by: Yamagishi Kazutoshi <ykzts@desire.sh>
2023-02-26Add `lang` attribute to media and poll options (#23891)Christian Schmidt
2023-02-25Move misc rules from components/index.scss to components/misc.scssClaire
2023-02-25Fix glitch-soc SCSS code style and refactor closer to upstreamClaire
2023-02-25[Glitch] Add `lang` attribute to preview cardChristian Schmidt
Port 8000a8f2309d428c2ce72fe5ffba940754d55339 to glitch-soc Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2023-02-25[Glitch] Increase contrast of upload progress backgroundTim Lucas
Port f4f91bc295fd423bdc81ca17f0f9491ed6cd897e to glitch-soc Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2023-02-25[Glitch] Fix sidebar cut-off on small screens in admin UIBotao Wang
Port 7adde24a95218048f14c29bee0d25afaeae99509 to glitch-soc Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2023-02-25[Glitch] Add `lang` tag to native language names in language pickerClaire
Port 7207a98d3990124c6dc1df2187475695c800e65f to glitch-soc Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2023-02-25[Glitch] Rename JSX files with proper `.jsx` extensionRenaud Chaput
Port 44a7d87cb1f5df953b6c14c16c59e2e4ead1bcb9 to glitch-soc Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2023-02-25Fix building vanilla flavor after JSX changeClaire
2023-02-25Merge branch 'main' into glitch-soc/merge-upstreamClaire
Conflicts: - `.prettierignore`: Upstream added a line at the end of the file, while glitch-soc had its own extra lines. Took upstream's change. - `CONTRIBUTING.md`: We have our custom CONTRIBUTING.md quoting upstream. Upstream made changes. Ported upstream changes. - `app/controllers/application_controller.rb`: Upstream made code style changes in a method that is entirely replaced in glitch-soc. Ignored the change. - `app/models/account.rb`: Code style changes textually close to glitch-soc-specific changes. Ported upstream changes. - `lib/sanitize_ext/sanitize_config.rb`: Upstream code style changes. Ignored them.
2023-02-24Add `lang` attribute to preview card (#23869)Christian Schmidt
2023-02-23Increase contrast of upload progress background (#23836)Tim Lucas
2023-02-22New Crowdin updates (#23625)Eugen Rochko
Co-authored-by: Yamagishi Kazutoshi <ykzts@desire.sh>
2023-02-21Fix sidebar cut-off on small screens in admin UI (#23764)Botao Wang
2023-02-21Add `lang` tag to native language names in language picker (#23749)Claire
2023-02-20Change compose form checkbox to native input with `appearance: none` (#22949)Claire
2023-02-20Make larger part of status clickable (#23621)Christian Schmidt
2023-02-20Rename JSX files with proper `.jsx` extension (#23733)Renaud Chaput
2023-02-19[Glitch] Fix focus point of already-attached media not saving after editClaire
Port b2283b68388bf5ec03da1ed367566a21a5e957f2 to glitch-soc Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2023-02-19[Glitch] Fix bad type for spellCheck attributeChristian Schmidt
Port cde13349cb0ad8e280156cef7fc50692f943b0b2 to glitch-soc Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2023-02-19[Glitch] Enable ESLint Promise plugin defaultsNick Schonning
Port 5e1c0c3d946bef488f8e156ed3b5034740e731df to glitch-soc Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2023-02-19Merge branch 'main' into glitch-soc/merge-upstreamClaire
Conflicts: - `.github/dependabot.yml`: Upstream made changes while we have dropped this file. Keep the file deleted. - `.prettierignore`: Upstream made changes at the end of the file, where we had our extra lines. Just moved our extra lines back at the end. - `app/serializers/initial_state_serializer.rb`: Upstream code style changes. Applied them. - `app/services/backup_service.rb`: Upstream code style changes. Applied them.
2023-02-19Fix focus point of already-attached media not saving after edit (#23566)Claire
2023-02-18Merge pull request #2112 from ClearlyClaire/glitch-soc/merge-upstreamClaire
Merge upstream changes
generated by cgit-pink (git 2.37.1) at 2024-11-25 09:50:25 +0000