Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/develop' into uat
Browse files Browse the repository at this point in the history
  • Loading branch information
petrjasek committed Jul 10, 2024
2 parents 8831c42 + 7348a04 commit fe1972d
Show file tree
Hide file tree
Showing 4 changed files with 62 additions and 96 deletions.
128 changes: 49 additions & 79 deletions client/package-lock.json

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

6 changes: 1 addition & 5 deletions server/data/ui_config.json
Original file line number Diff line number Diff line change
Expand Up @@ -92,7 +92,7 @@
},
{
"_id": "agenda",
"init_version": 5,
"init_version": 6,
"subnav": {
"filters": [
"item_type",
Expand All @@ -116,10 +116,8 @@
"preview": {
"coverage_metadata_fields": [
"coverage_header",
"sttversion",
"coverage_expected_date",
"coverage_provider",
"coverage_wire_text",
"coverage_update_coming",
"coverage_status",
"coverage_scheduled_status",
Expand All @@ -132,10 +130,8 @@
"details": {
"coverage_metadata_fields": [
"coverage_header",
"sttversion",
"coverage_expected_date",
"coverage_provider",
"coverage_wire_text",
"coverage_update_coming",
"coverage_status",
"coverage_scheduled_status",
Expand Down
2 changes: 1 addition & 1 deletion server/dev-requirements.txt
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
-r requirements.txt

flake8
pytest==8.2.1
pytest==8.2.2
pytest-cov==5.0.0
pytest-mock==3.14.0
responses>=0.10.6,<0.26
Expand Down
22 changes: 11 additions & 11 deletions server/requirements.txt
Original file line number Diff line number Diff line change
Expand Up @@ -35,9 +35,9 @@ blinker==1.7.0
# raven
# sentry-sdk
# superdesk-core
boto3==1.34.119
boto3==1.34.142
# via superdesk-core
botocore==1.34.119
botocore==1.34.142
# via
# boto3
# s3transfer
Expand All @@ -53,7 +53,7 @@ cerberus==1.3.5
# via
# eve
# superdesk-core
certifi==2024.6.2
certifi==2024.7.4
# via
# elastic-apm
# elasticsearch
Expand Down Expand Up @@ -105,15 +105,15 @@ dnspython==2.6.1
# via email-validator
draftjs-exporter[lxml]==2.1.7
# via superdesk-core
ecs-logging==2.1.0
ecs-logging==2.2.0
# via elastic-apm
elastic-apm[flask]==6.22.2
elastic-apm[flask]==6.22.3
# via superdesk-core
elasticsearch==7.13.4
# via
# eve-elastic
# superdesk-core
email-validator==2.1.1
email-validator==2.2.0
# via wtforms
eve==1.1.2
# via superdesk-core
Expand Down Expand Up @@ -210,7 +210,7 @@ kombu==5.2.4
# superdesk-core
ldap3==2.5.2
# via superdesk-core
limits==3.12.0
limits==3.13.0
# via flask-limiter
lxml==4.6.5
# via
Expand Down Expand Up @@ -239,7 +239,7 @@ ordered-set==4.1.0
# via deepdiff
oscrypto==1.3.0
# via pyhanko-certvalidator
packaging==24.0
packaging==24.1
# via
# gunicorn
# limits
Expand All @@ -248,7 +248,7 @@ pillow==9.2.0
# reportlab
# superdesk-core
# xhtml2pdf
prompt-toolkit==3.0.46
prompt-toolkit==3.0.47
# via click-repl
pyasn1==0.6.0
# via
Expand Down Expand Up @@ -347,7 +347,7 @@ rsa==4.9
# via
# google-auth
# oauth2client
s3transfer==0.10.1
s3transfer==0.10.2
# via boto3
sentry-sdk[flask]==1.9.0
# via newsroom-core
Expand Down Expand Up @@ -375,7 +375,7 @@ tinycss2==1.3.0
# via
# cssselect2
# svglib
typing-extensions==4.12.1
typing-extensions==4.12.2
# via
# jwcrypto
# limits
Expand Down

0 comments on commit fe1972d

Please sign in to comment.