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 |
|
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 |
|
Sorin Davidoi
|
37c832cdf7
|
refactor: Make all reducers sync (#4125)
|
2017-07-09 12:16:08 +02:00 |
|
unarist
|
46f5d3a2e9
|
Fix first loading of notifications when the column is pinned (#4114)
|
2017-07-08 17:22:24 +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 |
|