Infra
/
lemur
5
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'master' into entrust-default-clientId

This commit is contained in:
Hossein Shafagh 2021-01-18 14:07:11 -08:00 committed by GitHub
parent e6a414a069 0f6af9f679
commit 74bb4f58a0
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
lemur/static/app/angular/certificates/certificate/export.tpl.html
View File

@ -25,6 +25,7 @@
<input name="sub" ng-if="item.type == 'int'" type="number" ng-pattern="/^[0-9]{12,12}$/" <input name="sub" ng-if="item.type == 'int'" type="number" ng-pattern="/^[0-9]{12,12}$/"
class="form-control" ng-model="item.value"/> class="form-control" ng-model="item.value"/>
<select name="sub" ng-if="item.type == 'select'" class="form-control" <select name="sub" ng-if="item.type == 'select'" class="form-control"
ng-init="item.value = item.available[0]"
ng-options="i for i in item.available" ng-model="item.value"></select> ng-options="i for i in item.available" ng-model="item.value"></select>
<input name="sub" ng-if="item.type == 'bool'" class="form-control" type="checkbox" <input name="sub" ng-if="item.type == 'bool'" class="form-control" type="checkbox"
ng-model="item.value"> ng-model="item.value">

6
requirements-tests.txt
View File

@ -10,9 +10,9 @@ aws-sam-translator==1.22.0 # via cfn-lint
aws-xray-sdk==2.5.0 # via moto aws-xray-sdk==2.5.0 # via moto
bandit==1.7.0 # via -r requirements-tests.in bandit==1.7.0 # via -r requirements-tests.in
black==20.8b1 # via -r requirements-tests.in black==20.8b1 # via -r requirements-tests.in
boto3==1.16.51 # via aws-sam-translator, moto boto3==1.16.56 # via aws-sam-translator, moto
boto==2.49.0 # via moto boto==2.49.0 # via moto
botocore==1.19.51 # via aws-xray-sdk, boto3, moto, s3transfer botocore==1.19.56 # via aws-xray-sdk, boto3, moto, s3transfer
certifi==2020.12.5 # via requests certifi==2020.12.5 # via requests
cffi==1.14.0 # via cryptography cffi==1.14.0 # via cryptography
cfn-lint==0.29.5 # via moto cfn-lint==0.29.5 # via moto
@ -24,7 +24,7 @@ decorator==4.4.2 # via networkx
docker==4.2.0 # via moto docker==4.2.0 # via moto
ecdsa==0.14.1 # via moto, python-jose, sshpubkeys ecdsa==0.14.1 # via moto, python-jose, sshpubkeys
factory-boy==3.2.0 # via -r requirements-tests.in factory-boy==3.2.0 # via -r requirements-tests.in
faker==5.4.1 # via -r requirements-tests.in, factory-boy faker==5.6.1 # via -r requirements-tests.in, factory-boy
fakeredis==1.4.5 # via -r requirements-tests.in fakeredis==1.4.5 # via -r requirements-tests.in
flask==1.1.2 # via pytest-flask flask==1.1.2 # via pytest-flask
freezegun==1.0.0 # via -r requirements-tests.in freezegun==1.0.0 # via -r requirements-tests.in

4
requirements.txt
View File

@ -15,8 +15,8 @@ bcrypt==3.1.7 # via flask-bcrypt, paramiko
beautifulsoup4==4.9.1 # via cloudflare beautifulsoup4==4.9.1 # via cloudflare
billiard==3.6.3.0 # via celery billiard==3.6.3.0 # via celery
blinker==1.4 # via flask-mail, flask-principal, raven blinker==1.4 # via flask-mail, flask-principal, raven
boto3==1.16.51 # via -r requirements.in boto3==1.16.56 # via -r requirements.in
botocore==1.19.51 # via -r requirements.in, boto3, s3transfer botocore==1.19.56 # via -r requirements.in, boto3, s3transfer
celery[redis]==4.4.2 # via -r requirements.in celery[redis]==4.4.2 # via -r requirements.in
certifi==2020.12.5 # via -r requirements.in, requests certifi==2020.12.5 # via -r requirements.in, requests
certsrv==2.1.1 # via -r requirements.in certsrv==2.1.1 # via -r requirements.in