David Yip
67ad453373
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
2017-09-09 23:56:21 -05:00
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
voidSatisfaction
85c7c42098
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
2017-09-07 09:58:11 +02:00
Eugen Rochko
d1a78eba15
Embed modal ( #4748 )
...
* Embed modal
* Proxy OEmbed requests from web UI
2017-08-31 03:38:35 +02:00
kibigo!
8150689b48
Merge upstream ( #111 )
2017-08-01 13:20:29 -07:00
Yamagishi Kazutoshi
12874eafa6
Unify webpackChunkName to lowercase ( #4412 )
2017-07-28 13:34:55 +02:00
kibigo!
d235224692
Restructured local settings internals
2017-07-19 20:41:28 -07:00
kibigo!
5770d461b2
Moved glitch containers and commented unused files
2017-07-13 02:40:16 -07:00
Surinna Curtis
e53fbb4a09
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
2017-07-12 02:14:17 -07:00
kibigo!
79d898ae0a
Merge upstream!! #64 <3 <3
2017-07-12 02:03:17 -07:00
Sorin Davidoi
37c832cdf7
refactor: Make all reducers sync ( #4125 )
2017-07-09 12:16:08 +02:00
Sorin Davidoi
91cacb1e8f
fix: Rerender Bundle on route change ( #4120 )
2017-07-08 18:34:55 +02:00
unarist
46f5d3a2e9
Fix first loading of notifications when the column is pinned ( #4114 )
2017-07-08 17:22:24 +02:00
Nolan Lawson
63b77f2320
Avoid using getBoundingClientRect to calculate height ( #4001 )
2017-07-08 01:57:22 +02:00
Sorin Davidoi
348d6f5e75
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
2017-07-08 00:06:02 +02:00
unarist
9c03fd9cae
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.
2017-07-06 21:26:21 +02:00
Eugen Rochko
946a166791
Revert #3851 ( #3878 )
2017-06-21 01:37:15 +02:00
alpaca-tc
cf6fe4f8cb
Unobserve status on unmount ( #3851 )
2017-06-19 11:29:57 +02:00
Nolan Lawson
0e12a8dab9
Improve scheduling of requestIdleCallback tasks ( #3477 )
2017-05-31 15:11:33 +02:00
Nolan Lawson
34a93ccf57
Add IntersectionObserverWrapper to cut down on re-renders ( #3406 )
2017-05-29 18:17:51 +02:00
