David Yip
f90abccf33
Merge tag 'v1.6.0' into sync/upstream
7 years ago
Eugen Rochko
762ca653b6
Hide modal loading screen for media/video/boost/confirm/actions modals ( #4873 )
7 years ago
David Yip
017738c604
Merge tag 'v1.6.0rc4' into sync/upstream-1.6.0rc4
...
Conflicts:
app/javascript/mastodon/features/getting_started/index.js
app/javascript/packs/public.js
app/javascript/styles/components.scss
7 years ago
David Yip
da3f22ee7d
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
7 years ago
voidSatisfaction
d766cb0c3c
Add Pinned toot column ( #4817 )
...
* Add Pinned_toot_section
* Fix add frozen_string_literal
* Fix delete no need controller and tests
* Fix replace query strings to axios params
* Fix change value to accountId and disabling more button
7 years ago
Eugen Rochko
ad769409f7
Embed modal ( #4748 )
...
* Embed modal
* Proxy OEmbed requests from web UI
7 years ago
kibigo!
2cdee6ae8a
Merge upstream ( #111 )
7 years ago
Yamagishi Kazutoshi
f24996028d
Unify webpackChunkName to lowercase ( #4412 )
7 years ago
kibigo!
46112b7cbe
Restructured local settings internals
7 years ago
kibigo!
1b225a979a
Moved glitch containers and commented unused files
7 years ago
Surinna Curtis
c0699e3ec9
local-only/compose advanced options tweaks.
...
Squashed commit of the following:
commit b9877e37f72fdd8134936e1014033b07cb6c3671
Author: Surinna Curtis <ekiru.0@gmail.com>
Date: Wed Jul 12 00:50:10 2017 -0500
account for the eye in the chars left count for local-only toots
commit 56ebfa96542e16daa1986cc45e07974801ee12dc
Author: Surinna Curtis <ekiru.0@gmail.com>
Date: Wed Jul 12 00:21:02 2017 -0500
factor out an AdvancedOptionsToggle to avoid unnecessary re-renders
commit 04cec44ab8744e4e0f52da488c9ec24b1b1422ef
Author: Surinna Curtis <ekiru.0@gmail.com>
Date: Wed Jul 12 00:20:24 2017 -0500
s/changeComposeAdvancedOption/toggleComposeAdvancedOption/g
commit af5815dee750d1aa8b797a9305e5ab3ce6774e3f
Author: Surinna Curtis <ekiru.0@gmail.com>
Date: Tue Jul 11 23:55:19 2017 -0500
clicking anywhere on the whole advanced option toggles
7 years ago
kibigo!
bcc30c8697
Merge upstream!! #64 <3 <3
7 years ago
Sorin Davidoi
4264c62111
refactor: Make all reducers sync ( #4125 )
7 years ago
Sorin Davidoi
c202889d8d
fix: Rerender Bundle on route change ( #4120 )
7 years ago
unarist
f1827d5070
Fix first loading of notifications when the column is pinned ( #4114 )
7 years ago
Nolan Lawson
01ee91b725
Avoid using getBoundingClientRect to calculate height ( #4001 )
7 years ago
Sorin Davidoi
40b32ffb12
Lazy load components ( #3879 )
...
* feat: Lazy-load routes
* feat: Lazy-load modals
* feat: Lazy-load columns
* refactor: Simplify Bundle API
* feat: Optimize bundles
* feat: Prevent flashing the waiting state
* feat: Preload commonly used bundles
* feat: Lazy load Compose reducers
* feat: Lazy load Notifications reducer
* refactor: Move all dynamic imports into one file
* fix: Minor bugs
* fix: Manually hydrate the lazy-loaded reducers
* refactor: Move all dynamic imports to async-components
* fix: Loading modal style
* refactor: Avoid converting the raw state for each lazy hydration
* refactor: Remove unused component
* refactor: Maintain modal name
* fix: Add as=script to preload link
* chore: Fix lint error
* fix(components/bundle): Check if timestamp is set when computing elapsed
* fix: Load compose reducers for the onboarding modal
7 years ago
unarist
1e71b683bc
Unobserve status on unmount ( #4013 )
...
This fixes a warning on status unmounting (e.g. deletion).
This also resets IntersectionObserverWrapper on disconnect to avoid `unobserve()` calls
which has bug in Edge.
7 years ago
Eugen Rochko
65b46159ec
Revert #3851 ( #3878 )
7 years ago
alpaca-tc
36049c0096
Unobserve status on unmount ( #3851 )
7 years ago
Nolan Lawson
6d0a980aa6
Improve scheduling of requestIdleCallback tasks ( #3477 )
8 years ago
Nolan Lawson
4ee3796db7
Add IntersectionObserverWrapper to cut down on re-renders ( #3406 )
8 years ago