me/glitchier-soc
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity
glitchier-soc/app/javascript/mastodon/features
History
Thibaut Girka 4ec907e413 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
..
account/components Adjust account__action-bar contents (#7818) 2018-06-16 12:57:25 +02:00
account_gallery Fix LoadMore on account media gallery (#6933) 2018-03-27 16:53:52 +02:00
account_timeline Fix domain hiding logic (#7765) 2018-06-09 22:46:54 +02:00
blocks Replace react-router-scroll to react-router-scroll-4 (#5568) 2017-11-01 06:58:38 +09:00
community_timeline Keyword/phrase filtering (#7905) 2018-06-29 15:34:36 +02:00
compose Merge branch 'master' into glitch-soc/merge-upstream 2018-07-11 17:57:08 +02:00
direct_timeline Keyword/phrase filtering (#7905) 2018-06-29 15:34:36 +02:00
domain_blocks Improve getting started column (#7676) 2018-05-30 18:41:47 +02:00
emoji Fix issues with updated emoji mart (#7761) 2018-06-08 13:28:04 +02:00
favourited_statuses Replace onScrollToBottom with onLoadMore (#6615) 2018-03-05 19:31:40 +01:00
favourites Replace react-router-scroll to react-router-scroll-4 (#5568) 2017-11-01 06:58:38 +09:00
follow_requests Replace react-router-scroll to react-router-scroll-4 (#5568) 2017-11-01 06:58:38 +09:00
followers Federate pinned statuses over ActivityPub (#6610) 2018-03-04 09:19:11 +01:00
following Federate pinned statuses over ActivityPub (#6610) 2018-03-04 09:19:11 +01:00
generic_not_found Replace sprockets/browserify with Webpack (#2617) 2017-05-03 02:04:16 +02:00
getting_started Display Mastodon version in footer of web UI (#8013) 2018-07-14 03:56:34 +02:00
hashtag_timeline Allow clients to fetch statuses made while they were offline (#6876) 2018-03-24 15:25:15 +01:00
home_timeline Keyword/phrase filtering (#7905) 2018-06-29 15:34:36 +02:00
keyboard_shortcuts Add revealing/hiding statuses button to keyboard shortcuts legend column (#7178) 2018-04-18 13:15:57 +02:00
list_editor Upgrade ESLint to version 4.x (#6276) 2018-01-17 16:57:15 +01:00
list_timeline Change list icons different from the getting-started icons (#7838) 2018-06-18 15:33:11 +02:00
lists Change list icons different from the getting-started icons (#7838) 2018-06-18 15:33:11 +02:00
mutes Replace react-router-scroll to react-router-scroll-4 (#5568) 2017-11-01 06:58:38 +09:00
notifications Fix filters not affecting notifications in web UI (#7977) 2018-07-07 19:31:19 +02:00
pinned_statuses Add Pinned toot column (#4817) 2017-09-07 09:58:11 +02:00
public_timeline Put "Media Only" option in column settings instead of content area headline (#7801) 2018-06-15 11:15:15 +02:00
reblogs Replace react-router-scroll to react-router-scroll-4 (#5568) 2017-11-01 06:58:38 +09:00
report Show media on report UI (#6619) 2018-03-04 20:29:12 +01:00
standalone Allow clients to fetch statuses made while they were offline (#6876) 2018-03-24 15:25:15 +01:00
status Fix M hotkey inserting @undefined when in detailed status (#7931) 2018-07-03 09:17:18 +09:00
trends Improve trends layout (#7700) 2018-06-01 19:18:37 +02:00
ui Use LoadingBar instead of blur to indicate that an image is loading (fixes #4060) (#7562) 2018-07-15 01:18:09 +02:00
video Open video modal on public UI (#7469) 2018-05-13 13:48:14 +02:00