🚧 Merge develop and master #144
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
* Adds a root level `LICENSE` file * Adds scripts to add the license to all js files or just those staged in git * Wires in the scripts to the `package.json` to run as pre-commit * Note that this doesn't do very good checking for existing license headers * Also, adds license to the index.html file.
* some readme updates * Update README.md
* NO-REF update readme for clarity * Update language to Virtru SDK for Javascript
…due to confusion with how the SDK should work- Updated README with details on where to find SDK usage- Add comments on SDK usage (#131)
* platform24 added develop/staging * review fixes * NPM build added for develop * Fix syntax * PLATFORM-24 fix audit issue * Remove duplicate deploy for staging * Refactor pipeline
* increase file size limit * merge
This will up he transitive dep on `eslint-utils` to 1.4.3, fixing our vulnerability alert
pflynn-virtru
previously approved these changes
Feb 7, 2020
|
There was a bug on develop when you adding embedded |
|
@ivanovSPvirtru not sure I follow but can you post how to reproduce and I can get to it today. |
See PR #128
dmihalcik-virtru
force-pushed
the
feature/mergy
branch
from
19bf0c6 to
024befc
Compare
|
I've fixed build (analytics crept back in due to the merge, after @biscoe916 removed them in #128) and the drag-and-drop as requested by @ivanovSPvirtru |
|
Do you need a review tonight?
…On Fri, Feb 7, 2020 at 18:41 Dave Mihalcik ***@***.***> wrote:
I've fixed build (analytics crept back in due to the merge, after
@biscoe916 <https://github.com/biscoe916> removed them in #128
<#128>) and the
drag-and-drop as requested by @ivanovSPvirtru
<https://github.com/ivanovSPvirtru>
—
You are receiving this because your review was requested.
Reply to this email directly, view it on GitHub
<#144?email_source=notifications&email_token=AAALLVLN74GPKVRLWM53Z6LRBYLWLA5CNFSM4KRQLBG2YY3PNVWWK3TUL52HS4DFVREXG43VMVBW63LNMVXHJKTDN5WW2ZLOORPWSZGOELFHQKA#issuecomment-583694376>,
or unsubscribe
<https://github.com/notifications/unsubscribe-auth/AAALLVK7XM24RVCALXVDKN3RBYLWLANCNFSM4KRQLBGQ>
.
|
|
No rush; please feel free to wait until business hours. There are a lot of changed lines but most of the code should have been reviewed already. Mostly you'd be looking for bad auto-merge lines and the two post-merge commits to fix bugs introduced due to the separation of the branches |
pflynn-virtru
approved these changes
Feb 8, 2020
|
Paul is apparently not in the CODEOWNERS. :-/ So I'll still need your review @jrschumacher |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
I would like to delete the
developbranch after this