namekuji/chuckya
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity
chuckya/app/javascript/mastodon/features/compose/components
History
Claire 25a46d9e59 Merge branch 'main' into glitch-soc/merge-upstream 
Conflicts:
- `app/javascript/styles/fonts/montserrat.scss`:
  Code style changes upstream, path changes in glitch-soc.
  Applied upstream's code style changes.
- `app/javascript/styles/fonts/roboto-mono.scss`:
  Code style changes upstream, path changes in glitch-soc.
  Applied upstream's code style changes.
- `app/javascript/styles/fonts/roboto.scss`:
  Code style changes upstream, path changes in glitch-soc.
  Applied upstream's code style changes.
- `app/models/account.rb`:
  Textual conflict only caused by glitch-soc using a different value
  for character limits in a nearby line.
  Applied upstream's changes.
- `app/views/statuses/_simple_status.html.haml`:
  Attribute added to a tag modified by glitch-soc.
  Added upstream's attributes.
- `yarn.lock`:
  Upstream added/updated dependencies close to glitch-soc-only ones.
  Updated/added upstream dependencies.
2022-06-02 09:49:38 +02:00
..
action_bar.js Change "Direct" status visibility to "Only people I mention" in web UI (#18146) 2022-04-29 00:24:31 +02:00
autosuggest_account.js
character_counter.js
compose_form.js Merge branch 'main' into glitch-soc/merge-upstream 2022-06-02 09:49:38 +02:00
emoji_picker_dropdown.js Fix opening the emoji picker scrolling the single-column view to the top (#17579) 2022-02-16 21:44:47 +01:00
language_dropdown.js Add language dropdown to compose in web UI (#18420) 2022-05-16 11:18:35 +02:00
navigation_bar.js Change routing paths to use usernames in web UI (#16171) 2021-09-26 05:46:13 +02:00
poll_button.js
poll_form.js Merge branch 'master' into glitch-soc/merge-upstream 2020-05-13 22:11:49 +02:00
privacy_dropdown.js Change “Only people I mention” to “Mentioned people only” (#18291) 2022-05-03 12:30:40 +02:00
reply_indicator.js Change routing paths to use usernames in web UI (#16171) 2021-09-26 05:46:13 +02:00
search.js Scroll into search bar when focus (#12032) 2019-10-01 19:19:10 +02:00
search_results.js Change "Direct" status visibility to "Only people I mention" in web UI (#18146) 2022-04-29 00:24:31 +02:00
text_icon_button.js Add language dropdown to compose in web UI (#18420) 2022-05-16 11:18:35 +02:00
upload.js Add hint about missing media attachment description in web UI (#17845) 2022-03-22 09:48:12 +01:00
upload_button.js Improve wording of the “Add media” button tooltip (#13954) 2020-06-26 00:14:29 +02:00
upload_form.js
upload_progress.js
warning.js