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 334f478db1 Merge branch 'master' into glitch-soc/merge-upstream 
Conflicts:
	app/models/status.rb
	db/migrate/20180528141303_fix_accounts_unique_index.rb
	db/schema.rb

Resolved by taking upstream changes (no real conflicts, just glitch-soc
specific code too close to actual changes).
2018-08-17 17:43:54 +02:00
..
account/components Show exact number of followers/statuses on export page/in tooltip (#8199) 2018-08-14 21:56:17 +02:00
account_gallery Do not scroll up when modal is opened (#8095) 2018-07-29 16:52:06 +02:00
account_timeline Public profile endorsements (accounts picked by profile owner) (#8146) 2018-08-09 09:56:53 +02:00
blocks Do not scroll up when modal is opened (#8095) 2018-07-29 16:52:06 +02:00
community_timeline Do not scroll up when modal is opened (#8095) 2018-07-29 16:52:06 +02:00
compose Merge branch 'master' into glitch-soc/merge-upstream 2018-07-11 17:57:08 +02:00
direct_timeline Do not scroll up when modal is opened (#8095) 2018-07-29 16:52:06 +02:00
domain_blocks Do not scroll up when modal is opened (#8095) 2018-07-29 16:52:06 +02:00
emoji Fix issues with updated emoji mart (#7761) 2018-06-08 13:28:04 +02:00
favourited_statuses Do not scroll up when modal is opened (#8095) 2018-07-29 16:52:06 +02:00
favourites Do not scroll up when modal is opened (#8095) 2018-07-29 16:52:06 +02:00
follow_requests Do not scroll up when modal is opened (#8095) 2018-07-29 16:52:06 +02:00
followers Do not scroll up when modal is opened (#8095) 2018-07-29 16:52:06 +02:00
following Do not scroll up when modal is opened (#8095) 2018-07-29 16:52:06 +02: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 Do not scroll up when modal is opened (#8095) 2018-07-29 16:52:06 +02:00
home_timeline Do not scroll up when modal is opened (#8095) 2018-07-29 16:52:06 +02:00
keyboard_shortcuts Improve keyboard shortcuts descriptions (#8066) 2018-07-26 04:51:25 +02:00
list_editor Upgrade ESLint to version 4.x (#6276) 2018-01-17 16:57:15 +01:00
list_timeline Do not scroll up when modal is opened (#8095) 2018-07-29 16:52:06 +02:00
lists Change list icons different from the getting-started icons (#7838) 2018-06-18 15:33:11 +02:00
mutes Do not scroll up when modal is opened (#8095) 2018-07-29 16:52:06 +02:00
notifications Fix filters not affecting notifications in web UI (#7977) 2018-07-07 19:31:19 +02:00
pinned_statuses Do not scroll up when modal is opened (#8095) 2018-07-29 16:52:06 +02:00
public_timeline Do not scroll up when modal is opened (#8095) 2018-07-29 16:52:06 +02:00
reblogs Do not scroll up when modal is opened (#8095) 2018-07-29 16:52:06 +02: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 Defer scrollIntoView after DOM is drawn (fixes #8239) (#8242) 2018-08-17 14:07:38 +02:00
trends Improve trends layout (#7700) 2018-06-01 19:18:37 +02:00
ui Compensate for scrollbar disappearing when media modal visible (#8100) 2018-07-31 01:14:33 +02:00
video Various fixes regarding the video position slider (#8201) 2018-08-14 21:51:17 +02:00