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

🧑‍💼🎛️ Overhaul #15270

Merged
merged 21 commits into from
Aug 29, 2024
Merged

🧑‍💼🎛️ Overhaul #15270

merged 21 commits into from
Aug 29, 2024

Conversation

phillipthelen
Copy link
Member

  • Adds option to search for username or email in admin panel
    -make admin panel look more consistent and cleaner

autocannon.js Outdated
@@ -0,0 +1,15 @@
// eslint-disable-next-line import/no-commonjs, import/no-unresolved
const autocannon = require('autocannon');
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Did you mean to implement this on this branch? Is it relevant to the admin panel?

@@ -42,23 +42,23 @@ describe('content index', () => {
expect(Object.keys(juneGear).length, '').to.equal(Object.keys(julyGear).length - 3);
});

it('Releases pets gear when appropriate without needing restarting', () => {
it('Releases pets when appropriate without needing restarting', () => {
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think you fixed this elsewhere, can merge back from develop and clean this out

value="Load User"
<div class="input-group-append">
<button
class="btn btn-primary"
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

some nuisance check warnings to clean out on this file, ha

@SabreCat SabreCat merged commit d3b63ab into develop Aug 29, 2024
20 checks passed
@SabreCat SabreCat deleted the phillip/🧑‍💼🎛️ branch August 29, 2024 14:15
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants