luna/mastodon
0
0
Fork 0
mirror of https://github.com/lunaisnotaboy/mastodon.git synced 2024-11-10 17:05:17 +00:00
Code Issues Projects Releases Wiki Activity
mastodon/app/helpers
History
Thibaut Girka 91bef4759f Merge branch 'master' into glitch-soc/merge-upstream 
Conflicts:
	Vagrantfile
	app/javascript/packs/public.js
	app/views/admin/settings/edit.html.haml
	app/views/settings/preferences/show.html.haml
	app/views/settings/profiles/show.html.haml
	config/locales/es.yml
	config/locales/simple_form.en.yml
	config/webpack/configuration.js
	config/webpack/loaders/babel.js
	package.json
	yarn.lock

Split new additions to app/javascript/packs/public.js to
app/javascript/core/settings.js
2018-09-19 21:46:01 +02:00
..
admin Group reports by target account (#8674) 2018-09-13 03:44:08 +02:00
settings
application_helper.rb Merge branch 'master' into glitch-soc/merge-upstream 2018-08-26 14:39:16 +02:00
flashes_helper.rb Clean up flash display in views (#2336) 2017-04-23 04:22:34 +02:00
home_helper.rb Redesign forms, verify link ownership with rel="me" (#8703) 2018-09-18 16:45:58 +02:00
instance_helper.rb
jsonld_helper.rb Improve federated ID validation (#8372) 2018-08-22 20:55:14 +02:00
mailer_helper.rb
routing_helper.rb
settings_helper.rb Add Czech language option and locale data (#8594) 2018-09-05 08:50:06 +09:00
stream_entries_helper.rb Do not show follow button on moved or memorial accounts (#8546) 2018-08-31 20:33:01 +02:00