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

Fix #605 #606

Merged
merged 2 commits into from
Jan 14, 2022
Merged

Fix #605 #606

merged 2 commits into from
Jan 14, 2022

Conversation

k-grube
Copy link
Contributor

@k-grube k-grube commented Jan 14, 2022

Push new history on customerId change, update state when its set from url to avoid duplicate history entries

@KelvinTegelaar KelvinTegelaar merged commit 7fe01f0 into KelvinTegelaar:react Jan 14, 2022
ITPOwenM added a commit to ITPOwenM/CIPP that referenced this pull request Jan 17, 2022
commit 25c027f08434ee147eafce084a592f46e2e89a97
Merge: 59eba1b 62042ff
Author: KelvinTegelaar <49186168+KelvinTegelaar@users.noreply.github.com>
Date:   Mon Jan 17 20:07:22 2022 +0100

    Merge pull request #619 from homotechsual/main

    Update CI/CD for branch rename.

commit 59eba1ba926431263703d99c6aac6f2fe412565b
Author: KelvinTegelaar <49186168+KelvinTegelaar@users.noreply.github.com>
Date:   Mon Jan 17 19:00:29 2022 +0100

    Update bug_report.md

commit 62042ff908e7505e3bacdd97adf28bdfd2f580e7
Author: Michael O''Toole <mikey@mjco.uk>
Date:   Mon Jan 17 15:11:58 2022 +0000

    Update CI/CD for branch rename.

commit e1e2522a5722ea9409eb539e6f626cace5691b65
Merge: 6b1c163 24f7b69
Author: KelvinTegelaar <49186168+KelvinTegelaar@users.noreply.github.com>
Date:   Mon Jan 17 14:14:26 2022 +0100

    Merge branch 'main' of https://github.com/KelvinTegelaar/CIPP

commit 6b1c163160751817de70f6792b91169e23677cfb
Author: KelvinTegelaar <49186168+KelvinTegelaar@users.noreply.github.com>
Date:   Mon Jan 17 14:14:24 2022 +0100

    renamed repo back to master

commit 24f7b69633781adbc2006be563ad1cd4a6ebe58c
Author: KelvinTegelaar <49186168+KelvinTegelaar@users.noreply.github.com>
Date:   Mon Jan 17 13:54:21 2022 +0100

    Delete azure-static-web-apps-calm-hill-0e7e00d03.yml

commit 1c430e6337ff248379fbc8d347b00dc434ec3775
Author: KelvinTegelaar <49186168+KelvinTegelaar@users.noreply.github.com>
Date:   Mon Jan 17 13:51:30 2022 +0100

    ci: add Azure Static Web Apps workflow file
    on-behalf-of: @Azure opensource@microsoft.com

commit c7c53439e3452247ec057019cc749a33bb5fd1d5
Author: KelvinTegelaar <49186168+KelvinTegelaar@users.noreply.github.com>
Date:   Mon Jan 17 13:24:27 2022 +0100

    added check for authentication.

commit dd7d1397eab0f55ab11f62b82c393bc83d75e85d
Author: KelvinTegelaar <49186168+KelvinTegelaar@users.noreply.github.com>
Date:   Mon Jan 17 12:40:04 2022 +0100

    rewrite for 403

commit 86278482355f361f263a319e33e07e06abe414ce
Author: KelvinTegelaar <49186168+KelvinTegelaar@users.noreply.github.com>
Date:   Mon Jan 17 12:39:14 2022 +0100

    updated deployment files to use main

commit 6fabe47e0d78a11e15b003bbddcb4c166c42f761
Merge: 0b493c6 f14f466
Author: KelvinTegelaar <49186168+KelvinTegelaar@users.noreply.github.com>
Date:   Mon Jan 17 12:23:14 2022 +0100

    Merge pull request #615 from KelvinTegelaar/react

    What deployment folder?

commit f14f466a6852901a2394d8521569637b26e5a4c7
Author: KelvinTegelaar <49186168+KelvinTegelaar@users.noreply.github.com>
Date:   Mon Jan 17 12:20:48 2022 +0100

    What deployment folder?

commit 0b493c66a5d53a02be8254a9799aee6f3f4b96c6
Merge: 5433bba 95ce024
Author: KelvinTegelaar <49186168+KelvinTegelaar@users.noreply.github.com>
Date:   Mon Jan 17 11:54:09 2022 +0100

    Merge pull request #614 from KelvinTegelaar/react

    Upgrade React to Release

commit 95ce02477ffb7ae154cccd0c9c8de17d31b601f8
Author: KelvinTegelaar <49186168+KelvinTegelaar@users.noreply.github.com>
Date:   Mon Jan 17 11:50:07 2022 +0100

    removed settings.json from repo, will add to excludes

commit 15a4a9e4ffdeed8297fe8fcd66547499fa820c1c
Author: KelvinTegelaar <49186168+KelvinTegelaar@users.noreply.github.com>
Date:   Mon Jan 17 11:46:10 2022 +0100

    removed husky config as it blocked commits

commit 88b1f9d74946ceca02061016bb813c990525e126
Author: KelvinTegelaar <49186168+KelvinTegelaar@users.noreply.github.com>
Date:   Mon Jan 17 11:45:09 2022 +0100

    removed husky as it blocked commits on windows

commit 5433bbaa1f6c37f307378940c44f47f7b715f332
Merge: bb9c2a2 c63c59d
Author: KelvinTegelaar <49186168+KelvinTegelaar@users.noreply.github.com>
Date:   Mon Jan 17 11:12:21 2022 +0100

    Merge branch 'react'

commit bb9c2a23057fd75510ce61aec74199cd0664bc66
Author: KelvinTegelaar <49186168+KelvinTegelaar@users.noreply.github.com>
Date:   Mon Jan 17 11:09:35 2022 +0100

    removing old files

commit c63c59dbcac25e24d8ad44814969e79badaecb12
Author: KelvinTegelaar <49186168+KelvinTegelaar@users.noreply.github.com>
Date:   Mon Jan 17 10:40:46 2022 +0100

    fixed minor issues with API checks

commit 8a73c7eb6896472efbf54a5d8ff64c73df93baff
Author: KelvinTegelaar <49186168+KelvinTegelaar@users.noreply.github.com>
Date:   Mon Jan 17 10:24:42 2022 +0100

    added version_latest to root for legacy envinronments.

commit b38c383616653b019bad80163bafa82380a4ecd5
Author: KelvinTegelaar <49186168+KelvinTegelaar@users.noreply.github.com>
Date:   Mon Jan 17 10:17:29 2022 +0100

    updated readme, added github assets

commit 85b8f42f77c37eb2ffc1761b88a4a00f939b275e
Author: KelvinTegelaar <49186168+KelvinTegelaar@users.noreply.github.com>
Date:   Mon Jan 17 10:12:32 2022 +0100

    cellbool

commit de0c63cd5778f8b8c413657af3a10860987d34d2
Author: KelvinTegelaar <49186168+KelvinTegelaar@users.noreply.github.com>
Date:   Mon Jan 17 10:10:19 2022 +0100

    fixed old selectors

commit 2fbcbfef812bba5334f6d3805f808007ef39ac61
Merge: ac0f33b 145a7d0
Author: KelvinTegelaar <49186168+KelvinTegelaar@users.noreply.github.com>
Date:   Mon Jan 17 09:54:21 2022 +0100

    Merge pull request #613 from homotechsual/react

    More Masonry improvements and minor theme overhaul.

commit 145a7d05575ddc659234d07cd39b0c94b3270de9
Author: Michael O''Toole <mikey@mjco.uk>
Date:   Mon Jan 17 08:26:08 2022 +0000

    Remove apply standard import from routes - moved to adminRoutes.

commit 6f3caab609062d8e9f11c50213723697c5ea3b28
Author: Michael O''Toole <mikey@mjco.uk>
Date:   Mon Jan 17 08:24:11 2022 +0000

    Fix unused icon.

commit 26f264617d2b6ac1107b785a0a771e6527bd24f9
Author: Michael O''Toole <mikey@mjco.uk>
Date:   Mon Jan 17 08:22:27 2022 +0000

    Fix minor bug in DatatableContentCard.

commit 7763a796ec7ccc748598fac975a1407a13a6a275
Author: Michael O''Toole <mikey@mjco.uk>
Date:   Mon Jan 17 08:09:49 2022 +0000

    Finish conversion of Teams and User view pages to Masonry!

commit a2f1417c2976508626ec29d00439619d87e3c27e
Merge: 6a9b477 ac0f33b
Author: Michael O''Toole <mikey@mjco.uk>
Date:   Sun Jan 16 22:47:08 2022 +0000

    Merge upstream.

commit 6a9b4771162a349634d456b427e18950214067b1
Author: Michael O''Toole <mikey@mjco.uk>
Date:   Sun Jan 16 22:31:19 2022 +0000

    Re-add indexes for components. Add ContentCard components.

commit ac0f33bd8cdf5eaa8bc3c03349f47e10ec45795c
Author: KelvinTegelaar <49186168+KelvinTegelaar@users.noreply.github.com>
Date:   Sun Jan 16 23:17:06 2022 +0100

    removed the delete button, only found in offcanvas now

commit b919d643eb1be0caabd266a86d5a2be61e824e47
Author: KelvinTegelaar <49186168+KelvinTegelaar@users.noreply.github.com>
Date:   Sun Jan 16 22:39:32 2022 +0100

    updated readme

commit 5439cfbc9c2f963e0605391731fa0810afe23db1
Author: KelvinTegelaar <49186168+KelvinTegelaar@users.noreply.github.com>
Date:   Sun Jan 16 21:57:38 2022 +0100

    removed unused import

commit abe4a86ceba2ea4838089f0747bdb3f0efdb0a61
Author: KelvinTegelaar <49186168+KelvinTegelaar@users.noreply.github.com>
Date:   Sun Jan 16 13:02:38 2022 +0100

    typo

commit 9f90518a7c06d83f22fc7862be3f09ef8e616517
Author: KelvinTegelaar <49186168+KelvinTegelaar@users.noreply.github.com>
Date:   Sun Jan 16 12:39:24 2022 +0100

    added admin routes handling

commit 1cd1739a751641ec993e83cbac506a4b274503f4
Author: KelvinTegelaar <49186168+KelvinTegelaar@users.noreply.github.com>
Date:   Sun Jan 16 12:08:39 2022 +0100

    removed console logs.

commit 170392a1bb7ca0e6423beb022071f2cd16864272
Merge: 9068c26 fe503c0
Author: KelvinTegelaar <49186168+KelvinTegelaar@users.noreply.github.com>
Date:   Sun Jan 16 11:27:00 2022 +0100

    Merge branch 'react' of https://github.com/KelvinTegelaar/CIPP into react

commit fe503c0ab622e7e706b6724d4f541c7f5552398f
Merge: 4a9540c 87a24c1
Author: KelvinTegelaar <49186168+KelvinTegelaar@users.noreply.github.com>
Date:   Sun Jan 16 10:12:44 2022 +0100

    Merge pull request #612 from AdamWillford/react

commit 87a24c1e9c001fcab4189235194d72676c12ebfb
Author: Adam Willford <ad@mwillford.co.uk>
Date:   Sat Jan 15 23:57:32 2022 +0000

    Add UPN to Users offCanvas to annoy Gav

commit 2a6b20befda761b1989b03c542e32f4480610ce0
Author: Adam Willford <ad@mwillford.co.uk>
Date:   Sat Jan 15 23:42:19 2022 +0000

    Changes to offCanvas for detailed information

commit 9068c26998e949bec7ab9dad7391be99d1880ad9
Author: KelvinTegelaar <49186168+KelvinTegelaar@users.noreply.github.com>
Date:   Sun Jan 16 00:15:09 2022 +0100

    solved mobile devices issues

commit 4a9540c6abab4c6e74cd288a59d7db4c3d741101
Author: KelvinTegelaar <49186168+KelvinTegelaar@users.noreply.github.com>
Date:   Sun Jan 16 00:11:16 2022 +0100

    fixes mobile list

commit 5bd787c4702af37d25823eeac5d9fd7c37305be0
Author: KelvinTegelaar <49186168+KelvinTegelaar@users.noreply.github.com>
Date:   Sat Jan 15 22:32:06 2022 +0100

    changed columns

commit db1eeeb209b6f1d0d64ec689f1f00a4f10980e7a
Author: KelvinTegelaar <49186168+KelvinTegelaar@users.noreply.github.com>
Date:   Sat Jan 15 20:47:00 2022 +0100

    added routes for 403/404

commit cddbade8c24dcb0382c7ad37b1b257444bcc4aba
Merge: dc1349e 73ff8f2
Author: KelvinTegelaar <49186168+KelvinTegelaar@users.noreply.github.com>
Date:   Sat Jan 15 20:23:30 2022 +0100

    Merge pull request #611 from homotechsual/react

    Fix View User page and add CippMasonry.

commit 73ff8f208608b558e6fe3848b7eb30982faed011
Merge: 90fac07 dc1349e
Author: Michael O''Toole <mikey@mjco.uk>
Date:   Sat Jan 15 17:52:26 2022 +0000

    Merge branch 'react' of https://github.com/kelvintegelaar/CIPP into react

commit 90fac0736988181e348b3c3af005c5b5dc593c82
Author: Michael O''Toole <mikey@mjco.uk>
Date:   Sat Jan 15 17:51:53 2022 +0000

    Fix View User page and add CippMasonry.

commit dc1349ec78208ab569c558e3e984caa67b11055d
Merge: 0e830b3 4350795
Author: KelvinTegelaar <49186168+KelvinTegelaar@users.noreply.github.com>
Date:   Sat Jan 15 15:40:21 2022 +0100

    Merge pull request #610 from homotechsual/react

    Refactor Components folder tree

commit 43507950f6177f51afe1e6dc0d6ae62282a397b4
Author: Michael O''Toole <mikey@mjco.uk>
Date:   Sat Jan 15 12:43:21 2022 +0000

    Missed an action column :-)

commit c3432fd7a9658d402d723fe3bfcbc0dfa4e27eac
Author: Michael O''Toole <mikey@mjco.uk>
Date:   Sat Jan 15 12:31:19 2022 +0000

    Fix actions column component naming and remove dropdown from ListDefender.

commit 8e1afa782dbb1e93f078c7e49e8fcdf56a64805d
Merge: 9f19479 0e830b3
Author: Michael O''Toole <mikey@mjco.uk>
Date:   Sat Jan 15 12:13:16 2022 +0000

    Merge branch 'react' of https://github.com/kelvintegelaar/CIPP into react

commit 9f1947917ca21bd2548652ea8282dbf77ec0d254
Author: Michael O''Toole <mikey@mjco.uk>
Date:   Sat Jan 15 12:13:05 2022 +0000

    Refactor components folder.

commit 0e830b3215e2498abc9761eafc7add110fd2270a
Merge: 7f8931e 4a1b0a4
Author: KelvinTegelaar <49186168+KelvinTegelaar@users.noreply.github.com>
Date:   Sat Jan 15 11:34:31 2022 +0100

    Merge pull request #609 from johnduprey/react-dev

commit 245464ec38d5a3d35b6ec9d03ebce80d9d4aa044
Merge: 7075790 7f8931e
Author: Michael O''Toole <mikey@mjco.uk>
Date:   Sat Jan 15 10:29:16 2022 +0000

    Merge upstream.

commit 70757908e65ef767c4ebcdf456452e8f0929a352
Author: Michael O''Toole <mikey@mjco.uk>
Date:   Sat Jan 15 10:25:58 2022 +0000

    Reorganise components and add Masonry.

commit bcb6febe90ee39c992709afa22854e4d3a12731d
Author: Michael O''Toole <mikey@mjco.uk>
Date:   Sat Jan 15 10:25:37 2022 +0000

    Reorganise components and add Masonry.

commit 4a1b0a47bf84fb626c50ad19ba82cdad68ff8300
Author: John Duprey <jwd@johnwduprey.com>
Date:   Fri Jan 14 19:54:10 2022 -0500

    Update IndividualDomain.js

    Prevent rendering code block if selector is null

commit 7f8931eab510f5e7a41eddd80a67d898dd281fd2
Author: KelvinTegelaar <49186168+KelvinTegelaar@users.noreply.github.com>
Date:   Sat Jan 15 01:43:05 2022 +0100

    unused imports

commit 6bace3944e67bb41d03b8a3a3b88ac37daddd64f
Author: KelvinTegelaar <49186168+KelvinTegelaar@users.noreply.github.com>
Date:   Sat Jan 15 01:40:18 2022 +0100

    usage location text

commit d5ed789b8559f7a4bbe6d4b07970152eac99ba5e
Author: KelvinTegelaar <49186168+KelvinTegelaar@users.noreply.github.com>
Date:   Sat Jan 15 01:36:05 2022 +0100

    default userlocation added

commit dc72ea3cc9bf75248a0dd891cb1e5c5627e42f78
Author: KelvinTegelaar <49186168+KelvinTegelaar@users.noreply.github.com>
Date:   Fri Jan 14 23:10:24 2022 +0100

    finished autopilot

commit bfd805ad72a57f97a05299b33791d70b6a5510b5
Merge: 9d889ff 3a33756
Author: KelvinTegelaar <49186168+KelvinTegelaar@users.noreply.github.com>
Date:   Fri Jan 14 22:52:17 2022 +0100

    Merge branch 'react' of https://github.com/KelvinTegelaar/CIPP into react

commit 3a33756e8c98c07a8005dd9d12ad2925ec81fa38
Merge: e8ce439 3e8ac51
Author: KelvinTegelaar <49186168+KelvinTegelaar@users.noreply.github.com>
Date:   Fri Jan 14 22:51:41 2022 +0100

    Merge pull request #608 from k-grube/react

    Add page titles, 401, 403 page. Decouple modal from fast switcher.

commit 9d889fff79a17834a8e0206e6238124ed31c82e1
Author: KelvinTegelaar <49186168+KelvinTegelaar@users.noreply.github.com>
Date:   Fri Jan 14 22:50:36 2022 +0100

    finished autopilot add device

commit 3e8ac510add5ed937bd68a30eb8f244d80a40155
Merge: fe2ed37 e8ce439
Author: k-grube <grube.kevin@gmail.com>
Date:   Fri Jan 14 13:03:02 2022 -0800

    Merge branch 'react' of github.com:k-grube/CIPP into react

commit fe2ed37e45c92281b7e9dee5381cb6278a2da0a0
Author: k-grube <grube.kevin@gmail.com>
Date:   Fri Jan 14 13:01:05 2022 -0800

    Add page titles, 401, 403 page.  Decouple modal from fast switcher.

commit e8ce439dc5c5f738d0895d9f083178d45bc45afb
Merge: ecda60e 7fe01f0
Author: KelvinTegelaar <49186168+KelvinTegelaar@users.noreply.github.com>
Date:   Fri Jan 14 20:50:25 2022 +0100

    Merge branch 'react' of https://github.com/KelvinTegelaar/CIPP into react

commit ecda60eb8e96e5e26456c8c662ea10f5f48d1d2a
Author: KelvinTegelaar <49186168+KelvinTegelaar@users.noreply.github.com>
Date:   Fri Jan 14 20:50:23 2022 +0100

    uploading autopilot prepwork

commit 7fe01f03b835b4d87c42e8594d5daf387cb37feb
Merge: 7c9f0bd 9d53a91
Author: KelvinTegelaar <49186168+KelvinTegelaar@users.noreply.github.com>
Date:   Fri Jan 14 19:06:42 2022 +0100

    Merge pull request #606 from k-grube/react

    Fix #605

commit 9d53a915186728f56c680a05e9f5be660ddd8f56
Author: k-grube <grube.kevin@gmail.com>
Date:   Fri Jan 14 09:53:16 2022 -0800

    add helpers

commit 9f90cf314d4f7c4d6dc2d5efaa218f49e147b69f
Author: k-grube <grube.kevin@gmail.com>
Date:   Fri Jan 14 09:49:40 2022 -0800

    Fix #605

commit 7c9f0bd14a838b78fb0452d1afb2d3ceb959403c
Merge: 6cccf9c ffc31a3
Author: KelvinTegelaar <49186168+KelvinTegelaar@users.noreply.github.com>
Date:   Fri Jan 14 18:11:31 2022 +0100

    Merge pull request #600 from AdamWillford/react

    Fix mailbox being shown on offCanvas

commit 6cccf9cfd22401b1555a7207f4421d1a5c957c0d
Merge: bd61626 23ed30f
Author: KelvinTegelaar <49186168+KelvinTegelaar@users.noreply.github.com>
Date:   Fri Jan 14 18:11:21 2022 +0100

    Merge pull request #601 from homotechsual/react

    Fix OffCanvas list group link handling. Fixes #585

commit bd61626a576454f075451bf1dc45320aa75495a5
Merge: 3e30bb6 5f24669
Author: KelvinTegelaar <49186168+KelvinTegelaar@users.noreply.github.com>
Date:   Fri Jan 14 18:11:11 2022 +0100

    Merge pull request #603 from k-grube/react

    Add validators for forms

commit 5f246698fd4a2a7c7f90d4f8cb0db604aafb7dfa
Author: k-grube <grube.kevin@gmail.com>
Date:   Fri Jan 14 08:47:04 2022 -0800

    Add validators for forms

commit 23ed30facada5e6a0b9f6b29b413bb4ed70aa0a8
Author: Michael O'Toole <mikey@mjco.uk>
Date:   Fri Jan 14 16:42:34 2022 +0000

    Fast Switcher improvements.

commit 3e30bb612e713f49e001b94540ee67c54c6ad673
Author: KelvinTegelaar <49186168+KelvinTegelaar@users.noreply.github.com>
Date:   Fri Jan 14 16:13:48 2022 +0100

    added removal option in table

commit 33c67aab808f5f883f6d3fa397ece4a052ca68c8
Author: KelvinTegelaar <49186168+KelvinTegelaar@users.noreply.github.com>
Date:   Fri Jan 14 16:03:54 2022 +0100

    upload for autopilot

commit 5f24c6d09ccae7847cb2487dbca12dea69c095ea
Author: KelvinTegelaar <49186168+KelvinTegelaar@users.noreply.github.com>
Date:   Fri Jan 14 15:18:21 2022 +0100

    autopilot add device template

commit 8ae55e825f6c7e6ede3a9a4f728f01df4fad601e
Author: Michael O'Toole <mikey@mjco.uk>
Date:   Fri Jan 14 14:05:45 2022 +0000

    Fix OffCanvas list group link handling. Fixes #585

commit ffc31a3730ca2a7797e015f2e64499d3afa53f96
Merge: df6fd71 3d1f990
Author: AdamWillford <30923966+AdamWillford@users.noreply.github.com>
Date:   Fri Jan 14 14:05:26 2022 +0000

    Merge branch 'KelvinTegelaar:react' into react

commit df6fd71ff1d8272813801801112c9ce3e44d15ae
Author: Adam Willford <ad@mwillford.co.uk>
Date:   Fri Jan 14 14:00:28 2022 +0000

    Fix offCanvas showing wrong user

commit 3d1f9901c0118d9ae8fa26d9db7d4ab90b7ff083
Merge: 26dc974 a4540cf
Author: KelvinTegelaar <49186168+KelvinTegelaar@users.noreply.github.com>
Date:   Fri Jan 14 14:01:10 2022 +0100

    Merge pull request #599 from homotechsual/react

    Replace keyboard input handling.

commit a4540cff8318e608fe71d263b88f4f9877b9809e
Author: Michael O'Toole <mikey@mjco.uk>
Date:   Fri Jan 14 12:55:35 2022 +0000

    Replace keyboard input handling.

commit 26dc9742a68418355e9774789a28550435abaa3a
Merge: c853e2d ac6b38c
Author: KelvinTegelaar <49186168+KelvinTegelaar@users.noreply.github.com>
Date:   Fri Jan 14 12:46:20 2022 +0100

    Merge pull request #598 from homotechsual/react

    Fix for layout on AutopilotAddDevice.

commit ac6b38c740bff348ac66c061198b053c73a86ffa
Author: Michael O'Toole <mikey@mjco.uk>
Date:   Fri Jan 14 11:40:24 2022 +0000

    Fix for layout on AutopilotAddDevice.

commit c853e2dcaabbb7eb58d70e890b4957218f2e747e
Merge: 4d66dfa 0231426
Author: KelvinTegelaar <49186168+KelvinTegelaar@users.noreply.github.com>
Date:   Fri Jan 14 11:41:53 2022 +0100

    Merge pull request #597 from homotechsual/react

    Fix incorrect SecretLint detection.

commit 0231426a1dca96440228f91a76802d06a96faf37
Merge: 72bd309 4d66dfa
Author: Michael O'Toole <mikey@mjco.uk>
Date:   Fri Jan 14 10:41:41 2022 +0000

    Merge branch 'react' of https://github.com/kelvintegelaar/CIPP into react

commit 4d66dfad04685f63fb46eb483ff2f0ce13ded25c
Author: KelvinTegelaar <49186168+KelvinTegelaar@users.noreply.github.com>
Date:   Fri Jan 14 11:41:33 2022 +0100

    Pushing for tests

commit 72bd3098ed7927ba5048aeb55d9f51c70ea32ee2
Author: Michael O'Toole <mikey@mjco.uk>
Date:   Fri Jan 14 10:38:00 2022 +0000

    Re-add SecretLint.

commit 2bc46b4b1f70c00feed25f6eeb98a2a699833af8
Author: Michael O'Toole <mikey@mjco.uk>
Date:   Fri Jan 14 10:19:58 2022 +0000

    Remove SecretLint.

commit 75bb778528665452f8303e040c83931ed1fd4001
Merge: 6d53616 7b294b6
Author: KelvinTegelaar <49186168+KelvinTegelaar@users.noreply.github.com>
Date:   Fri Jan 14 11:14:44 2022 +0100

    Merge branch 'react' of https://github.com/KelvinTegelaar/CIPP into react

commit 6d53616d1b3e69d065ede56d70d8f43267b40b63
Author: KelvinTegelaar <49186168+KelvinTegelaar@users.noreply.github.com>
Date:   Fri Jan 14 11:14:42 2022 +0100

    prepwork autopilot

commit 8112902a0019c965aa0545ed15a72016e45c2ee5
Author: Michael O'Toole <mikey@mjco.uk>
Date:   Fri Jan 14 10:06:49 2022 +0000

    Fix incorrect path in secretlintignore.

commit b290087bf2c4b53be543ba2a68afcbdaa04cc694
Author: Michael O'Toole <mikey@mjco.uk>
Date:   Fri Jan 14 10:05:15 2022 +0000

    Fix incorrect path style?.

commit 2b3d7b1324a2fc18e120d2b1d217f1d25e74ec77
Author: Michael O'Toole <mikey@mjco.uk>
Date:   Fri Jan 14 09:46:04 2022 +0000

    Fix incorrect path in secretlintignore.

commit 0e89dbd7efd5c348e3a9c05936784850813e2331
Author: Michael O'Toole <mikey@mjco.uk>
Date:   Fri Jan 14 09:44:21 2022 +0000

    Fix incorrect path in secretlintignore.

commit 3f44aa51024ccd58b4b37318fc986c6d641ba379
Author: Michael O'Toole <mikey@mjco.uk>
Date:   Fri Jan 14 09:36:34 2022 +0000

    Fix incorrect path in secretlintignore.

commit 858aa36033bfeca7a9a7ef8a2d7fdb0cfa392e94
Merge: 85f790a 7b294b6
Author: Michael O'Toole <mikey@mjco.uk>
Date:   Fri Jan 14 09:30:27 2022 +0000

    Merge branch 'react' of https://github.com/kelvintegelaar/CIPP into react

commit 85f790ac24c91bf03ece84018d34689abf235de7
Author: Michael O'Toole <mikey@mjco.uk>
Date:   Fri Jan 14 09:30:11 2022 +0000

    Fix incorrect SecretLint detection.

commit 7b294b63c199178debf04bb8b1100a25a2cd054e
Merge: 779bf9e f352b0b
Author: KelvinTegelaar <49186168+KelvinTegelaar@users.noreply.github.com>
Date:   Fri Jan 14 09:35:21 2022 +0100

    Merge pull request #596 from johnduprey/react-dev

    Individual Domain tweaks and clean up ViewProfile

commit 779bf9ebb9cff1cc045d9f77930c228f5422d83a
Merge: 665aacb a8a019c
Author: KelvinTegelaar <49186168+KelvinTegelaar@users.noreply.github.com>
Date:   Fri Jan 14 09:35:11 2022 +0100

    Merge pull request #595 from homotechsual/react

    CIPP Wars Episode IV: A New Lint

commit f352b0bebb1368e019b43e1baff1a63833bac17c
Author: John Duprey <jwd@johnwduprey.com>
Date:   Thu Jan 13 21:45:28 2022 -0500

    Update IndividualDomain.js

    Fix propTypes for ResultCard

commit 639a10817e547520f4dedf1eba31d72b43a656ba
Author: John Duprey <jwd@johnwduprey.com>
Date:   Thu Jan 13 20:42:17 2022 -0500

    Update IndividualDomain.js

    Add dropdown menu to result cards
    Move all extra info to offcanvas

commit a8a019cac5b556cb2422cb7bb486676aa793d18c
Author: Michael O'Toole <mikey@mjco.uk>
Date:   Thu Jan 13 23:12:59 2022 +0000

    Fixing a syntax error...

commit f8f7a728256c1cd2f8cd54a3208e80e268acc07e
Merge: e926b88 665aacb
Author: John Duprey <jwd@johnwduprey.com>
Date:   Thu Jan 13 18:11:16 2022 -0500

    Merge remote-tracking branch 'upstream/react' into react-dev

commit 894c39a89ccbbbe088c54aa292af33f44023b68d
Author: Michael O'Toole <mikey@mjco.uk>
Date:   Thu Jan 13 23:09:28 2022 +0000

    Fix reviewdog options.

commit 665af4c0d604e20cc2653aa23fe665baf80968c9
Author: Michael O'Toole <mikey@mjco.uk>
Date:   Thu Jan 13 23:07:09 2022 +0000

    New Lint on the block.

commit 3940acb06b9f539ce8fc84f7bb60f9a32a98fc19
Author: Michael O'Toole <mikey@mjco.uk>
Date:   Thu Jan 13 22:40:19 2022 +0000

    Format JSON.

commit c4c4e058cf5798c4d72d577bbef6e0b4de779d3a
Merge: 6483728 665aacb
Author: Michael O'Toole <mikey@mjco.uk>
Date:   Thu Jan 13 22:40:00 2022 +0000

    Merge upstream.

commit e926b88e9e6238a6807ab35979bb555d9ca856b0
Author: John Duprey <jwd@johnwduprey.com>
Date:   Thu Jan 13 17:33:56 2022 -0500

    Update routes.js

commit 23ac9222a50649da5671c3f2b4564966c0c340a7
Author: John Duprey <jwd@johnwduprey.com>
Date:   Thu Jan 13 17:31:36 2022 -0500

    Cleanup ViewProfile

    Delete profile directory from views and remove routes

commit 665aacb0296fbef162237e88a97a62967fae7d9d
Author: KelvinTegelaar <49186168+KelvinTegelaar@users.noreply.github.com>
Date:   Thu Jan 13 23:30:09 2022 +0100

    update on config

commit 6483728c214617a03b712fd819b568d66a29245e
Author: Michael O'Toole <mikey@mjco.uk>
Date:   Thu Jan 13 22:27:39 2022 +0000

    The YAML can't be prettier than it is...

commit a5ffb25af80e344c33a0b2a7dfb68d300b0f47a0
Author: KelvinTegelaar <49186168+KelvinTegelaar@users.noreply.github.com>
Date:   Thu Jan 13 23:27:15 2022 +0100

    set fallback route to index.html

commit 9f7169f6caf5e9626dea711b5dbbe996b978e4b1
Author: KelvinTegelaar <49186168+KelvinTegelaar@users.noreply.github.com>
Date:   Thu Jan 13 23:21:43 2022 +0100

    added logout button

commit 2b0f0647fff3967fe8cd2919fc1f9c272a04065b
Author: Michael O'Toole <mikey@mjco.uk>
Date:   Thu Jan 13 22:20:27 2022 +0000

    I see YAML people...

commit e47f566fec4c72e2c0811af6d2ea9646fc11092e
Author: Michael O'Toole <mikey@mjco.uk>
Date:   Thu Jan 13 22:11:20 2022 +0000

    He's just a boy, I'm just trying to fix ESLint... Can I make it any more obvious?

commit 4bbbe575dab17a245effb8ff6d93e19289a8ea87
Author: Michael O'Toole <mikey@mjco.uk>
Date:   Thu Jan 13 22:02:14 2022 +0000

    Merry Lintmas to all and to all, fuck right off!

commit 0925fb4d1e1366e182652588f44e7239c77e97b5
Merge: 8e5e2cf e76aa27
Author: Michael O'Toole <mikey@mjco.uk>
Date:   Thu Jan 13 21:47:51 2022 +0000

    Merge branch 'react' of https://github.com/kelvintegelaar/CIPP into react

commit 8e5e2cf96e223ef743c6370b2a3acb2736b533d9
Author: Michael O'Toole <mikey@mjco.uk>
Date:   Thu Jan 13 21:42:04 2022 +0000

    Disable SCSS Lint.

commit 494c5febdd0b656171234110f063c7861acd6c7b
Author: Michael O'Toole <mikey@mjco.uk>
Date:   Thu Jan 13 21:39:46 2022 +0000

    Change SCSS ruleset base.

commit ab44e10372821a2194377dd251c1802d34cad575
Author: Michael O'Toole <mikey@mjco.uk>
Date:   Thu Jan 13 21:26:11 2022 +0000

    Fix linting errors in SCSS files.

commit e76aa272cd8e3b9c6b96363204df51f5cbac9373
Author: KelvinTegelaar <49186168+KelvinTegelaar@users.noreply.github.com>
Date:   Thu Jan 13 22:16:18 2022 +0100

    added test staticwebapp.config

commit 4a167ebad224baf0502a11a9bf80f68f2f6162cc
Author: KelvinTegelaar <49186168+KelvinTegelaar@users.noreply.github.com>
Date:   Thu Jan 13 22:08:37 2022 +0100

    import cipptable

commit b46cccfd78a755f1c39b500291fee56af51c1a3f
Merge: 1f2015e 72887d6
Author: KelvinTegelaar <49186168+KelvinTegelaar@users.noreply.github.com>
Date:   Thu Jan 13 22:03:34 2022 +0100

    Merge branch 'react' of https://github.com/KelvinTegelaar/CIPP into react

commit 1f2015e95dad30fde9baac1be28d8498b17315a6
Author: KelvinTegelaar <49186168+KelvinTegelaar@users.noreply.github.com>
Date:   Thu Jan 13 22:03:31 2022 +0100

    finished viewteamsettings

commit 7336b0d0044bc16d69caa6faea07370d04cdb06f
Author: Michael O'Toole <mikey@mjco.uk>
Date:   Thu Jan 13 20:17:29 2022 +0000

    Fix up MegaLinter config.

commit a364d86e74f839f843c72e2fbf690e9071d684dc
Author: Michael O'Toole <mikey@mjco.uk>
Date:   Thu Jan 13 20:10:45 2022 +0000

    Change linter (again!).

commit 4dc46f6808be91f0087bd4b886f4094de0122b02
Author: Michael O'Toole <mikey@mjco.uk>
Date:   Thu Jan 13 19:41:50 2022 +0000

    Declare react ESLint dep explicitly.

commit 72887d644b6819fe1b0bf45f435a29a19ba696ee
Merge: 94bd7a1 75cadba
Author: KelvinTegelaar <49186168+KelvinTegelaar@users.noreply.github.com>
Date:   Thu Jan 13 20:35:03 2022 +0100

    Merge pull request #594 from homotechsual/react

    CIPP Wars Episode III: Revenge of the Lint

commit 75cadba4d442b222a826a0adfc8f0596fb755af0
Author: Michael O'Toole <mikey@mjco.uk>
Date:   Thu Jan 13 19:32:36 2022 +0000

    Fix linting config.

commit 94bd7a10c71c377a42a59c60a0d3c26192c701d8
Merge: 5015958 eb52cc5
Author: KelvinTegelaar <49186168+KelvinTegelaar@users.noreply.github.com>
Date:   Thu Jan 13 20:27:01 2022 +0100

    Merge pull request #593 from AdamWillford/react

    Add exportSelector to EVERYTHIG, Update Report Name & Remove CSV double extension

commit eb52cc5d8a4fd2134df5cebdcfc445b68cdc9438
Merge: bb38005 d70129a
Author: Adam Willford <ad@mwillford.co.uk>
Date:   Thu Jan 13 19:20:44 2022 +0000

    Merge remote-tracking branch 'origin/react' into react

commit d70129a94ad5c2a9791a03e32a1df774bfc2ece2
Merge: a712639 5015958
Author: AdamWillford <30923966+AdamWillford@users.noreply.github.com>
Date:   Thu Jan 13 19:20:32 2022 +0000

    Merge branch 'KelvinTegelaar:react' into react

commit 5015958a6e1203128c388edf8b7a12c3e0d61cc3
Merge: 6584a41 86a9484
Author: KelvinTegelaar <49186168+KelvinTegelaar@users.noreply.github.com>
Date:   Thu Jan 13 20:19:39 2022 +0100

    Merge pull request #591 from homotechsual/react

    Fix linter action reference.

commit 86a9484471decd0c9dee0480b7257bf970800cad
Author: Michael O'Toole <mikey@mjco.uk>
Date:   Thu Jan 13 19:16:20 2022 +0000

    Fix error identified by actionlint.

commit a35c2d384767c2297b72bb2195f9860cce9e3637
Author: Michael O'Toole <mikey@mjco.uk>
Date:   Thu Jan 13 19:13:59 2022 +0000

    Disable unused linters.

commit cac3c0c3d9b6e19b47a788da4dc60aa710662a88
Author: Michael O'Toole <mikey@mjco.uk>
Date:   Thu Jan 13 19:02:23 2022 +0000

    Add ESLint config paths.

commit bb380057589cc37ed3460cd82d49cfec59d4ecb3
Author: Adam Willford <ad@mwillford.co.uk>
Date:   Thu Jan 13 19:00:58 2022 +0000

    remove double .csv ext

commit 4c5011a6199a516445295760aebaf1b4af26c78c
Author: Adam Willford <ad@mwillford.co.uk>
Date:   Thu Jan 13 19:00:43 2022 +0000

    Update name of logbook report

commit 3f3185ddbf579e803cb984dc89cbfa747f65ab1e
Author: Michael O'Toole <mikey@mjco.uk>
Date:   Thu Jan 13 18:52:48 2022 +0000

    Fix job titles.

commit 66f6c2585d23e9ffea79dd2e913c993f8bd5c3e5
Author: Michael O'Toole <mikey@mjco.uk>
Date:   Thu Jan 13 18:50:25 2022 +0000

    Combine install and build.

commit 78f77db14a26c5d9c07535284b78efc29942935a
Author: Michael O'Toole <mikey@mjco.uk>
Date:   Thu Jan 13 18:48:22 2022 +0000

    Remove Windows and MacOS build tests.

commit a712639b0164a3fe5b26454fca074aa0b6851d99
Merge: 3fc00ab 6584a41
Author: AdamWillford <30923966+AdamWillford@users.noreply.github.com>
Date:   Thu Jan 13 18:48:03 2022 +0000

    Merge branch 'KelvinTegelaar:react' into react

commit f4a9ab01d70b9880a26b87f1344cfc93c23832f7
Author: Michael O'Toole <mikey@mjco.uk>
Date:   Thu Jan 13 18:43:24 2022 +0000

    Fix linter config.

commit 3fc00ab419b2927641329da03771ec027aad3304
Author: Adam Willford <ad@mwillford.co.uk>
Date:   Thu Jan 13 18:42:18 2022 +0000

    Add exportSelector to EVERYTHINGGGG

commit 677b3cb1f2e2afa0f65560b64d7f97e380f9a73b
Author: Michael O'Toole <mikey@mjco.uk>
Date:   Thu Jan 13 18:39:08 2022 +0000

    Remove Node 17 checks.

commit ec6611829bcc9a9253c513d1d5fa7b6676517605
Author: Michael O'Toole <mikey@mjco.uk>
Date:   Thu Jan 13 18:28:00 2022 +0000

    Fix incorrect action version.

commit bf2d35165c4de41105919f49a4d442e6036eea9a
Author: Michael O'Toole <mikey@mjco.uk>
Date:   Thu Jan 13 18:26:46 2022 +0000

    Fix incorrect command in Node Project Check.

commit f26aff6a18b0a8619ce2be2362ceeb74c6772afb
Merge: 7700fc5 6584a41
Author: Michael O'Toole <mikey@mjco.uk>
Date:   Thu Jan 13 18:25:13 2022 +0000

    Merge branch 'react' of https://github.com/kelvintegelaar/CIPP into react

commit 7700fc55eb7e6ea59fb51e6daaf61a3d82adae99
Author: Michael O'Toole <mikey@mjco.uk>
Date:   Thu Jan 13 18:25:01 2022 +0000

    Fix linter action reference.

commit 6584a41b4336bbb8f8891852bd9f3d134338d32a
Merge: 55a5a2d aa3e150
Author: KelvinTegelaar <49186168+KelvinTegelaar@users.noreply.github.com>
Date:   Thu Jan 13 19:22:48 2022 +0100

    Merge pull request #590 from homotechsual/react

    Fix project checks workflow.

commit aa3e15022caf21b9a8c14be2711743101ba202cb
Author: Michael O'Toole <mikey@mjco.uk>
Date:   Thu Jan 13 18:21:50 2022 +0000

    Fix project checks workflow.

commit 55a5a2d34b3183564c72523974e6a3ae9be4ff70
Merge: c43e7c0 6f0abe9
Author: KelvinTegelaar <49186168+KelvinTegelaar@users.noreply.github.com>
Date:   Thu Jan 13 19:20:39 2022 +0100

    Merge pull request #589 from homotechsual/react

    Add Export to CSV button

commit 6f0abe9358cc56eb0582d7874419c90c0f45b6da
Author: Michael O'Toole <mikey@mjco.uk>
Date:   Thu Jan 13 18:18:01 2022 +0000

    Fix combined workflow.

commit b4acd676a47eb16a69a74bbae4c5dd39c68a2e61
Author: Michael O'Toole <mikey@mjco.uk>
Date:   Thu Jan 13 18:13:56 2022 +0000

    Combine Node project checks into single workflow.

commit 5ebca7f88e66f3478f3e76ff5471d8c4ed9336d1
Author: Michael O'Toole <mikey@mjco.uk>
Date:   Thu Jan 13 18:07:49 2022 +0000

    Run on PR not PR Target now.

commit 8718eb5a1dcae779704b54b0ca7d7758c838752b
Author: Michael O'Toole <mikey@mjco.uk>
Date:   Thu Jan 13 18:05:57 2022 +0000

    Fix new linter config.

commit 43eef9f45d2df8c736a1a349eeba97fe07bb5e1f
Author: Michael O'Toole <mikey@mjco.uk>
Date:   Thu Jan 13 18:05:04 2022 +0000

    Replace Linter.

commit ec7edb9ed423af4b2834eab0600289fc72ba30cc
Author: Michael O'Toole <mikey@mjco.uk>
Date:   Thu Jan 13 17:53:38 2022 +0000

    Fix prettier errors.

commit 82a221a946158667d7529b5bcd4a102d2f575b12
Author: Michael O'Toole <mikey@mjco.uk>
Date:   Thu Jan 13 17:41:30 2022 +0000

    Fix build errors.

