djsundog/tootlab-mastodon
1
0
Fork 0
mirror of https://github.com/glitch-soc/mastodon.git synced 2024-11-15 12:44:24 -05:00
Code Issues Packages Projects Releases Wiki Activity
b9f7bc149b
tootlab-mastodon/app/javascript/mastodon/reducers
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
..
accounts_counters.js refactor: Rewrite immutablejs import statements using destructuring (#4147) 2017-07-11 01:00:14 +02:00
accounts.js feat: Cache status height to avoid expensive renders (#4439) 2017-08-07 20:32:03 +02:00
alerts.js refactor: Rewrite immutablejs import statements using destructuring (#4147) 2017-07-11 01:00:14 +02:00
cards.js refactor: Rewrite immutablejs import statements using destructuring (#4147) 2017-07-11 01:00:14 +02:00
compose.js Merge branch 'origin/master' into sync/upstream 2017-09-09 14:27:47 -05:00
contexts.js refactor: Rewrite immutablejs import statements using destructuring (#4147) 2017-07-11 01:00:14 +02:00
index.js FIXED STUFF FROM THE MERGE SORRY ;_; 2017-07-15 15:42:39 -07:00
media_attachments.js refactor: Rewrite immutablejs import statements using destructuring (#4147) 2017-07-11 01:00:14 +02:00
meta.js refactor: Rewrite immutablejs import statements using destructuring (#4147) 2017-07-11 01:00:14 +02:00
modal.js Remove unused variables (#3906) 2017-06-23 16:05:04 +02:00
notifications.js Improved notifications cleaning UI with set operations (#109) 2017-07-30 12:36:28 -04:00
push_notifications.js Web Push Notifications (#3243) 2017-07-13 22:15:32 +02:00
relationships.js refactor: Rewrite immutablejs import statements using destructuring (#4147) 2017-07-11 01:00:14 +02:00
reports.js refactor: Rewrite immutablejs import statements using destructuring (#4147) 2017-07-11 01:00:14 +02:00
search.js refactor: Rewrite immutablejs import statements using destructuring (#4147) 2017-07-11 01:00:14 +02:00
settings.js Merge upstream!! #64 <3 <3 2017-07-12 02:03:17 -07:00
status_lists.js Remove status from favorites list when unfavorited (#4597) 2017-08-20 23:23:05 +02:00
statuses.js Pinned statuses (#4675) 2017-08-25 01:41:18 +02:00
timelines.js refactor: Rewrite immutablejs import statements using destructuring (#4147) 2017-07-11 01:00:14 +02:00
user_lists.js refactor: Rewrite immutablejs import statements using destructuring (#4147) 2017-07-11 01:00:14 +02:00