luna/mastodon
0
0
Fork 0
mirror of https://github.com/lunaisnotaboy/mastodon.git synced 2024-11-29 01:53:12 +00:00
Code Issues Projects Releases Wiki Activity
mastodon/app/views
History
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
..
about Merge branch 'master' into glitch-soc/master 2018-05-10 00:03:28 +02:00
accounts Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master 2018-06-12 13:17:21 +00:00
admin Merge branch 'master' into glitch-soc/merge-upstream 2018-07-16 14:50:42 +02:00
admin_mailer Show remote reports in admin UI as coming from domain rather than user (#7347) 2018-05-04 13:26:25 +02:00
application
auth Add autofollow option to invites (#7805) 2018-06-15 18:00:23 +02:00
authorize_follows Add autofollow option to invites (#7805) 2018-06-15 18:00:23 +02:00
errors
filters Add option to not consider word boundaries when processing keyword filtering (#7975) 2018-07-09 02:22:09 +02:00
follower_accounts Add preference to hide following/followers lists (#7532) 2018-05-18 02:26:51 +02:00
following_accounts Add preference to hide following/followers lists (#7532) 2018-05-18 02:26:51 +02:00
home Merge remote-tracking branch 'origin/master' into gs-master 2018-05-03 17:23:44 -05:00
invites Add autofollow option to invites (#7805) 2018-06-15 18:00:23 +02:00
kaminari
layouts Hardcode default skin/theme in error layout (fixes #373) 2018-05-31 14:38:48 +02:00
media
notification_mailer
oauth
remote_follow Add follow button to detailed status, add gradient to mask bio cut-off (#7979) 2018-07-07 22:20:14 +02:00
remote_unfollows Enable custom emojis in profiles (notes, field values, display names) (#7374) 2018-05-06 11:48:51 +02:00
settings Merge branch 'master' into glitch-soc/tentative-merge 2018-07-09 07:13:59 +02:00
shared Add follow button to detailed status, add gradient to mask bio cut-off (#7979) 2018-07-07 22:20:14 +02:00
shares
stream_entries Merge branch 'master' into glitch-soc/tentative-merge 2018-07-09 07:13:59 +02:00
tags Merge branch 'master' into glitch-soc/merge 2018-05-11 18:12:42 +02:00
user_mailer
well_known Serialize webfinger XML with Ox instead of Nokogiri (#7319) 2018-05-02 22:28:46 +02:00