djsundog/tootlab-mastodon
1
0
Fork 0
mirror of https://github.com/glitch-soc/mastodon.git synced 2024-11-25 09:34:16 -05:00
Code Issues Packages Projects Releases Wiki Activity
b632c5a55a
tootlab-mastodon/app/javascript/mastodon/features/compose/components
History
Claire 4ed09276d5 Merge branch 'main' into glitch-soc/merge-upstream 
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-25 14:00:40 +01:00
..
action_bar.jsx Rename JSX files with proper .jsx extension (#23733) 2023-02-20 03:20:59 +01:00
autosuggest_account.jsx Rename JSX files with proper .jsx extension (#23733) 2023-02-20 03:20:59 +01:00
character_counter.jsx Rename JSX files with proper .jsx extension (#23733) 2023-02-20 03:20:59 +01:00
compose_form.jsx Merge branch 'main' into glitch-soc/merge-upstream 2023-02-25 14:00:40 +01:00
emoji_picker_dropdown.jsx Rename JSX files with proper .jsx extension (#23733) 2023-02-20 03:20:59 +01:00
language_dropdown.jsx Add lang tag to native language names in language picker (#23749) 2023-02-21 09:23:39 +01:00
navigation_bar.jsx Rename JSX files with proper .jsx extension (#23733) 2023-02-20 03:20:59 +01:00
poll_button.jsx Rename JSX files with proper .jsx extension (#23733) 2023-02-20 03:20:59 +01:00
poll_form.jsx Merge branch 'main' into glitch-soc/merge-upstream 2023-02-25 14:00:40 +01:00
privacy_dropdown.jsx Rename JSX files with proper .jsx extension (#23733) 2023-02-20 03:20:59 +01:00
reply_indicator.jsx Rename JSX files with proper .jsx extension (#23733) 2023-02-20 03:20:59 +01:00
search_results.jsx Rename JSX files with proper .jsx extension (#23733) 2023-02-20 03:20:59 +01:00
search.jsx Rename JSX files with proper .jsx extension (#23733) 2023-02-20 03:20:59 +01:00
text_icon_button.jsx Rename JSX files with proper .jsx extension (#23733) 2023-02-20 03:20:59 +01:00
upload_button.jsx Rename JSX files with proper .jsx extension (#23733) 2023-02-20 03:20:59 +01:00
upload_form.jsx Rename JSX files with proper .jsx extension (#23733) 2023-02-20 03:20:59 +01:00
upload_progress.jsx Rename JSX files with proper .jsx extension (#23733) 2023-02-20 03:20:59 +01:00
upload.jsx Rename JSX files with proper .jsx extension (#23733) 2023-02-20 03:20:59 +01:00
warning.jsx Rename JSX files with proper .jsx extension (#23733) 2023-02-20 03:20:59 +01:00