namekuji/chuckya
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity
chuckya/app/views
History
David Yip b9f7bc149b Merge branch 'origin/master' into sync/upstream 
Conflicts:
	app/javascript/mastodon/components/status_list.js
	app/javascript/mastodon/features/notifications/index.js
	app/javascript/mastodon/features/ui/components/modal_root.js
	app/javascript/mastodon/features/ui/components/onboarding_modal.js
	app/javascript/mastodon/features/ui/index.js
	app/javascript/styles/about.scss
	app/javascript/styles/accounts.scss
	app/javascript/styles/components.scss
	app/presenters/instance_presenter.rb
	app/services/post_status_service.rb
	app/services/reblog_service.rb
	app/views/about/more.html.haml
	app/views/about/show.html.haml
	app/views/accounts/_header.html.haml
	config/webpack/loaders/babel.js
	spec/controllers/api/v1/accounts/credentials_controller_spec.rb
2017-09-09 14:27:47 -05:00
..
about Merge branch 'origin/master' into sync/upstream 2017-09-09 14:27:47 -05:00
accounts Merge branch 'origin/master' into sync/upstream 2017-09-09 14:27:47 -05:00
admin Fix missing at-sign (regression from #4688) (#4705) 2017-08-26 12:39:26 +02:00
admin_mailer Make salutation of email localizable (#4454) 2017-07-31 00:18:44 +02:00
application Added haml-lint and fix warnings (#2773) 2017-05-08 03:35:25 +02:00
auth Adjust settings pages (#4765) 2017-09-02 15:49:28 +02:00
authorize_follows Add "signed in as" header to some pages (#4523) 2017-08-05 04:24:58 +02:00
errors Added haml-lint and fix warnings (#2773) 2017-05-08 03:35:25 +02:00
follower_accounts Add option to opt out of search engines on public profile/status pages (#4199) 2017-07-14 16:41:02 +02:00
following_accounts Add option to opt out of search engines on public profile/status pages (#4199) 2017-07-14 16:41:02 +02:00
home Merge branch 'origin/master' into sync/upstream 2017-09-09 14:27:47 -05:00
kaminari Pagination improvements (#1445) 2017-04-11 01:11:41 +02:00
layouts Merge branch 'origin/master' into sync/upstream 2017-09-09 14:27:47 -05:00
manifests Fix manifest description (regression from #4122) (#4324) 2017-07-23 23:04:44 +02:00
notification_mailer Make salutation of email localizable (#4454) 2017-07-31 00:18:44 +02:00
oauth Added haml-lint and fix warnings (#2773) 2017-05-08 03:35:25 +02:00
remote_follow Fix remote follow (#2547) 2017-04-28 00:16:44 +02:00
settings Merge branch 'origin/master' into sync/upstream 2017-09-09 14:27:47 -05:00
shared Redesign public profiles (#4608) 2017-08-16 17:12:58 +02:00
shares Add protocol handler. Handle follow intents (#4511) 2017-08-14 04:53:31 +02:00
stream_entries Merge branch 'origin/master' into sync/upstream 2017-09-09 14:27:47 -05:00
tags Adjust tags and accounts page (#4534) 2017-08-07 20:33:06 +02:00
user_mailer i18n: update Persian translation (#4470) 2017-07-31 19:40:57 +02:00
well_known Send short account URL to remote instance (regression from #3844) (#4355) 2017-07-25 15:59:43 +02:00