Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/internal' into develop
Browse files Browse the repository at this point in the history
  • Loading branch information
seanwu1105 committed Nov 2, 2020
2 parents 63a1352 + 3c86f03 commit c6474f5
Show file tree
Hide file tree
Showing 59 changed files with 1,928 additions and 92 deletions.
13 changes: 13 additions & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,19 @@
| master | [![build](https://github.com/numbersprotocol/capture-lite/workflows/build/badge.svg)](https://github.com/numbersprotocol/capture-lite/actions?query=workflow%3Abuild) | [![Codacy Badge](https://app.codacy.com/project/badge/Coverage/45ae18aaa6a7474497e0efd818452a46)](https://www.codacy.com/gh/numbersprotocol/capture-lite?utm_source=github.com&utm_medium=referral&utm_content=numbersprotocol/capture-lite&utm_campaign=Badge_Coverage) | [![Codacy Badge](https://app.codacy.com/project/badge/Grade/45ae18aaa6a7474497e0efd818452a46)](https://www.codacy.com/gh/numbersprotocol/capture-lite?utm_source=github.com&utm_medium=referral&utm_content=numbersprotocol/capture-lite&utm_campaign=Badge_Grade) |
| develop | [![build](https://github.com/numbersprotocol/capture-lite/workflows/build/badge.svg?branch=develop)](https://github.com/numbersprotocol/capture-lite/actions?query=workflow%3Abuild) | [![Codacy Badge](https://app.codacy.com/project/badge/Coverage/45ae18aaa6a7474497e0efd818452a46?branch=develop)](https://www.codacy.com/gh/numbersprotocol/capture-lite?utm_source=github.com&utm_medium=referral&utm_content=numbersprotocol/capture-lite&utm_campaign=Badge_Coverage) | [![Codacy Badge](https://app.codacy.com/project/badge/Grade/45ae18aaa6a7474497e0efd818452a46?branch=develop)](https://www.codacy.com/gh/numbersprotocol/capture-lite?utm_source=github.com&utm_medium=referral&utm_content=numbersprotocol/capture-lite&utm_campaign=Badge_Grade)

## Internal Branch

__This is an internal branch which cannot be built without further configurations.__

### Ignore Secrets in Git

1. Create an empty `secret.ts` file with empty variables (e.g. empty string).
1. Push the empty secret file to remote repo so the CI can still build the project.
1. Make git ignore the modification of the secret file locally with the command `git update-index --skip-worktree <secret file path>`.
1. Now, you can modify the secret file without the fear of pushing it to the public repo.

> You don't even need to add the secret file to `.gitignore`.
## Highlight Features

* Generate digital proofs on media assets created.
Expand Down
103 changes: 55 additions & 48 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

3 changes: 3 additions & 0 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,9 @@
"@ngneat/transloco": "^2.19.1",
"@ngneat/until-destroy": "^8.0.2",
"image-blob-reduce": "^2.0.0",
"@ngx-formly/core": "^5.0.0",
"@ngx-formly/ionic": "^5.0.0",
"@ngx-formly/schematics": "^5.10.3",
"rxjs": "~6.6.3",
"tslib": "^2.0.1",
"zone.js": "~0.10.2"
Expand Down
Loading

0 comments on commit c6474f5

Please sign in to comment.