]> cat aescling's git repositories - mastodon.git/commit
Add trends UI with admin and user settings (#11502)
authorEugen Rochko <eugen@zeonfederated.com>
Tue, 6 Aug 2019 15:57:52 +0000 (17:57 +0200)
committerGitHub <noreply@github.com>
Tue, 6 Aug 2019 15:57:52 +0000 (17:57 +0200)
commit9072fe5ab6464cc9c7a871d388464c7afcf41cd0
treeb3b379a4eeebc56825a6374f854e73b35678da6c
parent82d2069c75071138f582503c39b0996cc4cdff11
Add trends UI with admin and user settings (#11502)
21 files changed:
app/controllers/settings/preferences_controller.rb
app/javascript/mastodon/actions/trends.js [new file with mode: 0644]
app/javascript/mastodon/features/getting_started/components/trends.js [new file with mode: 0644]
app/javascript/mastodon/features/getting_started/containers/trends_container.js [new file with mode: 0644]
app/javascript/mastodon/features/getting_started/index.js
app/javascript/mastodon/features/ui/components/navigation_panel.js
app/javascript/mastodon/initial_state.js
app/javascript/mastodon/reducers/index.js
app/javascript/mastodon/reducers/settings.js
app/javascript/mastodon/reducers/trends.js [new file with mode: 0644]
app/javascript/styles/mastodon/components.scss
app/lib/user_settings_decorator.rb
app/models/form/admin_settings.rb
app/models/trending_tags.rb
app/models/user.rb
app/serializers/initial_state_serializer.rb
app/views/admin/settings/edit.html.haml
app/views/settings/preferences/appearance/show.html.haml
config/locales/en.yml
config/locales/simple_form.en.yml
config/settings.yml