commit 5f10ca6ad28eac952678bfc2b94cf914453bc132
Author: Michael O'Toole <mikey@mjco.uk>
Date:   Thu Jan 13 17:38:15 2022 +0000

    Fix build errors.

commit d14127951bf88ef614898aba32d75f1fa77c3ddf
Merge: 8797ef0 c43e7c0
Author: Michael O'Toole <mikey@mjco.uk>
Date:   Thu Jan 13 17:37:27 2022 +0000

    Merge branch 'react' of https://github.com/kelvintegelaar/CIPP into react

commit 8797ef0291692ee4af49e6c5b6685c7edbe73b16
Author: Michael O'Toole <mikey@mjco.uk>
Date:   Thu Jan 13 17:23:14 2022 +0000

    Disable CSV exports on tables with PDF exports disabled.

commit c43e7c00b8e8b4c4c268a684208613e281b75d10
Author: KelvinTegelaar <49186168+KelvinTegelaar@users.noreply.github.com>
Date:   Thu Jan 13 18:21:59 2022 +0100

    edits for teamview

commit ea5f5c62702b5be6611fe8bf136698b196959b30
Merge: b17d8d1 4e34f85
Author: Michael O'Toole <mikey@mjco.uk>
Date:   Thu Jan 13 17:13:42 2022 +0000

    Merge branch 'react' of https://github.com/kelvintegelaar/CIPP into react

commit b17d8d1100d066f290df6588ed35b338463cba96
Author: Michael O'Toole <mikey@mjco.uk>
Date:   Thu Jan 13 17:10:39 2022 +0000

    Add Export to CSV.

commit 4e34f857d9e09c3cfc9df2458a5895cafe3ff2cd
Merge: 7a452b0 3fad948
Author: KelvinTegelaar <49186168+KelvinTegelaar@users.noreply.github.com>
Date:   Thu Jan 13 17:05:05 2022 +0100

    Merge pull request #588 from homotechsual/react

    Add NPM audit CI action.

commit 7a452b08f329bae1838f546fc821f826c84c635e
Merge: 548a54c e4413b0
Author: KelvinTegelaar <49186168+KelvinTegelaar@users.noreply.github.com>
Date:   Thu Jan 13 17:04:49 2022 +0100

    Merge pull request #587 from AdamWillford/react

    Removed margin on h5 to make text aligned

commit e4413b044a6b6fd299af2f4a2b824f1a060da28e
Author: Adam Willford <ad@mwillford.co.uk>
Date:   Thu Jan 13 16:01:36 2022 +0000

    Removed margin on h5 to make text aligned

commit 3fad948191f0fe1edf1dba3837d720fc6b86d70a
Merge: 05344d8 548a54c
Author: Michael O'Toole <mikey@mjco.uk>
Date:   Thu Jan 13 15:58:08 2022 +0000

    Merge branch 'react' of https://github.com/kelvintegelaar/CIPP into react

commit 05344d8e6d6514d79188709674d1c9f0ada0cdf3
Author: Michael O'Toole <mikey@mjco.uk>
Date:   Thu Jan 13 15:57:58 2022 +0000

    Add NPM audit CI action.

commit 548a54c2732cd0dd90111d74abf9dc21df5efed7
Merge: 795d6ef cbe3990
Author: KelvinTegelaar <49186168+KelvinTegelaar@users.noreply.github.com>
Date:   Thu Jan 13 16:46:50 2022 +0100

    Merge pull request #579 from AdamWillford/react

    Add user/tenant confirmation to offboarding Wizard

commit 795d6efa93890639dd002e74e6f626ea3fbe37f0
Merge: cb06484 ce2275a
Author: KelvinTegelaar <49186168+KelvinTegelaar@users.noreply.github.com>
Date:   Thu Jan 13 16:46:17 2022 +0100

    Merge pull request #581 from johnduprey/react-dev

    Individual Domain

commit cbe399074bc295b8ae9ab456051c6babacc10e13
Author: Adam Willford <ad@mwillford.co.uk>
Date:   Thu Jan 13 14:59:28 2022 +0000

    Change to UX on Offboarding Wizard

commit 3209d93dff45aac3a5eaab2ff3828193a02f64f0
Merge: f607a26 cb06484
Author: AdamWillford <30923966+AdamWillford@users.noreply.github.com>
Date:   Thu Jan 13 14:50:36 2022 +0000

    Merge branch 'KelvinTegelaar:react' into react

commit ce2275a621056ec01c65b9c37efa828e45f5aeb2
Author: John Duprey <jwd@johnwduprey.com>
Date:   Thu Jan 13 09:49:50 2022 -0500

    Update IndividualDomain.js

    Implement CippCodeBlock for record display
    Cleanup unused vars

commit cb06484aafcbbac5eead50d1580bf579ea18b19d
Author: KelvinTegelaar <49186168+KelvinTegelaar@users.noreply.github.com>
Date:   Thu Jan 13 15:36:16 2022 +0100

    text-white removal

commit f607a26fa73649749667a06135277c2c486d44ea
Merge: dc2376d 3284f7a
Author: AdamWillford <30923966+AdamWillford@users.noreply.github.com>
Date:   Thu Jan 13 14:21:14 2022 +0000

    Merge branch 'KelvinTegelaar:react' into react

commit dc2376d77a49ec662dafc04f80b631a0daf9ceb8
Merge: 8d689d1 8827447
Author: Adam Willford <ad@mwillford.co.uk>
Date:   Thu Jan 13 14:20:46 2022 +0000

    Merge remote-tracking branch 'origin/react' into react

commit 8d689d107a009fc779ec125a4f727124690e895b
Author: Adam Willford <ad@mwillford.co.uk>
Date:   Thu Jan 13 14:20:41 2022 +0000

    Add user/tenant confirmation to offboarding Wizard

commit 08548c8ea9a0d00c773abe92ddc39f08dce3c9ff
Merge: 003d7fb 3284f7a
Author: John Duprey <jwd@johnwduprey.com>
Date:   Thu Jan 13 09:18:02 2022 -0500

    Merge remote-tracking branch 'upstream/react' into react-dev

commit 3284f7aa3cd0299398451e0aaae26b321bc3781d
Merge: 8827447 dfc5757
Author: KelvinTegelaar <49186168+KelvinTegelaar@users.noreply.github.com>
Date:   Thu Jan 13 15:15:28 2022 +0100

    Merge pull request #578 from homotechsual/react

    Replace code block component.

commit dfc575769ac90c47b20e3f895f38d4582333b425
Merge: e5f6b05 8827447
Author: Michael O'Toole <mikey@mjco.uk>
Date:   Thu Jan 13 14:02:15 2022 +0000

    Merge branch 'react' of https://github.com/kelvintegelaar/CIPP into react

commit e5f6b055c2773339649c195403a3cff8c84042ad
Author: Michael O'Toole <mikey@mjco.uk>
Date:   Thu Jan 13 14:02:01 2022 +0000

    Replace code block component.

commit 003d7fbc2eaf7a0b04e4457f837e8f4be3519e4b
Merge: 78e464e 8827447
Author: John Duprey <jwd@johnwduprey.com>
Date:   Thu Jan 13 07:09:44 2022 -0500

    Merge remote-tracking branch 'upstream/react' into react-dev

commit 882744741d14a4266178b2c71e0dc294d0fdceb4
Merge: 0644651 fb84af1
Author: KelvinTegelaar <49186168+KelvinTegelaar@users.noreply.github.com>
Date:   Thu Jan 13 12:38:29 2022 +0100

    Merge pull request #577 from homotechsual/react

    Sidebar Nav fixes.

commit fb84af133f4bd723b3688402d18b409e0fdaaf86
Merge: 77eb466 0644651
Author: Michael O'Toole <mikey@mjco.uk>
Date:   Thu Jan 13 11:36:58 2022 +0000

    Merge upstream.

commit 77eb46652664c6d4bbabb82d04a10e4e59155222
Author: Michael O'Toole <mikey@mjco.uk>
Date:   Thu Jan 13 11:34:57 2022 +0000

    Sidebar Nav fixes.

commit 0644651fc836b7b49cba22e0ab7065f41c122922
Merge: f5848ec dc34e67
Author: KelvinTegelaar <49186168+KelvinTegelaar@users.noreply.github.com>
Date:   Thu Jan 13 09:29:51 2022 +0100

    Merge pull request #575 from AdamWillford/react

    Create new CippCodeBlock component and update JSON syntax highlighting

commit f5848ecd14935d8db88bb028e1ef01e1307027b6
Merge: 8008df2 b0a0581
Author: KelvinTegelaar <49186168+KelvinTegelaar@users.noreply.github.com>
Date:   Thu Jan 13 09:29:40 2022 +0100

    Merge pull request #576 from homotechsual/react

    Fix for Linter CI / CD errors.

commit b0a0581bb08d83ad96b978ad39a40088ed13370d
Author: Michael O'Toole <mikey@mjco.uk>
Date:   Wed Jan 12 21:49:33 2022 +0000

    Fix prettier error in IndividualDomain.js.

commit 3dcd3430090ea0c3d3f0b50e2ebe90a722ec41fe
Merge: 44cb6e3 8008df2
Author: Michael O'Toole <mikey@mjco.uk>
Date:   Wed Jan 12 21:45:35 2022 +0000

    Fix conflict in routes.js.

commit 44cb6e30728bbadb088a5b912fff21f462fddfb3
Author: Michael O'Toole <mikey@mjco.uk>
Date:   Wed Jan 12 21:41:10 2022 +0000

    Fix linter errors and theme changes.

commit dc34e67e9fa95cc00758749ab97631cba26a3865
Author: Adam Willford <ad@mwillford.co.uk>
Date:   Wed Jan 12 21:41:03 2022 +0000

    removed unused faCopy

commit f8553ccccc8eca3aafab432a7e55d85bdfcd06fc
Author: Adam Willford <ad@mwillford.co.uk>
Date:   Wed Jan 12 21:37:26 2022 +0000

    Create new CippCodeBlock component and update JSON syntax highlighting

commit 78e464eb1e6a47534f51be2213b479f645feda51
Merge: 21fe530 8008df2
Author: John Duprey <jwd@johnwduprey.com>
Date:   Wed Jan 12 16:30:30 2022 -0500

    Merge remote-tracking branch 'upstream/react' into react-dev

commit 8008df21578ad5a1e4a4e1f99556bfca16235704
Merge: 8302d6c 39d873e
Author: KelvinTegelaar <49186168+KelvinTegelaar@users.noreply.github.com>
Date:   Wed Jan 12 19:58:57 2022 +0100

    Merge pull request #574 from AdamWillford/react

    remove expandedRows from mailboxlist

commit 39d873e29ed7169847a5ccdd8bf624558233775b
Merge: 785b37c 8302d6c
Author: Adam Willford <ad@mwillford.co.uk>
Date:   Wed Jan 12 18:57:13 2022 +0000

    Merge remote-tracking branch 'origin/react' into react

commit 785b37cd555cebdada154c83b003e2efdd6beb05
Author: Adam Willford <ad@mwillford.co.uk>
Date:   Wed Jan 12 18:56:58 2022 +0000

    remove expandedRows from mailboxlist

