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

[pull] main from KelvinTegelaar:main #152

Merged
merged 24 commits into from
Mar 23, 2024
Merged

[pull] main from KelvinTegelaar:main #152

merged 24 commits into from
Mar 23, 2024

Commits on Mar 6, 2024

  1. Merge pull request #11 from KelvinTegelaar/dev 

    [pull] dev from KelvinTegelaar:dev
    @kris6673
    kris6673 authored Mar 6, 2024
    Configuration menu
    Copy the full SHA
    4d1f7a9 View commit details
    Browse the repository at this point in the history

Commits on Mar 16, 2024

  1. Merge pull request #13 from KelvinTegelaar/dev 

    [pull] dev from KelvinTegelaar:dev
    @kris6673
    kris6673 authored Mar 16, 2024
    Configuration menu
    Copy the full SHA
    6006ad1 View commit details
    Browse the repository at this point in the history

  2. Update Statistics.jsx

    @JohnDuprey
    JohnDuprey committed Mar 16, 2024
    Configuration menu
    Copy the full SHA
    9258e95 View commit details
    Browse the repository at this point in the history

  3. update package-lock

    @JohnDuprey
    JohnDuprey committed Mar 16, 2024
    Configuration menu
    Copy the full SHA
    9437488 View commit details
    Browse the repository at this point in the history

  4. Merge remote-tracking branch 'upstream/dev' into dev

    @JohnDuprey
    JohnDuprey committed Mar 16, 2024
    Configuration menu
    Copy the full SHA
    e5012de View commit details
    Browse the repository at this point in the history

  5. Merge pull request #2226 from JohnDuprey/dev 

    Function Statistics
    @JohnDuprey
    JohnDuprey authored Mar 16, 2024
    Configuration menu
    Copy the full SHA
    ff0eacb View commit details
    Browse the repository at this point in the history

Commits on Mar 17, 2024

  1. Merge pull request #149 from KelvinTegelaar/dev

    @JohnDuprey
    JohnDuprey authored Mar 17, 2024
    Configuration menu
    Copy the full SHA
    9be0bcd View commit details
    Browse the repository at this point in the history

Commits on Mar 18, 2024

  1. fixes edit user bug

    @KelvinTegelaar
    KelvinTegelaar committed Mar 18, 2024
    Configuration menu
    Copy the full SHA
    131df0f View commit details
    Browse the repository at this point in the history

  2. Merge remote-tracking branch 'upstream/dev' into dev

    @JohnDuprey
    JohnDuprey committed Mar 18, 2024
    Configuration menu
    Copy the full SHA
    aed7b03 View commit details
    Browse the repository at this point in the history

Commits on Mar 19, 2024

  1. users fix

    @KelvinTegelaar
    KelvinTegelaar committed Mar 19, 2024
    Configuration menu
    Copy the full SHA
    86137e5 View commit details
    Browse the repository at this point in the history

  2. Merge remote-tracking branch 'upstream/dev' into dev

    @JohnDuprey
    JohnDuprey committed Mar 19, 2024
    Configuration menu
    Copy the full SHA
    a23f6b9 View commit details
    Browse the repository at this point in the history

Commits on Mar 20, 2024

  1. Merge pull request #15 from KelvinTegelaar/dev 

    [pull] dev from KelvinTegelaar:dev
    @kris6673
    kris6673 authored Mar 20, 2024
    Configuration menu
    Copy the full SHA
    50e655a View commit details
    Browse the repository at this point in the history

  2. DisableAppCreation standard

    @kris6673
    kris6673 committed Mar 20, 2024
    Configuration menu
    Copy the full SHA
    ac12ae9 View commit details
    Browse the repository at this point in the history

  3. Merge pull request #2238 from kris6673/dev 

    Add standard to disable app registration creation
    @KelvinTegelaar
    KelvinTegelaar authored Mar 20, 2024
    Configuration menu
    Copy the full SHA
    3804ccc View commit details
    Browse the repository at this point in the history

Commits on Mar 21, 2024

  1. Merge pull request #151 from KelvinTegelaar/dev 

    [pull] dev from KelvinTegelaar:dev
    @JohnDuprey
    JohnDuprey authored Mar 21, 2024
    Configuration menu
    Copy the full SHA
    4a98750 View commit details
    Browse the repository at this point in the history

Commits on Mar 22, 2024

  1. Update formatters for alerts/scheduler

    @JohnDuprey
    JohnDuprey committed Mar 22, 2024
    Configuration menu
    Copy the full SHA
    0ce920a View commit details
    Browse the repository at this point in the history

  2. Merge pull request #2243 from JohnDuprey/dev 

    Update formatters for alerts/scheduler
    @JohnDuprey
    JohnDuprey authored Mar 22, 2024
    Configuration menu
    Copy the full SHA
    8430b48 View commit details
    Browse the repository at this point in the history

  3. up version

    @JohnDuprey
    JohnDuprey committed Mar 22, 2024
    Configuration menu
    Copy the full SHA
    393066f View commit details
    Browse the repository at this point in the history

  4. Update package-lock.json

    @JohnDuprey
    JohnDuprey committed Mar 22, 2024
    Configuration menu
    Copy the full SHA
    211f2de View commit details
    Browse the repository at this point in the history

  5. Merge branch 'KelvinTegelaar:dev' into dev

    @JohnDuprey
    JohnDuprey authored Mar 22, 2024
    Configuration menu
    Copy the full SHA
    dc10a67 View commit details
    Browse the repository at this point in the history

  6. Merge pull request #2246 from JohnDuprey/dev 

    up version
    @JohnDuprey
    JohnDuprey authored Mar 22, 2024
    Configuration menu
    Copy the full SHA
    756c6a5 View commit details
    Browse the repository at this point in the history

  7. Add boolean switch to standards list

    @OfficialEsco
    OfficialEsco committed Mar 22, 2024
    Configuration menu
    Copy the full SHA
    8514b48 View commit details
    Browse the repository at this point in the history

  8. Merge pull request #2247 from Ren-Roros-Digital/BooleanSwitch 

    Added Boolean switch to standards lists
    @JohnDuprey
    JohnDuprey authored Mar 22, 2024
    Configuration menu
    Copy the full SHA
    a9ff314 View commit details
    Browse the repository at this point in the history

  9. Merge pull request #2248 from KelvinTegelaar/dev 

    Dev to hotfix
    @JohnDuprey
    JohnDuprey authored Mar 22, 2024
    Configuration menu
    Copy the full SHA
    f052bc9 View commit details
    Browse the repository at this point in the history