me/glitchier-soc
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity
glitchier-soc/app/javascript/mastodon/features
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
..
account/components Revert Font Awesome 5 upgrade (#8810) 2018-09-28 02:11:14 +02:00
account_gallery Add a new preference to always hide all media (#8569) 2018-09-25 05:09:35 +02:00
account_timeline Revert Font Awesome 5 upgrade (#8810) 2018-09-28 02:11:14 +02:00
blocks Upgrade Babel to version 7.0.0 (#5925) 2018-09-14 17:59:48 +02:00
community_timeline Upgrade Babel to version 7.0.0 (#5925) 2018-09-14 17:59:48 +02:00
compose Merge branch 'master' into glitch-soc/merge-upstream 2018-10-22 17:51:38 +02:00
direct_timeline Redesign direct messages column (#9022) 2018-10-20 02:23:58 +02:00
domain_blocks Upgrade Babel to version 7.0.0 (#5925) 2018-09-14 17:59:48 +02:00
emoji Skip VS15 (Emoji textual presentation). (#8553) 2018-09-01 19:42:02 +02:00
favourited_statuses Upgrade Babel to version 7.0.0 (#5925) 2018-09-14 17:59:48 +02:00
favourites Upgrade Babel to version 7.0.0 (#5925) 2018-09-14 17:59:48 +02:00
follow_requests Upgrade Babel to version 7.0.0 (#5925) 2018-09-14 17:59:48 +02:00
followers Upgrade Babel to version 7.0.0 (#5925) 2018-09-14 17:59:48 +02:00
following Upgrade Babel to version 7.0.0 (#5925) 2018-09-14 17:59:48 +02:00
generic_not_found Replace sprockets/browserify with Webpack (#2617) 2017-05-03 02:04:16 +02:00
getting_started Change documentation URL (#8898) 2018-10-06 14:33:36 +09:00
hashtag_timeline Upgrade Babel to version 7.0.0 (#5925) 2018-09-14 17:59:48 +02:00
home_timeline Upgrade Babel to version 7.0.0 (#5925) 2018-09-14 17:59:48 +02:00
keyboard_shortcuts Upgrade Babel to version 7.0.0 (#5925) 2018-09-14 17:59:48 +02:00
list_editor Revert Font Awesome 5 upgrade (#8810) 2018-09-28 02:11:14 +02:00
list_timeline Revert Font Awesome 5 upgrade (#8810) 2018-09-28 02:11:14 +02:00
lists Upgrade Babel to version 7.0.0 (#5925) 2018-09-14 17:59:48 +02:00
mutes Upgrade Babel to version 7.0.0 (#5925) 2018-09-14 17:59:48 +02:00
notifications Revert Font Awesome 5 upgrade (#8810) 2018-09-28 02:11:14 +02:00
pinned_statuses Revert Font Awesome 5 upgrade (#8810) 2018-09-28 02:11:14 +02:00
public_timeline Upgrade Babel to version 7.0.0 (#5925) 2018-09-14 17:59:48 +02:00
reblogs Upgrade Babel to version 7.0.0 (#5925) 2018-09-14 17:59:48 +02:00
report Add missing video descriptions (#8416) 2018-08-24 23:55:41 +02:00
standalone Upgrade Babel to version 7.0.0 (#5925) 2018-09-14 17:59:48 +02:00
status Fix fav/boosts hotkeys not working on detailed statuses (#9006) 2018-10-18 19:52:00 +02:00
ui Handle global hotkeys even when no element has focus (#8998) 2018-10-17 16:56:16 +02:00
video Revert Font Awesome 5 upgrade (#8810) 2018-09-28 02:11:14 +02:00