commit 21fe530ae86c096e4726380d9f7066719ec9c3e0
Merge: 8324253 8302d6c
Author: John Duprey <jwd@johnwduprey.com>
Date:   Wed Jan 12 07:03:18 2022 -0500

    Merge remote-tracking branch 'upstream/react' into react-dev

commit 8302d6c0e3b5639eb2ef83283c266dfd7c644b1d
Author: KelvinTegelaar <49186168+KelvinTegelaar@users.noreply.github.com>
Date:   Wed Jan 12 09:14:55 2022 +0100

    minor fixes

commit 6ac458a3c301f193f2b371bb9d873dd98c21af20
Merge: 06d5aa5 12ad363
Author: KelvinTegelaar <49186168+KelvinTegelaar@users.noreply.github.com>
Date:   Wed Jan 12 09:12:35 2022 +0100

    Merge pull request #572 from k-grube/react

    Convert pages to CippPage, misc fixes

commit 12ad363f54073bcf9e86aabd6756772c35495be7
Merge: 1758232 06d5aa5
Author: KelvinTegelaar <49186168+KelvinTegelaar@users.noreply.github.com>
Date:   Wed Jan 12 09:12:26 2022 +0100

    Merge branch 'react' into react

commit 06d5aa571724b19f0177677cc6dda9dcafbc0bca
Merge: 76b1f02 2acd976
Author: KelvinTegelaar <49186168+KelvinTegelaar@users.noreply.github.com>
Date:   Wed Jan 12 09:10:51 2022 +0100

    Merge pull request #571 from homotechsual/react

    Fix incorrect permission name.

commit 76b1f0270e641aefca354adc425b9221524187cf
Merge: d7c780a 07b6d00
Author: KelvinTegelaar <49186168+KelvinTegelaar@users.noreply.github.com>
Date:   Wed Jan 12 09:10:39 2022 +0100

    Merge pull request #569 from AdamWillford/react

    Update ListProfile from expandedRows > offCanvas with Copy func

commit 17582323c4763df0053153cd94316ffc272d4b86
Author: k-grube <grube.kevin@gmail.com>
Date:   Tue Jan 11 17:14:54 2022 -0800

    Convert pages to use CippPage and CippPageList, add refresh button to Domains Analyser

commit 83242531029747476a3392ddc0534d5ae65c88c5
Merge: c7ee224 d7c780a
Author: John Duprey <jwd@johnwduprey.com>
Date:   Tue Jan 11 20:10:58 2022 -0500

    Merge remote-tracking branch 'upstream/react' into react-dev

commit 9da19e273705013e5edbcbb6e3adccd1ad855894
Author: k-grube <grube.kevin@gmail.com>
Date:   Tue Jan 11 17:08:51 2022 -0800

    Pass children to CippPage for alerts, etc

commit e1480a7185b5c468d0ccc2f55481e3bc424209e3
Author: k-grube <grube.kevin@gmail.com>
Date:   Tue Jan 11 17:08:20 2022 -0800

    Add missing route, fix typo

commit d7feaa0b65716dee5765d8cf8e398a8db397e8d2
Author: k-grube <grube.kevin@gmail.com>
Date:   Tue Jan 11 16:59:13 2022 -0800

    Remove 'text-muted'

commit bf47f0c8394467709bb7183cd5b33a2120f2c019
Author: k-grube <grube.kevin@gmail.com>
Date:   Tue Jan 11 16:37:26 2022 -0800

    Fix modal service for lists, tables, etc, swap table component for consistent themeing

commit 62d162931365482c5d9aa3a7fa3d86076d309f7f
Author: k-grube <grube.kevin@gmail.com>
Date:   Tue Jan 11 16:36:36 2022 -0800

    Set default report name

commit 2acd97635e033a04e0bf6d4f7edfed3ba7f2eb8d
Author: Michael O'Toole <mikey@mjco.uk>
Date:   Tue Jan 11 23:36:51 2022 +0000

    Remove pull_request event.

commit b47dda93fc80f324bae552f9328037c8bf66a7cf
Author: Michael O'Toole <mikey@mjco.uk>
Date:   Tue Jan 11 23:34:04 2022 +0000

    Add permissions and new event type.

commit 3021c68de36d3c9f901bb8446545a782fa43ce12
Merge: 9332f95 d7c780a
Author: Michael O'Toole <mikey@mjco.uk>
Date:   Tue Jan 11 23:30:33 2022 +0000

    Merge branch 'react' of https://github.com/kelvintegelaar/CIPP into react

commit 9332f95125133d08a6db3d9402d9050c3027e297
Author: Michael O'Toole <mikey@mjco.uk>
Date:   Tue Jan 11 23:30:27 2022 +0000

    Fix incorrect permission name.

commit 07b6d005c7440af5d94494f4bcc6b92f86ba91d9
Author: Adam Willford <ad@mwillford.co.uk>
Date:   Tue Jan 11 23:25:44 2022 +0000

    Made it look all better (even Mikey thinks so)

commit c38d62d3bc6eca73a0eb05450d0007b40ebf0246
Author: Adam Willford <ad@mwillford.co.uk>
Date:   Tue Jan 11 23:08:59 2022 +0000

    Changes to make less complex

commit 885a560f7ba16e6911d2513cf4079ef0c0a3ac41
Author: k-grube <grube.kevin@gmail.com>
Date:   Tue Jan 11 14:50:11 2022 -0800

    Show spinner on load

commit 45afe7ec965355a25992ee9cc3b079c4a69bff17
Author: k-grube <grube.kevin@gmail.com>
Date:   Tue Jan 11 14:39:22 2022 -0800

    Fix typo, fix edit tenant link

commit d7c780a3b75871ab2bd8165849da9985016493aa
Merge: 9670a90 b3eb9e9
Author: KelvinTegelaar <49186168+KelvinTegelaar@users.noreply.github.com>
Date:   Tue Jan 11 23:10:04 2022 +0100

    Merge pull request #570 from homotechsual/react

    Alter permissions for Linters workflow.

commit b3eb9e9056f1c57ef0df155ebe342646def0ea8d
Author: Michael O'Toole <mikey@mjco.uk>
Date:   Tue Jan 11 22:08:50 2022 +0000

    Alter permissions for Linters workflow.

commit c7ee224d6ee00d1f3158490be61b33d5f965d2ac
Author: John Duprey <jwd@johnwduprey.com>
Date:   Tue Jan 11 17:04:19 2022 -0500

    Update IndividualDomain.js

    Replace div with fragment

commit 0fa8defc1081440ada42d7252438cff3edb14104
Author: Adam Willford <ad@mwillford.co.uk>
Date:   Tue Jan 11 22:01:57 2022 +0000

    remove useRef as unused

commit 93eb8ac95f0505b22cd1a3787c736eb4e3ba8f59
Merge: 475782a 9670a90
Author: AdamWillford <30923966+AdamWillford@users.noreply.github.com>
Date:   Tue Jan 11 22:00:30 2022 +0000

    Merge branch 'KelvinTegelaar:react' into react

commit 9670a90450bdb77c965bb8c248efa5b3dca1c56a
Merge: c774e44 fd84815
Author: KelvinTegelaar <49186168+KelvinTegelaar@users.noreply.github.com>
Date:   Tue Jan 11 22:58:34 2022 +0100

    Merge pull request #568 from homotechsual/react

    CI / CD files for React branch.

commit 475782abbcf7fdc45bc6cc866b9fdfc817c8ca50
Merge: f6d2fc2 c774e44
Author: AdamWillford <30923966+AdamWillford@users.noreply.github.com>
Date:   Tue Jan 11 21:57:52 2022 +0000

    Merge branch 'KelvinTegelaar:react' into react

commit f6d2fc2fb95a39b89d7ef86ab177f47c9f9c4d02
Merge: 453a7da 302c975
Author: Adam Willford <ad@mwillford.co.uk>
Date:   Tue Jan 11 21:55:55 2022 +0000

    Merge remote-tracking branch 'origin/react' into react

commit 453a7da474907e692594af20b4e12a04a30c345f
Author: Adam Willford <ad@mwillford.co.uk>
Date:   Tue Jan 11 21:55:38 2022 +0000

    Update json from expandedRows > offCanvas with copy text func

commit c774e44c06939d367bb58f9d043b98b2a443f918
Author: KelvinTegelaar <49186168+KelvinTegelaar@users.noreply.github.com>
Date:   Tue Jan 11 22:36:03 2022 +0100

    made list prettier.

commit fd848152c67d9a2bf9911b08bef638030562bf67
Author: Michael O'Toole <mikey@mjco.uk>
Date:   Tue Jan 11 21:28:00 2022 +0000

    Switch node version to 16.

commit 8a4cd0d7c19b0e5b18122228a8211d0f55bb21aa
Author: KelvinTegelaar <49186168+KelvinTegelaar@users.noreply.github.com>
Date:   Tue Jan 11 22:19:33 2022 +0100

    fixed minor stuff

commit 84420396bb379f1c68c0be2e5cf6d33130a5d5ec
Author: Michael O'Toole <mikey@mjco.uk>
Date:   Tue Jan 11 20:59:42 2022 +0000

    Rename job from build to lint in Run Linters workflow.

commit 018bcadbf20928d9e621f33413419303936205b2
Author: KelvinTegelaar <49186168+KelvinTegelaar@users.noreply.github.com>
Date:   Tue Jan 11 21:56:48 2022 +0100

    made response

commit 633e5eb16c35a907fb7a24a4d48fc1128985e60f
Author: Michael O'Toole <mikey@mjco.uk>
Date:   Tue Jan 11 20:53:59 2022 +0000

    Remove linters from Project Check job.

commit b36dbe104acf43fb30e4a16c3ad18612ac55cf82
Author: Michael O'Toole <mikey@mjco.uk>
Date:   Tue Jan 11 20:53:26 2022 +0000

    Change node version.

commit 494522915434d09746e4c8fb0bf1db07456c9d6f
Author: Michael O'Toole <mikey@mjco.uk>
Date:   Tue Jan 11 20:51:51 2022 +0000

    Split linting to it's own CI job.

commit b5182ad33ba5aa359c9578732c47082c63e4bf53
Author: Michael O'Toole <mikey@mjco.uk>
Date:   Tue Jan 11 20:46:30 2022 +0000

    Fix lint CI job.

commit fc755381c39972192d347f2d06733f95542e8d91
Author: KelvinTegelaar <49186168+KelvinTegelaar@users.noreply.github.com>
Date:   Tue Jan 11 21:25:26 2022 +0100

    added word

commit cfa49bd8d8588230691bba5a3c1b3c8bba78d5c6
Merge: d6bbcad 77693e2
Author: Michael O'Toole <mikey@mjco.uk>
Date:   Tue Jan 11 20:01:58 2022 +0000

    Merge upstream.

commit d6bbcad43990b1e873b5b3a90466b395ad61b4ef
Author: Michael O'Toole <mikey@mjco.uk>
Date:   Tue Jan 11 19:16:12 2022 +0000

    Add node modules to eslintignore.

commit 49399636063d80bde63e526532e1fdb1de09c361
Author: Michael O'Toole <mikey@mjco.uk>
Date:   Tue Jan 11 18:34:16 2022 +0000

    Update/fix actions.

