monorail
/
mastodon
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
mastodon/app/views
History
Thibaut Girka d392020da6 Merge branch 'master' into glitch-soc/tentative-merge 
Conflicts:
	README.md
	app/controllers/statuses_controller.rb
	app/lib/feed_manager.rb
	config/navigation.rb
	spec/lib/feed_manager_spec.rb

Conflicts were resolved by taking both versions for each change.
This means the two filter systems (glitch-soc's keyword mutes and tootsuite's
custom filters) are in place, which will be changed in a follow-up commit.
 		2018-07-09 07:13:59 +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/tentative-merge 2018-07-09 07:13:59 +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 New error page graphic. Other error page improvements (#5099) 2017-09-25 23:05:54 +02:00
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 Save video metadata and improve video OpenGraph tags (#6481) 2018-02-16 07:22:20 +01:00
notification_mailer Display content warning in mail notification emails (#6832) 2018-03-19 20:12:20 +01:00
oauth Oauth code in input form and add description message (#4986) 2017-09-17 15:23:44 +02:00
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 Finalized theme loading and stuff 2017-11-20 22:13:37 -08:00
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 Fix e-mail changed notification (fixes #6778) (#6835) 2018-03-19 20:07:47 +01:00
well_known Serialize webfinger XML with Ox instead of Nokogiri (#7319) 2018-05-02 22:28:46 +02:00