Age | Commit message (Collapse) | Author | |
---|---|---|---|
2023-04-09 | Merge branch 'main' into glitch-soc/merge-upstream | Claire | |
Conflicts: - `package.json`: Upstream removed a dependency that was textually close to a glitch-soc-only dependency. Removed the dependency as upstream did, while keeping the glitch-soc-only dependency. | |||
2023-04-04 | Ensure tabIndex is number instead of string (#24409) | Nick Schonning | |
2023-03-26 | Merge branch 'main' into glitch-soc/main | Claire | |
2023-03-24 | Remove legacy decorators syntax (#18357) | Yamagishi Kazutoshi | |
2023-02-25 | Merge branch 'main' into glitch-soc/merge-upstream | Claire | |
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-20 | Rename JSX files with proper `.jsx` extension (#23733) | Renaud Chaput | |