commit 3885b83992ac2f27afd0ed0b94197490c42a47bb
Author: Michael O'Toole <mikey@mjco.uk>
Date:   Tue Jan 11 18:33:34 2022 +0000

    Update/fix actions.

commit b70dc8f7d704a9ad86cf3c71bee697ec9d4ce352
Author: Michael O'Toole <mikey@mjco.uk>
Date:   Tue Jan 11 18:33:06 2022 +0000

    Update/fix actions.

commit 4f239a8bdd515eeb0a8f89fc0f4ee3c170c9f6df
Author: Michael O'Toole <mikey@mjco.uk>
Date:   Tue Jan 11 18:31:49 2022 +0000

    Update/fix actions.

commit b23369c86a50695fbde414c6e85adc9ffaf55707
Author: Michael O'Toole <mikey@mjco.uk>
Date:   Tue Jan 11 18:27:22 2022 +0000

    Rebuild/replace action and templates directory for GitHub.

commit 77693e2a8e27411269f75a8289acafd9da1db1c5
Merge: c730846 a0c271d
Author: KelvinTegelaar <49186168+KelvinTegelaar@users.noreply.github.com>
Date:   Tue Jan 11 18:47:26 2022 +0100

    Merge pull request #567 from k-grube/react

    enable rule react/no-children-prop

commit a0c271de45806783ce31673f49594a33631344fb
Author: k-grube <grube.kevin@gmail.com>
Date:   Tue Jan 11 09:26:49 2022 -0800

    enable rule react/no-children-prop

commit c730846156ea3082616523b347ff185f0ac28064
Merge: 663abca 8d4642f
Author: KelvinTegelaar <49186168+KelvinTegelaar@users.noreply.github.com>
Date:   Tue Jan 11 18:22:02 2022 +0100

    Merge pull request #565 from johnduprey/react-dev

    CippOffcanvas fix

commit 8d4642f9217ccec75819e4f1ecd0385b4ab48dcb
Author: John Duprey <jwd@johnwduprey.com>
Date:   Tue Jan 11 12:14:43 2022 -0500

    Update IndividualDomain.js

    Add id property to CippOffcanvas

commit 1c0354b777a80bd37cb868b4586d1e8d8020bf2f
Author: Michael O'Toole <mikey@mjco.uk>
Date:   Tue Jan 11 17:07:31 2022 +0000

    Move children= to actual children.

commit c206e4fea256522f0d4b1d1e40d95c5d77f457d1
Merge: 298a600 6c780de
Author: John Duprey <jwd@johnwduprey.com>
Date:   Tue Jan 11 12:04:26 2022 -0500

    Merge remote-tracking branch 'upstream/react' into react-dev

commit 298a600f092df4107461d5aebe471cfd31939fa3
Author: John Duprey <jwd@johnwduprey.com>
Date:   Tue Jan 11 12:04:05 2022 -0500

    CippOffcanvas fix

    Remove children prop from object and nest normally

commit 663abca31e94d08f99bf1754b2e01d5127bcc5c8
Author: KelvinTegelaar <49186168+KelvinTegelaar@users.noreply.github.com>
Date:   Tue Jan 11 17:51:44 2022 +0100

    double slash

commit bf30440372072d3cffc2e1ab4c61388bd625566f
Merge: 6c780de b3d302d
Author: KelvinTegelaar <49186168+KelvinTegelaar@users.noreply.github.com>
Date:   Tue Jan 11 17:46:47 2022 +0100

    Merge pull request #564 from k-grube/react

    Misc fix

commit b3d302db5cd2c7d30bfe56e293671e2f5d3be559
Author: k-grube <grube.kevin@gmail.com>
Date:   Tue Jan 11 08:23:39 2022 -0800

    Fix declaration typo

commit 6c780de046f810532592a8b0c55a23398c2c9781
Author: KelvinTegelaar <49186168+KelvinTegelaar@users.noreply.github.com>
Date:   Tue Jan 11 17:14:38 2022 +0100

    improvements

commit 0072d84e4a1026a0bfc9c1ea6b4bd001b61ca034
Author: k-grube <grube.kevin@gmail.com>
Date:   Tue Jan 11 08:10:16 2022 -0800

    Fix homepage links

commit 62df33cf482970a08c0b54b51389d735c71196a8
Author: KelvinTegelaar <49186168+KelvinTegelaar@users.noreply.github.com>
Date:   Tue Jan 11 15:49:43 2022 +0100

    added editmailbox permissions

commit 98da9676a9243666919c107889369034be22f974
Merge: 1ae8cdb 7458d96
Author: KelvinTegelaar <49186168+KelvinTegelaar@users.noreply.github.com>
Date:   Tue Jan 11 12:22:48 2022 +0100

    Merge pull request #563 from homotechsual/react

commit 7458d9690eacd3e9381f45013d5734785f6f2492
Author: Michael O'Toole <mikey@mjco.uk>
Date:   Tue Jan 11 10:58:37 2022 +0000

    Better line break removal in version check function.

commit 1ae8cdb90da5d884ef38f92733467446fb5f0ea8
Author: KelvinTegelaar <49186168+KelvinTegelaar@users.noreply.github.com>
Date:   Mon Jan 10 22:38:24 2022 +0100

    no unused cars

commit ccf342cd2f7c6f4ca77a5d626b5b9d4cd1a5b765
Author: KelvinTegelaar <49186168+KelvinTegelaar@users.noreply.github.com>
Date:   Mon Jan 10 22:37:41 2022 +0100

    wizard edits

commit 99a3c23cf60aa734519d2eabdc0cb1ec6c634f9b
Author: Adam Willford <ad@mwillford.co.uk>
Date:   Mon Jan 10 21:09:54 2022 +0000

    Update profile JSON from expandedRows > offCanvas

commit 302c975029f6c910e19bed376a90b53d0e1044c0
Author: KelvinTegelaar <49186168+KelvinTegelaar@users.noreply.github.com>
Date:   Mon Jan 10 21:46:24 2022 +0100

    fixed return from notifcation config

commit 7c7117fd81b9024e9c7b4e57fafae3e5de21d933
Author: KelvinTegelaar <49186168+KelvinTegelaar@users.noreply.github.com>
Date:   Mon Jan 10 19:06:12 2022 +0100

    fixed broken modal

commit 99bdcef133647f33343d7e08e4774f5eb27c3465
Merge: 1c6609b 783be0f
Author: KelvinTegelaar <49186168+KelvinTegelaar@users.noreply.github.com>
Date:   Mon Jan 10 18:02:35 2022 +0100

    Merge pull request #561 from AdamWillford/react

commit 783be0fb28a2be6aa97ef1f5dc47bbfad7c201aa
Author: Adam Willford <ad@mwillford.co.uk>
Date:   Mon Jan 10 17:01:39 2022 +0000

    Updated Roles from expandedRows > offCanvas

commit 1c6609b80bace416f72a696512af385c720b9472
Merge: e28c89b cffb5a0
Author: KelvinTegelaar <49186168+KelvinTegelaar@users.noreply.github.com>
Date:   Mon Jan 10 16:55:04 2022 +0100

    Merge pull request #560 from homotechsual/react

commit cffb5a0cfb4cb5a0fa12ab1b05e9c0148deb03a0
Merge: df9642f e28c89b
Author: Michael O'Toole <mikey@mjco.uk>
Date:   Mon Jan 10 15:53:06 2022 +0000

    Merge upstream.

commit df9642f395bc117a089876c12343eca590d1570d
Author: Michael O'Toole <mikey@mjco.uk>
Date:   Mon Jan 10 15:50:02 2022 +0000

    Fix for Wizard themeing and page-by-page reviews.

commit e28c89bbe9b1bf0ce6ad70b2a6ec6298aed56075
Author: KelvinTegelaar <49186168+KelvinTegelaar@users.noreply.github.com>
Date:   Mon Jan 10 16:42:13 2022 +0100

    edit link added

commit 6370d930fd228f4bbdc0246badc0d61fef79f30a
Author: KelvinTegelaar <49186168+KelvinTegelaar@users.noreply.github.com>
Date:   Mon Jan 10 16:34:03 2022 +0100

    removed unused imports

commit 1b810cd1b87ed141b1ba21cc5d6322e12f2ba7ad
Author: KelvinTegelaar <49186168+KelvinTegelaar@users.noreply.github.com>
Date:   Mon Jan 10 16:04:28 2022 +0100

    menu changes

commit 8ea8b551d0f84ba6973040b32ecc154158f4c3a8
Author: KelvinTegelaar <49186168+KelvinTegelaar@users.noreply.github.com>
Date:   Mon Jan 10 15:56:55 2022 +0100

    dropdowns and actions

commit 3651cf550900bca28001b4a38752c332964aa10d
Author: KelvinTegelaar <49186168+KelvinTegelaar@users.noreply.github.com>
Date:   Mon Jan 10 15:31:01 2022 +0100

    fixed remove standard

commit 644596ab21f344fc8dfb8285cefd7ee9683ac467
Author: KelvinTegelaar <49186168+KelvinTegelaar@users.noreply.github.com>
Date:   Mon Jan 10 13:44:19 2022 +0100

    removed typo

commit 9af60fbec028555004c9d6491068b1219e29aae4
Author: KelvinTegelaar <49186168+KelvinTegelaar@users.noreply.github.com>
Date:   Mon Jan 10 13:42:31 2022 +0100

    text changes

commit 700f1e2579480e7c54b047338be2bad1d503525d
Author: KelvinTegelaar <49186168+KelvinTegelaar@users.noreply.github.com>
Date:   Mon Jan 10 11:05:54 2022 +0100

    changed error colour to danger

commit 7e53c0f2000b374c52a51553682537ebd681f694
Author: KelvinTegelaar <49186168+KelvinTegelaar@users.noreply.github.com>
Date:   Mon Jan 10 11:00:49 2022 +0100

    add all actions

commit 52505a253495e38149fc66e31c1da515e48fc3da
Author: KelvinTegelaar <49186168+KelvinTegelaar@users.noreply.github.com>
Date:   Mon Jan 10 10:32:45 2022 +0100

    added modal confirmations

commit 08fdd7beac11c33341b8acbb8a624ae449b417b6
Author: KelvinTegelaar <49186168+KelvinTegelaar@users.noreply.github.com>
Date:   Mon Jan 10 10:08:06 2022 +0100

    added modal mode to cippactions

commit 8b5c298624f478595d66daeecc3ee6ec6abedd2e
Author: KelvinTegelaar <49186168+KelvinTegelaar@users.noreply.github.com>
Date:   Mon Jan 10 09:45:57 2022 +0100

    added onclick event

commit 127962a8863e093890810e791a771ee5c46ae922
Author: KelvinTegelaar <49186168+KelvinTegelaar@users.noreply.github.com>
Date:   Mon Jan 10 09:42:21 2022 +0100

    unused imports

commit 7c52799c7dfca059393f393e6ffa359310df8723
Author: KelvinTegelaar <49186168+KelvinTegelaar@users.noreply.github.com>
Date:   Mon Jan 10 09:25:38 2022 +0100

    text change

