mirrors/catstodon
1
0
Fork 0
mirror of https://git.kescher.at/CatCatNya/catstodon.git synced 2024-11-24 11:38:07 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions
catstodon/app/javascript/mastodon/features/compose/components
History
Thibaut Girka dcded13a99 Merge branch 'master' into glitch-soc/merge-upstream 
Conflicts:
- .github/ISSUE_TEMPLATE/bug_report.md
  Took our version.
- CONTRIBUTING.md
  Updated the embedded copy of upstream's version.
- README.md
  Took our version.
- app/policies/status_policy.rb
  Not a real conflict, took code from both.
- app/views/layouts/embedded.html.haml
  Added upstream's changes (dns-prefetch) and fixed
  `%body.embed`
- app/views/settings/preferences/show.html.haml
  Reverted some of upstream changes, as we have a
  page dedicated for flavours and skins.
- config/initializers/content_security_policy.rb
  Kept our version of the CSP.
- config/initializers/doorkeeper.rb
  Not a real conflict, took code from both.
2018-10-22 17:51:38 +02:00
..
action_bar.js Upgrade Babel to version 7.0.0 (#5925) 2018-09-14 17:59:48 +02:00
autosuggest_account.js Display full username in tooltip on search and autosuggest #7478 (#7920) 2018-07-01 04:16:13 +02:00
character_counter.js Count all URLs in text as 23 characters flat, do not count domain part of usernames (#4427) 2017-07-29 00:06:29 +02:00
compose_form.js Merge branch 'master' into glitch-soc/merge-upstream 2018-10-22 17:51:38 +02:00
emoji_picker_dropdown.js Upgrade Babel to version 7.0.0 (#5925) 2018-09-14 17:59:48 +02:00
navigation_bar.js Fix "Invalid DOM property class" (#7798) 2018-06-14 08:03:07 +02:00
privacy_dropdown.js fix: initial state of PrivacyDropdown is should not be null (#9008) 2018-10-19 00:00:19 +02:00
reply_indicator.js Upgrade Babel to version 7.0.0 (#5925) 2018-09-14 17:59:48 +02:00
search.js Revert Font Awesome 5 upgrade (#8810) 2018-09-28 02:11:14 +02:00
search_results.js Revert Font Awesome 5 upgrade (#8810) 2018-09-28 02:11:14 +02:00
text_icon_button.js Use Class and Property Decorators (#3730) 2017-06-23 19:36:54 +02:00
upload.js Do not push DMs into the home feed (#8940) 2018-10-11 01:31:03 +02:00
upload_button.js Upgrade Babel to version 7.0.0 (#5925) 2018-09-14 17:59:48 +02:00
upload_form.js Add ability to specify alternative text for media attachments (#5123) 2017-09-28 15:31:31 +02:00
upload_progress.js Revert Font Awesome 5 upgrade (#8810) 2018-09-28 02:11:14 +02:00
warning.js Add option to reduce motion (#5393) 2017-10-16 09:36:15 +02:00