nyastodon/app/javascript/core
Thibaut Girka 249991c498 Merge branch 'master' into glitch-soc/merge-upstream
Conflicts:
- Gemfile.lock
- app/controllers/accounts_controller.rb
- app/controllers/admin/dashboard_controller.rb
- app/controllers/follower_accounts_controller.rb
- app/controllers/following_accounts_controller.rb
- app/controllers/remote_follow_controller.rb
- app/controllers/stream_entries_controller.rb
- app/controllers/tags_controller.rb
- app/javascript/packs/public.js
- app/lib/sanitize_config.rb
- app/models/account.rb
- app/models/form/admin_settings.rb
- app/models/media_attachment.rb
- app/models/stream_entry.rb
- app/models/user.rb
- app/serializers/initial_state_serializer.rb
- app/services/batched_remove_status_service.rb
- app/services/post_status_service.rb
- app/services/process_mentions_service.rb
- app/services/reblog_service.rb
- app/services/remove_status_service.rb
- app/views/admin/settings/edit.html.haml
- config/locales/simple_form.pl.yml
- config/settings.yml
- docker-compose.yml
2019-07-19 18:26:49 +02:00
..
admin.js Merge branch 'master' into glitch-soc/merge-upstream 2018-10-22 17:51:38 +02:00
common.js Avoid loading rails-ujs twice on vanilla flavour 2018-07-16 16:42:52 +02:00
embed.js Finalized theme loading and stuff 2017-11-20 22:13:37 -08:00
mailer.js Fixed improper mailer import 2018-01-15 21:23:26 -08:00
public.js Merge branch 'master' into glitch-soc/merge-upstream 2019-07-19 18:26:49 +02:00
settings.js Merge branch 'master' into glitch-soc/merge-upstream 2019-04-04 14:53:52 +02:00
theme.yml Include necessary JS in auth pages 2019-06-13 22:38:22 +02:00