tykayn
/
mastodon
mirror of https://framagit.org/tykayn/mastodon.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
mastodon/app/javascript/mastodon/features
History
Thibaut Girka 36393e1d2b Merge branch 'master' into glitch-soc/merge-upstream 
Conflicts:
	app/views/layouts/application.html.haml

Edited:
        app/helpers/application_helper.rb
        app/views/admin/domain_blocks/new.html.haml

Conflict wasn't really one, just two changes too close to one another.
Edition was to adapt the class names for themes to class names for
skins and flavours.

Also edited app/views/admin/domain_blocks/new.html.haml to strip the
duplicate admin pack inclusion thing.
 		2018-08-26 14:23:24 +02:00
..
account/components Wait until relationship is loaded before showing follow button (#8440) 2018-08-25 22:46:59 +02:00
account_gallery Do not scroll up when modal is opened (#8095) 2018-07-29 16:52:06 +02:00
account_timeline Public profile endorsements (accounts picked by profile owner) (#8146) 2018-08-09 09:56:53 +02:00
blocks Do not scroll up when modal is opened (#8095) 2018-07-29 16:52:06 +02:00
community_timeline Add aria-label to column regions (#8390) 2018-08-23 17:26:21 +02:00
compose Merge branch 'master' into glitch-soc/merge-upstream 2018-08-26 14:23:24 +02:00
direct_timeline Add aria-label to column regions (#8390) 2018-08-23 17:26:21 +02:00
domain_blocks Do not scroll up when modal is opened (#8095) 2018-07-29 16:52:06 +02:00
emoji Fix issues with updated emoji mart (#7761) 2018-06-08 13:28:04 +02:00
favourited_statuses Add aria-label to column regions (#8390) 2018-08-23 17:26:21 +02:00
favourites Do not scroll up when modal is opened (#8095) 2018-07-29 16:52:06 +02:00
follow_requests Do not scroll up when modal is opened (#8095) 2018-07-29 16:52:06 +02:00
followers Do not scroll up when modal is opened (#8095) 2018-07-29 16:52:06 +02:00
following Do not scroll up when modal is opened (#8095) 2018-07-29 16:52:06 +02:00
generic_not_found Replace sprockets/browserify with Webpack (#2617) 2017-05-03 02:04:16 +02:00
getting_started Add aria-label to column regions (#8390) 2018-08-23 17:26:21 +02:00
hashtag_timeline Add aria-label to column regions (#8390) 2018-08-23 17:26:21 +02:00
home_timeline Add aria-label to column regions (#8390) 2018-08-23 17:26:21 +02:00
keyboard_shortcuts Improve keyboard shortcuts descriptions (#8066) 2018-07-26 04:51:25 +02:00
list_editor Upgrade ESLint to version 4.x (#6276) 2018-01-17 16:57:15 +01:00
list_timeline Add aria-label to column regions (#8390) 2018-08-23 17:26:21 +02:00
lists Change list icons different from the getting-started icons (#7838) 2018-06-18 15:33:11 +02:00
mutes Do not scroll up when modal is opened (#8095) 2018-07-29 16:52:06 +02:00
notifications Add aria-label to column regions (#8390) 2018-08-23 17:26:21 +02:00
pinned_statuses Do not scroll up when modal is opened (#8095) 2018-07-29 16:52:06 +02:00
public_timeline Add aria-label to column regions (#8390) 2018-08-23 17:26:21 +02:00
reblogs Do not scroll up when modal is opened (#8095) 2018-07-29 16:52:06 +02:00
report Add missing video descriptions (#8416) 2018-08-24 23:55:41 +02:00
standalone Add aria-label to column regions (#8390) 2018-08-23 17:26:21 +02:00
status Weblate translations (2018-08-25) (#8420) 2018-08-25 13:27:56 +02:00
ui Add hotkey for follow requests (#8307) 2018-08-20 03:44:16 +02:00
video Add missing video descriptions (#8416) 2018-08-24 23:55:41 +02:00