1
0
puyopuyotetr.is/app/helpers
Thibaut Girka f26f1145ac Merge branch 'master' into glitch-soc/merge-upstream
Conflicts:
	Dockerfile
	app/javascript/packs/common.js
	config/webpack/loaders/sass.js
	config/webpack/shared.js
	db/schema.rb
	package.json
	yarn.lock

A lot of the conflicts come from updating webpack.

Even though upstream deleted app/javascript/packs/common.js, I kept
glitch-soc's version as it unifies JS/CSS packs behavior across flavours.

Ported glitch changes to webpack 4.x
2018-07-16 14:50:42 +02:00
..
admin Improvements to toots display in admin view (#7452) 2018-05-12 17:44:15 +02:00
settings Set up /settings/keyword_mutes. #164. 2017-10-21 14:54:36 -05:00
application_helper.rb Add more granular OAuth scopes (#7929) 2018-07-05 18:31:35 +02:00
flashes_helper.rb Clean up flash display in views (#2336) 2017-04-23 04:22:34 +02:00
home_helper.rb Improve initialState loading 2017-01-09 12:37:53 +01:00
instance_helper.rb Do not default site_title with site_hostname in InstanceHelper (#6624) 2018-03-04 20:29:49 +01:00
jsonld_helper.rb Fetch boosted statuses on behalf of a follower (fixes #7426) (#7459) 2018-05-12 16:48:32 +02:00
mailer_helper.rb HTML e-mails for UserMailer (#6256) 2018-01-16 03:29:11 +01:00
routing_helper.rb Fallback default thumbnail in instance status API (#6177) 2018-01-04 15:36:55 +01:00
settings_helper.rb Weblate translations (2018-07-05) (#7950) 2018-07-05 21:50:16 +09:00
stream_entries_helper.rb Display full acct on public status pages, always (#8011) 2018-07-14 04:07:47 +02:00