mirrors
/
vt-social
mirror of https://github.com/nullptr-live/vt-social.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
vt-social/app/javascript/mastodon/features
History
Thibaut Girka 369a475a70 Merge branch 'master' into glitch-soc/merge-upstream 
Conflicts:
- app/serializers/rest/instance_serializer.rb
- app/views/layouts/error.html.haml
- public/oops.png
  Took our version (same as upstream but without the things that only
  make sense in an animation).

Additional changes:
- app/javascript/flavours/vanilla/theme.yml
  Include upstream's javascript in error pages.
 		2019-02-17 12:26:55 +01:00
..
account/components Refactor icons in web UI to use Icon component (#9951) 2019-02-01 00:14:05 +01:00
account_gallery Refactor icons in web UI to use Icon component (#9951) 2019-02-01 00:14:05 +01:00
account_timeline Refactor icons in web UI to use Icon component (#9951) 2019-02-01 00:14:05 +01: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-02-15 18:02:45 +01:00
direct_timeline Fix direct messages column not loading more items on scroll (#9102) 2018-10-26 01:55:08 +02:00
domain_blocks Fix mutes, blocks, domain blocks and follow requests not paginating (#10057) 2019-02-16 11:56:09 +01:00
emoji Update emoji codepoint mappings to v11.0 (#9618) 2018-12-24 19:12:00 +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 Various fixes to scrollable lists and media gallery (#9501) 2018-12-12 22:32:44 +01:00
following Various fixes to scrollable lists and media gallery (#9501) 2018-12-12 22:32:44 +01:00
generic_not_found
…
getting_started Rename from instance to server. (#9938) 2019-02-05 19:11:24 +01:00
hashtag_timeline Fix hashtag column not subscribing to stream on mount (#10040) 2019-02-14 15:46:42 +01:00
home_timeline Upgrade Babel to version 7.0.0 (#5925) 2018-09-14 17:59:48 +02: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 timeline jumps (#10001) 2019-02-11 13:19:59 +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 Improve the public hashtag page (#9831) 2019-01-17 14:06:08 +01:00
status Fix crash on public hashtag pages when streaming fails (#10061) 2019-02-16 14:53:27 +01:00
ui Rename from instance to server. (#9938) 2019-02-05 19:11:24 +01:00
video Fix timeline jumps (#10001) 2019-02-11 13:19:59 +01:00