monorail
/
mastodon
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
mastodon/spec/models
History
Thibaut Girka 91bef4759f Merge branch 'master' into glitch-soc/merge-upstream 
Conflicts:
	Vagrantfile
	app/javascript/packs/public.js
	app/views/admin/settings/edit.html.haml
	app/views/settings/preferences/show.html.haml
	app/views/settings/profiles/show.html.haml
	config/locales/es.yml
	config/locales/simple_form.en.yml
	config/webpack/configuration.js
	config/webpack/loaders/babel.js
	package.json
	yarn.lock

Split new additions to app/javascript/packs/public.js to
app/javascript/core/settings.js
 		2018-09-19 21:46:01 +02:00
..
admin
…
concerns Merge branch 'master' into glitch-soc/merge-upstream 2018-08-31 19:10:57 +02:00
form
…
web
…
account_domain_block_spec.rb
…
account_filter_spec.rb
…
account_moderation_note_spec.rb
…
account_pin_spec.rb Public profile endorsements (accounts picked by profile owner) (#8146) 2018-08-09 09:56:53 +02:00
account_spec.rb Merge branch 'master' into glitch-soc/merge-upstream 2018-09-19 21:46:01 +02:00
backup_spec.rb
…
block_spec.rb
…
conversation_mute_spec.rb
…
conversation_spec.rb
…
custom_emoji_spec.rb
…
custom_filter_spec.rb Keyword/phrase filtering (#7905) 2018-06-29 15:34:36 +02:00
domain_block_spec.rb
…
email_domain_block_spec.rb
…
export_spec.rb Show exact number of followers/statuses on export page/in tooltip (#8199) 2018-08-14 21:56:17 +02:00
favourite_spec.rb
…
follow_request_spec.rb
…
follow_spec.rb Implement Undo { Accept { Follow } } (fixes #8234) (#8245) 2018-08-17 16:24:56 +02:00
home_feed_spec.rb
…
identity_spec.rb
…
import_spec.rb
…
invite_spec.rb
…
list_account_spec.rb
…
list_spec.rb
…
media_attachment_spec.rb Resize images by area instead of fixed dimensions (#8083) 2018-07-28 03:33:00 +02:00
mention_spec.rb
…
mute_spec.rb
…
notification_spec.rb
…
preview_card_spec.rb
…
relay_spec.rb Add federation relay support (#7998) 2018-07-13 02:16:06 +02:00
remote_follow_spec.rb
…
remote_profile_spec.rb
…
report_filter_spec.rb
…
report_spec.rb
…
session_activation_spec.rb
…
setting_spec.rb
…
site_upload_spec.rb
…
status_pin_spec.rb
…
status_spec.rb Merge branch 'master' into glitch-soc/merge-upstream 2018-08-22 20:56:32 +02:00
status_stat_spec.rb Move status counters to separate table, count replies (#8104) 2018-08-14 19:19:32 +02:00
stream_entry_spec.rb
…
subscription_spec.rb Misc. typos (#8694) 2018-09-14 00:53:09 +02:00
tag_spec.rb
…
user_spec.rb Allow mods to disable login, improve message when login disabled (#8329) 2018-08-23 23:26:29 +02:00