namekuji/chuckya
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity
chuckya/app/javascript/mastodon/features
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
..
account/components Merge branch 'origin/master' into sync/upstream 2017-09-09 14:27:47 -05:00
account_gallery Use Class and Property Decorators (#3730) 2017-06-23 19:36:54 +02:00
account_timeline Merge branch 'origin/master' into sync/upstream 2017-09-09 14:27:47 -05:00
blocks Use Class and Property Decorators (#3730) 2017-06-23 19:36:54 +02:00
community_timeline Refactoring streaming connections (#4645) 2017-08-21 15:04:34 +02:00
compose Fix onboarding modal & add re-open button (#129) 2017-08-08 21:42:29 +02:00
favourited_statuses Generalized the infinite scrollable list (#4697) 2017-08-28 22:23:44 +02:00
favourites Use Class and Property Decorators (#3730) 2017-06-23 19:36:54 +02:00
follow_requests feat: Cache status height to avoid expensive renders (#4439) 2017-08-07 20:32:03 +02:00
followers Use Class and Property Decorators (#3730) 2017-06-23 19:36:54 +02:00
following Use Class and Property Decorators (#3730) 2017-06-23 19:36:54 +02:00
generic_not_found Replace sprockets/browserify with Webpack (#2617) 2017-05-03 02:04:16 +02:00
getting_started Fix onboarding modal & add re-open button (#129) 2017-08-08 21:42:29 +02:00
hashtag_timeline Refactoring streaming connections (#4645) 2017-08-21 15:04:34 +02:00
home_timeline Use Class and Property Decorators (#3730) 2017-06-23 19:36:54 +02:00
mutes Use Class and Property Decorators (#3730) 2017-06-23 19:36:54 +02:00
notifications Merge branch 'origin/master' into sync/upstream 2017-09-09 14:27:47 -05:00
public_timeline Refactoring streaming connections (#4645) 2017-08-21 15:04:34 +02:00
reblogs Use Class and Property Decorators (#3730) 2017-06-23 19:36:54 +02:00
report feat: Cache status height to avoid expensive renders (#4439) 2017-08-07 20:32:03 +02:00
standalone Add protocol handler. Handle follow intents (#4511) 2017-08-14 04:53:31 +02:00
status Merge branch 'origin/master' into sync/upstream 2017-09-09 14:27:47 -05:00
ui Merge branch 'origin/master' into sync/upstream 2017-09-09 14:27:47 -05:00