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.

Sign up for GitHub

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

Jump to bottom

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

Commits on Nov 10, 2023

  1. Update README to include fully local run 

    - 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
    @jaredgalanis
    jaredgalanis authored Nov 10, 2023
    Configuration menu
    Copy the full SHA
    a97ac3e View commit details
    Browse the repository at this point in the history

  2. fix link

    @jaredgalanis
    jaredgalanis authored Nov 10, 2023
    Configuration menu
    Copy the full SHA
    387b9a7 View commit details
    Browse the repository at this point in the history

  3. Update README.md

    @jaredgalanis
    jaredgalanis authored Nov 10, 2023
    Configuration menu
    Copy the full SHA
    b373fb0 View commit details
    Browse the repository at this point in the history

  4. Update README.md

    @jaredgalanis
    jaredgalanis authored Nov 10, 2023
    Configuration menu
    Copy the full SHA
    fc8c07f View commit details
    Browse the repository at this point in the history

Commits on Nov 12, 2023

  1. Update README.md 

    Co-authored-by: Chris Manson <[email protected]>
    @jaredgalanis @mansona
    jaredgalanis and mansona authored Nov 12, 2023
    Configuration menu
    Copy the full SHA
    2651f91 View commit details
    Browse the repository at this point in the history

  2. Update README.md 

    Co-authored-by: Chris Manson <[email protected]>
    @jaredgalanis @mansona
    jaredgalanis and mansona authored Nov 12, 2023
    Configuration menu
    Copy the full SHA
    c55a956 View commit details
    Browse the repository at this point in the history

Commits on Nov 14, 2023

  1. Merge pull request #896 from ember-learn/jaredgalanis-patch-1 

    Update README to include fully local run
    @jaredgalanis
    jaredgalanis authored Nov 14, 2023
    Configuration menu
    Copy the full SHA
    5de2fb7 View commit details
    Browse the repository at this point in the history

Commits on Dec 8, 2023

  1. Colocate remaining components 

    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.
    @chriskrycho @mansona
    chriskrycho authored and mansona committed Dec 8, 2023
    Configuration menu
    Copy the full SHA
    72321c7 View commit details
    Browse the repository at this point in the history

  2. update lint-to-the-future

    @mansona
    mansona committed Dec 8, 2023
    Configuration menu
    Copy the full SHA
    4d8533d View commit details
    Browse the repository at this point in the history

  3. fix extra < on ember-data-landing-page

    @mansona
    mansona committed Dec 8, 2023
    Configuration menu
    Copy the full SHA
    2f69f74 View commit details
    Browse the repository at this point in the history

  4. Merge pull request #898 from ember-learn/update-lint-to-the-future 

    update lint-to-the-future
    @mansona
    mansona authored Dec 8, 2023
    Configuration menu
    Copy the full SHA
    385203a View commit details
    Browse the repository at this point in the history

  5. Merge pull request #848 from ember-learn/colocate 

    Colocate remaining components
    @mansona
    mansona authored Dec 8, 2023
    Configuration menu
    Copy the full SHA
    87336be View commit details
    Browse the repository at this point in the history

  6. Merge pull request #899 from ember-learn/fix-landing-page 

    fix extra < on ember-data-landing-page
    @mansona
    mansona authored Dec 8, 2023
    Configuration menu
    Copy the full SHA
    556c0ea View commit details
    Browse the repository at this point in the history

  7. update node-sass and ember-auto-import

    @mansona
    mansona committed Dec 8, 2023
    Configuration menu
    Copy the full SHA
    9db5ce2 View commit details
    Browse the repository at this point in the history

  8. fix sass differences

    @mansona
    mansona committed Dec 8, 2023
    Configuration menu
    Copy the full SHA
    c949a75 View commit details
    Browse the repository at this point in the history

  9. Merge pull request #900 from ember-learn/update-auto-import 

    update node-sass and ember-auto-import
    @mansona
    mansona authored Dec 8, 2023
    Configuration menu
    Copy the full SHA
    f909e64 View commit details
    Browse the repository at this point in the history

Commits on Jun 7, 2024

  1. switch to pnpm

    @mansona
    mansona committed Jun 7, 2024
    Configuration menu
    Copy the full SHA
    32d9b35 View commit details
    Browse the repository at this point in the history

  2. add missing peer

    @mansona
    mansona committed Jun 7, 2024
    Configuration menu
    Copy the full SHA
    17941f4 View commit details
    Browse the repository at this point in the history

  3. Merge pull request #908 from ember-learn/pnpm 

    switch to pnpm
    @mansona
    mansona authored Jun 7, 2024
    Configuration menu
    Copy the full SHA
    1af9e9a View commit details
    Browse the repository at this point in the history

Commits on Jun 18, 2024

  1. Merge remote-tracking branch 'origin/master' into merge-master 

    # 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 committed Jun 18, 2024
    Configuration menu
    Copy the full SHA
    6c10665 View commit details
    Browse the repository at this point in the history