mirrors/catstodon
1
0
Fork 0
mirror of https://git.kescher.at/CatCatNya/catstodon.git synced 2024-11-27 23:01:36 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions
catstodon/app/javascript/mastodon/features
History
Thibaut Girka 6f75a9001f Merge branch 'master' into glitch-soc/merge-upstream 
Conflicts:
- app/views/stream_entries/_simple_status.html.haml
- config/locales/nl.yml

Deleted unused translation strings (themes) and adapted minor changes to
_simple_status.html.haml
2018-08-31 19:10:57 +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 Add messages informing that collections are empty (fixes #4115) (#8418) 2018-08-26 16:39:37 +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-27 18:09:28 +02:00
direct_timeline Add aria-label to column regions (#8390) 2018-08-23 17:26:21 +02:00
domain_blocks Add messages informing that collections are empty (fixes #4115) (#8418) 2018-08-26 16:39:37 +02:00
emoji Fix issues with updated emoji mart (#7761) 2018-06-08 13:28:04 +02:00
favourited_statuses Add messages informing that collections are empty (fixes #4115) (#8418) 2018-08-26 16:39:37 +02:00
favourites Add messages informing that collections are empty (fixes #4115) (#8418) 2018-08-26 16:39:37 +02:00
follow_requests Add messages informing that collections are empty (fixes #4115) (#8418) 2018-08-26 16:39:37 +02:00
followers Fix followers/follows layout issues from #8418 (#8505) 2018-08-29 01:19:58 +02:00
following Fix followers/follows layout issues from #8418 (#8505) 2018-08-29 01:19:58 +02:00
generic_not_found Replace sprockets/browserify with Webpack (#2617) 2017-05-03 02:04:16 +02:00
getting_started refactor: getting-started__wrapper should contained in getting-started (#8532) 2018-08-31 03:43:02 +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 Add more hotkeys to legend (#8469) 2018-08-26 20:22:16 +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 Add messages informing that collections are empty (fixes #4115) (#8418) 2018-08-26 16:39:37 +02:00
mutes Add messages informing that collections are empty (fixes #4115) (#8418) 2018-08-26 16:39:37 +02:00
notifications Add aria-label to notifications (#8460) 2018-08-26 17:53:26 +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 Add messages informing that collections are empty (fixes #4115) (#8418) 2018-08-26 16:39:37 +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 messages informing that collections are empty (fixes #4115) (#8418) 2018-08-26 16:39:37 +02:00
video Add missing video descriptions (#8416) 2018-08-24 23:55:41 +02:00