Claire f224237862 Merge branch 'main' into glitch-soc/merge-upstream ...

Conflicts:
- `db/schema.rb`:
  Conflict due to glitch-soc adding the `content_type` column on status edits
  and thus having a different schema version number.
  Solved by taking upstream's schema version number, as it is higher than
  glitch-soc's.

2022-02-17 10:58:44 +01:00

..

action_bar.js

…

autosuggest_account.js

…

character_counter.js

…

compose_form.js

Merge branch 'main' into glitch-soc/merge-upstream

2022-02-12 21:36:33 +01: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

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

…

privacy_dropdown.js

Fix controls for unchangeable properties on status edit not being disabled (#17531)

2022-02-12 19:00:33 +01:00

reply_indicator.js

Change routing paths to use usernames in web UI (#16171)

2021-09-26 05:46:13 +02:00

search_results.js

Add graphs and retention metrics to admin dashboard (#16829)

2021-10-14 20:44:59 +02:00

search.js

…

text_icon_button.js

…

upload_button.js

…

upload_form.js

…

upload_progress.js

…

upload.js

Fix controls for unchangeable properties on status edit not being disabled (#17531)

2022-02-12 19:00:33 +01:00

warning.js

…