Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merge master into redesign #910

Merged
merged 20 commits into from
Jun 19, 2024
Merged

Merge master into redesign #910

merged 20 commits into from
Jun 19, 2024

Conversation

mansona
Copy link
Member

@mansona mansona commented Jun 18, 2024

No description provided.

jaredgalanis and others added 19 commits November 10, 2023 17:27
- the instructions to run ember-api-docs and ember-api-docs-data fully locally were housed in ember-jsonapi-docs, but having them here in the actual frontend seems a bit more intuitive
Co-authored-by: Chris Manson <[email protected]>
Co-authored-by: Chris Manson <[email protected]>
Update README to include fully local run
This is good prep for landing `<template>` (colocated templates have
the exact same semantics for runtime code as `<template>` does) , and a
mild performance improvement to boot since we have fewer modules to
manage at runtime.
Colocate remaining components
fix extra < on ember-data-landing-page
update node-sass and ember-auto-import
Copy link

netlify bot commented Jun 18, 2024

Deploy Preview for ember-api-docs ready!

Name Link
🔨 Latest commit 6c10665
🔍 Latest deploy log https://app.netlify.com/sites/ember-api-docs/deploys/66716e0e0336310008fe065d
😎 Deploy Preview https://deploy-preview-910--ember-api-docs.netlify.app
📱 Preview on mobile
Toggle QR Code...

QR Code

Use your smartphone camera to open QR code link.

To edit notification comments on pull requests, go to your Netlify site configuration.

@mansona mansona force-pushed the merge-master branch 2 times, most recently from a72e35e to 2ba14bb Compare June 18, 2024 11:21
# Conflicts:
#	app/styles/base/_forms.scss
#	app/styles/base/_lists.scss
#	app/styles/base/_tables.scss
#	app/styles/base/_typography.scss
#	app/styles/base/_variables.scss
#	app/styles/components/_article.scss
#	app/styles/components/_class-field-desc.scss
#	app/styles/components/_highlight.scss
#	app/styles/components/_sidebar.scss
#	ember-cli-build.js
#	package-lock.json
#	package.json
@mansona mansona merged commit 13f3b88 into website-redesign Jun 19, 2024
4 checks passed
@mansona mansona deleted the merge-master branch June 19, 2024 12:48
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants