djsundog
/
tootlab-mastodon
mirror of https://github.com/glitch-soc/mastodon.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
tootlab-mastodon/app/javascript/mastodon/features
History
Thibaut Girka a9eaa780f5 Merge branch 'master' into glitch-soc/merge-upstream 
Conflicts:
- app/javascript/mastodon/features/compose/components/compose_form.js
  Upstream cleaned up a bit, including on lines in which
  we replaced the hardcoded 500 character limit with a maxChar
  constant. Applied the changes while keeping maxChar instead of 500.
- app/javascript/packs/public.js
  Moved upstream's new animated avatar hover handling in
  app/javascript/core/public.js
- app/javascript/styles/fonts/montserrat.scss
  Upstream fixed local font name, applied those changes.
- app/javascript/styles/fonts/roboto.scss
  Upstream fixed local font name, applied those changes.
- lib/mastodon/version.rb
  Upstream made repo URL configurable, did the same, but
  default to glitch-soc
 		2019-04-22 20:40:04 +02:00
..
account/components Improve blocked view of profiles (#10491) 2019-04-07 04:59:13 +02:00
account_gallery Fix glitched out "not found" message for non-existing profiles in web UI (#10517) 2019-04-09 05:02:48 +02:00
account_timeline Fix glitched out "not found" message for non-existing profiles in web UI (#10517) 2019-04-09 05:02:48 +02:00
blocks Fix mutes, blocks, domain blocks and follow requests not paginating (#10057) 2019-02-16 11:56:09 +01: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 2019-04-22 20:40:04 +02:00
direct_timeline Remove unused code (#10426) 2019-03-30 15:47:25 +09:00
domain_blocks Fix mutes, blocks, domain blocks and follow requests not paginating (#10057) 2019-02-16 11:56:09 +01:00
emoji Fix emoji-mart crashing web UI on search by reverting the upgrade to 2.10.0 (#10413) 2019-03-30 01:41:35 +01: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 Fix mutes, blocks, domain blocks and follow requests not paginating (#10057) 2019-02-16 11:56:09 +01:00
followers Fix glitched out "not found" message for non-existing profiles in web UI (#10517) 2019-04-09 05:02:48 +02:00
following Fix glitched out "not found" message for non-existing profiles in web UI (#10517) 2019-04-09 05:02:48 +02:00
generic_not_found Replace sprockets/browserify with Webpack (#2617) 2017-05-03 02:04:16 +02:00
getting_started Configrationable repository url (#10600) 2019-04-21 04:41:34 +02:00
hashtag_timeline Fix hashtag column not subscribing to stream on mount (#10040) 2019-02-14 15:46:42 +01:00
home_timeline Fix home timeline perpetually reloading when empty (#10130) 2019-03-01 11:11:35 +01:00
introduction change "finish tutorial" text to "finish toot-orial" (#9905) 2019-02-04 04:45:29 +01:00
keyboard_shortcuts Upgrade Babel to version 7.0.0 (#5925) 2018-09-14 17:59:48 +02:00
list_adder Refactor icons in web UI to use Icon component (#9951) 2019-02-01 00:14:05 +01:00
list_editor Add list title editing (#9748) 2019-02-13 18:52:02 +01:00
list_timeline Refactor icons in web UI to use Icon component (#9951) 2019-02-01 00:14:05 +01:00
lists Upgrade Babel to version 7.0.0 (#5925) 2018-09-14 17:59:48 +02:00
mutes Fix mutes, blocks, domain blocks and follow requests not paginating (#10057) 2019-02-16 11:56:09 +01:00
notifications Fix scrollbar styles on compose textarea, small bugs (#10292) 2019-03-16 20:10:42 +01:00
pinned_statuses Revert Font Awesome 5 upgrade (#8810) 2018-09-28 02:11:14 +02:00
public_timeline Rename from instance to server. (#9938) 2019-02-05 19:11:24 +01: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 Disable real-time updates on public pages to improve readability (#10260) 2019-03-18 18:34:56 +01:00
status tinyfix 2: unrequired arguments (#10471) 2019-04-06 12:02:03 +09:00
ui Fix modal items cannot scroll on touch devices (#10605) 2019-04-22 14:55:50 +02:00
video Fix video player width not being updated to fit container width (#10069) 2019-02-18 00:10:21 +01:00