marrub
/
mastodon
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity
mastodon/app/javascript/mastodon/features
History
Thibaut Girka ff67385cfb Merge branch 'master' into glitch-soc/merge-upstream 
Conflicts:
- README.md
  discarded upstream changes
- app/controllers/api/v1/bookmarks_controller.rb
  finally merged upstream, some code style fixes
  and slightly changed pagination code
- app/controllers/application_controller.rb
  changed upstream to always return HTML error pages
  slight conflict caused by theming code
- app/models/bookmark.rb
  finally merged upstream, no real conflict
- spec/controllers/api/v1/bookmarks_controller_spec.rb
  finally merged upstream, slightly changed pagination code
 		2019-11-20 15:36:09 +01:00
..
account/components Add noopener and/or noreferrer (#12202) 2019-10-24 22:44:42 +02:00
account_gallery Add noopener and/or noreferrer (#12202) 2019-10-24 22:44:42 +02:00
account_timeline Add missing back button header for invalid account (#12094) 2019-10-07 04:33:31 +02:00
audio Add download button to audio and video players (#12179) 2019-10-25 11:48:20 +02:00
blocks Fix scroll to top in single column UI (#11463) 2019-08-01 19:17:17 +02:00
bookmarked_statuses Add bookmarks (#7107) 2019-11-13 23:02:10 +01:00
community_timeline Fix unread toot indicator not honoring onlyMedia in public and community timelines (#12330) 2019-11-11 00:05:02 +02:00
compose Merge branch 'master' into glitch-soc/merge-upstream 2019-11-07 13:43:56 +01:00
direct_timeline Fix custom emoji animation on hover in conversations view (#12040) 2019-10-01 17:11:14 +02:00
directory Fix custom emoji animation on hover in WebUI directory bios (#11716) 2019-09-01 20:04:35 +02:00
domain_blocks Fix scroll to top in single column UI (#11463) 2019-08-01 19:17:17 +02:00
emoji Fix emoji search not showing custom emoji when none are uncategorized (#11920) 2019-09-23 00:48:43 +02:00
favourited_statuses Fix scroll to top in single column UI (#11463) 2019-08-01 19:17:17 +02:00
favourites Add refresh button to list of rebloggers/favouriters in web UI (#12031) 2019-10-01 04:57:27 +02:00
follow_requests Fix scroll to top in single column UI (#11463) 2019-08-01 19:17:17 +02:00
followers Fix follower/following lists resetting on back-navigation in web UI (#11986) 2019-09-29 16:27:00 +02:00
following Fix follower/following lists resetting on back-navigation in web UI (#11986) 2019-09-29 16:27:00 +02:00
generic_not_found Fix performance of home feed regeneration (#12084) 2019-10-06 22:11:17 +02:00
getting_started Add bookmarks (#7107) 2019-11-13 23:02:10 +01:00
hashtag_timeline Bump react-select from 2.4.4 to 3.0.5 (#11930) 2019-10-22 01:31:27 +09:00
home_timeline Fix scroll to top in single column UI (#11463) 2019-08-01 19:17:17 +02:00
introduction change "finish tutorial" text to "finish toot-orial" (#9905) 2019-02-04 04:45:29 +01:00
keyboard_shortcuts Fix scroll to top in single column UI (#11463) 2019-08-01 19:17:17 +02:00
list_adder Refactor icons in web UI to use Icon component (#9951) 2019-02-01 00:14:05 +01:00
list_editor Disable list title validation button when list title is empty (#11475) 2019-08-03 19:10:39 +02:00
list_timeline Fix scroll to top in single column UI (#11463) 2019-08-01 19:17:17 +02:00
lists Disable list title validation button when list title is empty (#11475) 2019-08-03 19:10:39 +02:00
mutes Fix scroll to top in single column UI (#11463) 2019-08-01 19:17:17 +02:00
notifications Integrate own poll's translation into own_poll. (#12231) 2019-11-04 13:03:29 +01:00
pinned_statuses Fix scroll to top in single column UI (#11463) 2019-08-01 19:17:17 +02:00
public_timeline Fix unread toot indicator not honoring onlyMedia in public and community timelines (#12330) 2019-11-11 00:05:02 +02:00
reblogs Add refresh button to list of rebloggers/favouriters in web UI (#12031) 2019-10-01 04:57:27 +02:00
report Add blurhash (#10630) 2019-04-27 03:24:09 +02:00
search Add responsive panels to the single-column layout (#10820) 2019-05-25 21:27:00 +02:00
standalone Disable real-time updates on public pages to improve readability (#10260) 2019-03-18 18:34:56 +01:00
status Add relationship-based options to status dropdowns (#12377) 2019-11-19 21:24:16 +01:00
ui Add bookmarks (#7107) 2019-11-13 23:02:10 +01:00
video Add download button to audio and video players (#12179) 2019-10-25 11:48:20 +02:00