commit 095034c4f7638f6dd42d43acd5147cef5a258ae7
Merge: 9d3adcb 05192f4
Author: KelvinTegelaar <49186168+KelvinTegelaar@users.noreply.github.com>
Date:   Mon Jan 10 09:17:29 2022 +0100

    Merge pull request #558 from AdamWillford/react

    Updated ViewUser pages to CippDataTable for pagination etc

commit 9d3adcbdd55b8784bc4815e457995683cb7907dc
Merge: 07f4462 8bfa2b7
Author: KelvinTegelaar <49186168+KelvinTegelaar@users.noreply.github.com>
Date:   Mon Jan 10 09:17:22 2022 +0100

    Merge pull request #559 from homotechsual/react

    More theme fixes/improvements.

commit 8bfa2b7884ed839ecb24f86343c9a183e43fdb83
Author: Michael O'Toole <mikey@mjco.uk>
Date:   Mon Jan 10 00:28:30 2022 +0000

    Change CippOffcanvasTable row key to GUID + index.

commit e9f82570fa2eaa8d1a0eae578d81cf2b29ada91d
Author: Michael O'Toole <mikey@mjco.uk>
Date:   Mon Jan 10 00:26:09 2022 +0000

    Fix CippOffcanvasTable key error.

commit 581f9bfcdf263d38777829ef08b8e3bbba2bb0cb
Merge: f451f85 0ff6713
Author: Michael O'Toole <mikey@mjco.uk>
Date:   Sun Jan 9 23:54:23 2022 +0000

    Merge upstream.

commit f451f856c33a8c1ee10ac0b4c1f370a0a0449525
Merge: ee8634a 07f4462
Author: Michael O'Toole <mikey@mjco.uk>
Date:   Sun Jan 9 23:51:46 2022 +0000

    Merge branch 'react' of https://github.com/kelvintegelaar/CIPP into react

commit ee8634aa048fef266a1f3fb4b8fbb902c847c747
Author: Michael O'Toole <mikey@mjco.uk>
Date:   Sun Jan 9 23:51:39 2022 +0000

    Various theme fixes and improvements.

commit 05192f4c22258d6ca976aa7ea3bf9c5ec5c9425c
Author: Adam Willford <ad@mwillford.co.uk>
Date:   Sun Jan 9 22:41:50 2022 +0000

    Updated columns selectors from text-based > funcs

commit 5920f0a69b6843318f911b4a6e948a3e93111dbb
Author: Adam Willford <ad@mwillford.co.uk>
Date:   Sun Jan 9 22:31:08 2022 +0000

    Updated ViewUser pages to CippDataTable for pagination etc

commit 07f44625b2b3f03aab0e38f27422787d87096feb
Merge: bb6a615 b360175
Author: KelvinTegelaar <49186168+KelvinTegelaar@users.noreply.github.com>
Date:   Sun Jan 9 21:56:25 2022 +0100

    Merge pull request #553 from johnduprey/react-dev

commit b3601757e837518b5728c30acb4e51ff6a219f1c
Author: John Duprey <jwd@johnwduprey.com>
Date:   Sun Jan 9 15:41:12 2022 -0500

    Update IndividualDomain.js

    Add margin to external link icons

commit f46f4d2ff25ec464797f0438933ebe2685df9f15
Merge: c05a73a d9edfa7
Author: John Duprey <jwd@johnwduprey.com>
Date:   Sun Jan 9 15:35:14 2022 -0500

    Merge remote-tracking branch 'upstream/react' into react-dev

commit c05a73a61f6dc897d13244f1242adc33342763be
Author: John Duprey <jwd@johnwduprey.com>
Date:   Sun Jan 9 15:31:36 2022 -0500

    Update IndividualDomain.js

    Remove text-primary from cards

commit f70bbc59bc170370eb8a45b7b81bf85b113e8233
Author: John Duprey <jwd@johnwduprey.com>
Date:   Sun Jan 9 15:27:48 2022 -0500

    Remove ReactMarkdown

commit bb6a615152b13eccd058f5ae2fe380cb14ea0ab7
Author: KelvinTegelaar <49186168+KelvinTegelaar@users.noreply.github.com>
Date:   Sun Jan 9 21:24:00 2022 +0100

    set fontsize to a little smaller.

commit 35234b73c4b181f67181caa9c05152330e5ca1b5
Author: KelvinTegelaar <49186168+KelvinTegelaar@users.noreply.github.com>
Date:   Sun Jan 9 21:18:02 2022 +0100

    design tweaks

commit e398b0e3d79603bc5a158d5cb7a21b743ec9122d
Author: KelvinTegelaar <49186168+KelvinTegelaar@users.noreply.github.com>
Date:   Sun Jan 9 21:04:49 2022 +0100

    minor design change.

commit 360f5a0c75ce4376d9cad9132640e8cfbb78f4c7
Author: KelvinTegelaar <49186168+KelvinTegelaar@users.noreply.github.com>
Date:   Sun Jan 9 20:41:49 2022 +0100

    added and finished BECview

commit 0ff6713fa9d133e1fc3722767014906a1c840eb0
Author: Michael O''Toole <mikey@mjco.uk>
Date:   Sun Jan 9 18:38:37 2022 +0000

    Updates and theme fixes. Add CippOffcanvasListGroup.

commit e5f9bffea8961f859215c7ab29e9ecd5a7b70335
Author: John Duprey <jwd@johnwduprey.com>
Date:   Sun Jan 9 11:27:17 2022 -0500

    Update IndividualDomain.js

    Remove unused var

commit 411874434b5649939c27e18dbd745308297a3fe5
Author: John Duprey <jwd@johnwduprey.com>
Date:   Sun Jan 9 11:24:55 2022 -0500

    Markdown support for API content

    Add react-markdown package
    Add ReactMarkdown parser to IndividualDomain

commit d9edfa76999b34ef653be2836ec9c27493a3427e
Author: KelvinTegelaar <49186168+KelvinTegelaar@users.noreply.github.com>
Date:   Sun Jan 9 17:01:44 2022 +0100

    view user preusage

commit 4c6b69edd8b4f6a0950e99a8506db4ef5e14f5de
Author: KelvinTegelaar <49186168+KelvinTegelaar@users.noreply.github.com>
Date:   Sun Jan 9 13:54:54 2022 +0100

    unused vars

commit ff72b7f10d6248b1d80e80d6bddf95a357e0af8f
Merge: a0e024b a7a9a68
Author: KelvinTegelaar <49186168+KelvinTegelaar@users.noreply.github.com>
Date:   Sun Jan 9 13:45:08 2022 +0100

    Merge pull request #543 from johnduprey/react-dev

    Offcanvas tweaks - Profile and Domain

commit a0e024bd4203594543cfd3fca0f941d25e46651a
Merge: 9e3d1c9 40e647a
Author: KelvinTegelaar <49186168+KelvinTegelaar@users.noreply.github.com>
Date:   Sun Jan 9 13:44:54 2022 +0100

    Merge pull request #544 from k-grube/react

    Fix AddUser, set form validation fields

commit 40e647abe50a7e226e6a77e97b72b7b8915f562f
Author: k-grube <grube.kevin@gmail.com>
Date:   Sat Jan 8 20:13:37 2022 -0800

    Fix AddUser, set form validation fields

commit a7a9a68e4376960664d35bd817e67521bbc58191
Author: John Duprey <jwd@johnwduprey.com>
Date:   Sat Jan 8 22:10:16 2022 -0500

    Update IndividualDomain.js

    Fix warning on useEffect

commit 07b258dd3808008bc278d01d8d312338d3c33cad
Author: John Duprey <jwd@johnwduprey.com>
Date:   Sat Jan 8 21:05:47 2022 -0500

    Update IndividualDomain.js

    Update MX details to use CippOffcanvas

commit 47f9045c53279daf781aa826d814518b77b97324
Author: John Duprey <jwd@johnwduprey.com>
Date:   Sat Jan 8 20:31:42 2022 -0500

    Offcanvas tweaks - Profile and Domain

    Copy ViewProfile to CippProfile in components
    Layout tweaks for profile
    Update AppHeaderDropdown to load profile in Offcanvas
    Modify individual domain form to group text and button inputs
    DomainAnalyser - change more info button to launch IndividualDomainCheck for selected domain

commit 70a1b6ab7e5b981b6adb97da225e674b5e0988b3
Merge: c783b2e 9e3d1c9
Author: John Duprey <jwd@johnwduprey.com>
Date:   Sat Jan 8 18:10:41 2022 -0500

    Merge remote-tracking branch 'upstream/react' into react-dev

commit 9e3d1c9bf39ee6c0450c398c2a2c4e8db9166dbd
Author: KelvinTegelaar <49186168+KelvinTegelaar@users.noreply.github.com>
Date:   Sat Jan 8 23:59:45 2022 +0100

    small colour changes

commit 7fbdfd869120c055dc55fb729d19f5accb82479a
Merge: d691fb4 cfd4bd8
Author: KelvinTegelaar <49186168+KelvinTegelaar@users.noreply.github.com>
Date:   Sat Jan 8 23:16:22 2022 +0100

    Merge pull request #542 from homotechsual/react

    Theme fixes and CippOffcanvas changes.

commit cfd4bd8a6a899e5d010f2664c46838fe04f2de7a
Merge: 6dfe20a d691fb4
Author: Michael O''Toole <mikey@mjco.uk>
Date:   Sat Jan 8 22:12:23 2022 +0000

    Merge upstream.

commit 6dfe20a27e3bfe621b33556c79c3d7ed6acca888
Merge: ca42c07 65f30e1
Author: Michael O''Toole <mikey@mjco.uk>
Date:   Sat Jan 8 22:08:59 2022 +0000

    Fix state styles (success etc) and OffCanvas components.

commit c783b2e4169f112c30a43ab983f3d39c35e64739
Merge: ce2e1f2 d691fb4
Author: John Duprey <jwd@johnwduprey.com>
Date:   Sat Jan 8 12:28:03 2022 -0500

    Merge remote-tracking branch 'upstream/react' into react-dev

commit d691fb4cf039ae9c05f2debae578117c10b91dba
Author: KelvinTegelaar <49186168+KelvinTegelaar@users.noreply.github.com>
Date:   Sat Jan 8 13:02:42 2022 +0100

    added target _blank to docs

commit cc3f198633e945db61be2c13833734d322fcd991
Author: KelvinTegelaar <49186168+KelvinTegelaar@users.noreply.github.com>
Date:   Sat Jan 8 12:58:55 2022 +0100

    delete button

commit 545e959ebf3db9b5b1d93746d42b2903adc18417
Author: KelvinTegelaar <49186168+KelvinTegelaar@users.noreply.github.com>
Date:   Sat Jan 8 12:55:45 2022 +0100

    Replaced dropdown

commit a02e1605d3d74b9034c163d6fe795efbedaf6c6a
Author: KelvinTegelaar <49186168+KelvinTegelaar@users.noreply.github.com>
Date:   Sat Jan 8 12:51:00 2022 +0100

    removed d…
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.

2 participants