From a8cc3605b99adf989c442356f0bc00ae273f13a5 Mon Sep 17 00:00:00 2001 From: Aravind Date: Fri, 26 Jun 2020 06:58:01 +0530 Subject: [PATCH 1/2] tag release v1.3.0-beta.3 (#5207) --- install-manifests/azure-container-with-pg/azuredeploy.json | 2 +- install-manifests/azure-container/azuredeploy.json | 2 +- install-manifests/docker-compose-https/docker-compose.yaml | 2 +- install-manifests/docker-compose-pgadmin/docker-compose.yaml | 2 +- install-manifests/docker-compose-postgis/docker-compose.yaml | 2 +- install-manifests/docker-compose/docker-compose.yaml | 2 +- install-manifests/docker-run/docker-run.sh | 2 +- install-manifests/google-cloud-k8s-sql/deployment.yaml | 2 +- install-manifests/kubernetes/deployment.yaml | 2 +- scripts/cli-migrations/v1/Dockerfile | 2 +- scripts/cli-migrations/v2/Dockerfile | 2 +- server/src-rsr/catalog_versions.txt | 1 + 12 files changed, 12 insertions(+), 11 deletions(-) diff --git a/install-manifests/azure-container-with-pg/azuredeploy.json b/install-manifests/azure-container-with-pg/azuredeploy.json index e357d3a65b8..ea8f744b6e9 100644 --- a/install-manifests/azure-container-with-pg/azuredeploy.json +++ b/install-manifests/azure-container-with-pg/azuredeploy.json @@ -97,7 +97,7 @@ "firewallRuleName": "allow-all-azure-firewall-rule", "containerGroupName": "[concat(parameters('name'), '-container-group')]", "containerName": "hasura-graphql-engine", - "containerImage": "hasura/graphql-engine:v1.3.0-beta.2" + "containerImage": "hasura/graphql-engine:v1.3.0-beta.3" }, "resources": [ { diff --git a/install-manifests/azure-container/azuredeploy.json b/install-manifests/azure-container/azuredeploy.json index 18601f75842..e3e77d7d4e2 100644 --- a/install-manifests/azure-container/azuredeploy.json +++ b/install-manifests/azure-container/azuredeploy.json @@ -55,7 +55,7 @@ "dbName": "[parameters('postgresDatabaseName')]", "containerGroupName": "[concat(parameters('name'), '-container-group')]", "containerName": "hasura-graphql-engine", - "containerImage": "hasura/graphql-engine:v1.3.0-beta.2" + "containerImage": "hasura/graphql-engine:v1.3.0-beta.3" }, "resources": [ { diff --git a/install-manifests/docker-compose-https/docker-compose.yaml b/install-manifests/docker-compose-https/docker-compose.yaml index babac0b56c8..8422e338149 100644 --- a/install-manifests/docker-compose-https/docker-compose.yaml +++ b/install-manifests/docker-compose-https/docker-compose.yaml @@ -8,7 +8,7 @@ services: environment: POSTGRES_PASSWORD: postgrespassword graphql-engine: - image: hasura/graphql-engine:v1.3.0-beta.2 + image: hasura/graphql-engine:v1.3.0-beta.3 depends_on: - "postgres" restart: always diff --git a/install-manifests/docker-compose-pgadmin/docker-compose.yaml b/install-manifests/docker-compose-pgadmin/docker-compose.yaml index 824e1f2fddb..efeca0662d9 100644 --- a/install-manifests/docker-compose-pgadmin/docker-compose.yaml +++ b/install-manifests/docker-compose-pgadmin/docker-compose.yaml @@ -19,7 +19,7 @@ services: PGADMIN_DEFAULT_EMAIL: pgadmin@example.com PGADMIN_DEFAULT_PASSWORD: admin graphql-engine: - image: hasura/graphql-engine:v1.3.0-beta.2 + image: hasura/graphql-engine:v1.3.0-beta.3 ports: - "8080:8080" depends_on: diff --git a/install-manifests/docker-compose-postgis/docker-compose.yaml b/install-manifests/docker-compose-postgis/docker-compose.yaml index 4e8da81cd6b..30b81ba7a27 100644 --- a/install-manifests/docker-compose-postgis/docker-compose.yaml +++ b/install-manifests/docker-compose-postgis/docker-compose.yaml @@ -8,7 +8,7 @@ services: environment: POSTGRES_PASSWORD: postgrespassword graphql-engine: - image: hasura/graphql-engine:v1.3.0-beta.2 + image: hasura/graphql-engine:v1.3.0-beta.3 ports: - "8080:8080" depends_on: diff --git a/install-manifests/docker-compose/docker-compose.yaml b/install-manifests/docker-compose/docker-compose.yaml index 72c46fb06ca..c9450713110 100644 --- a/install-manifests/docker-compose/docker-compose.yaml +++ b/install-manifests/docker-compose/docker-compose.yaml @@ -8,7 +8,7 @@ services: environment: POSTGRES_PASSWORD: postgrespassword graphql-engine: - image: hasura/graphql-engine:v1.3.0-beta.2 + image: hasura/graphql-engine:v1.3.0-beta.3 ports: - "8080:8080" depends_on: diff --git a/install-manifests/docker-run/docker-run.sh b/install-manifests/docker-run/docker-run.sh index 231a2993f3a..de9792c031d 100755 --- a/install-manifests/docker-run/docker-run.sh +++ b/install-manifests/docker-run/docker-run.sh @@ -3,4 +3,4 @@ docker run -d -p 8080:8080 \ -e HASURA_GRAPHQL_DATABASE_URL=postgres://username:password@hostname:port/dbname \ -e HASURA_GRAPHQL_ENABLE_CONSOLE=true \ -e HASURA_GRAPHQL_DEV_MODE=true \ - hasura/graphql-engine:v1.3.0-beta.2 + hasura/graphql-engine:v1.3.0-beta.3 diff --git a/install-manifests/google-cloud-k8s-sql/deployment.yaml b/install-manifests/google-cloud-k8s-sql/deployment.yaml index 8837d6b4e0d..34203f5653f 100644 --- a/install-manifests/google-cloud-k8s-sql/deployment.yaml +++ b/install-manifests/google-cloud-k8s-sql/deployment.yaml @@ -16,7 +16,7 @@ spec: spec: containers: - name: graphql-engine - image: hasura/graphql-engine:v1.3.0-beta.2 + image: hasura/graphql-engine:v1.3.0-beta.3 ports: - containerPort: 8080 readinessProbe: diff --git a/install-manifests/kubernetes/deployment.yaml b/install-manifests/kubernetes/deployment.yaml index ae646005853..929bc1a9e04 100644 --- a/install-manifests/kubernetes/deployment.yaml +++ b/install-manifests/kubernetes/deployment.yaml @@ -18,7 +18,7 @@ spec: app: hasura spec: containers: - - image: hasura/graphql-engine:v1.3.0-beta.2 + - image: hasura/graphql-engine:v1.3.0-beta.3 imagePullPolicy: IfNotPresent name: hasura env: diff --git a/scripts/cli-migrations/v1/Dockerfile b/scripts/cli-migrations/v1/Dockerfile index 81d7f36f098..29092b8bce7 100644 --- a/scripts/cli-migrations/v1/Dockerfile +++ b/scripts/cli-migrations/v1/Dockerfile @@ -1,4 +1,4 @@ -FROM hasura/graphql-engine:v1.3.0-beta.2 +FROM hasura/graphql-engine:v1.3.0-beta.3 # set an env var to let the cli know that # it is running in server environment diff --git a/scripts/cli-migrations/v2/Dockerfile b/scripts/cli-migrations/v2/Dockerfile index a3a1c6d9879..ad592fc7528 100644 --- a/scripts/cli-migrations/v2/Dockerfile +++ b/scripts/cli-migrations/v2/Dockerfile @@ -2,7 +2,7 @@ FROM hasura/haskell-docker-packager:20190731 as packager WORKDIR /tmp RUN apt-get update && apt-get download libstdc++6 -FROM hasura/graphql-engine:v1.3.0-beta.2 +FROM hasura/graphql-engine:v1.3.0-beta.3 # install libstdc++6 from .deb file COPY --from=packager /tmp/libstdc++6* . diff --git a/server/src-rsr/catalog_versions.txt b/server/src-rsr/catalog_versions.txt index 41cfecf3e30..bc07024a38f 100644 --- a/server/src-rsr/catalog_versions.txt +++ b/server/src-rsr/catalog_versions.txt @@ -25,3 +25,4 @@ v1.2.1 34 v1.2.2 34 v1.3.0-beta.1 36 v1.3.0-beta.2 36 +v1.3.0-beta.3 36 From 6c689992ae16ca9195267904ac81d117886583bc Mon Sep 17 00:00:00 2001 From: surendran82 Date: Fri, 26 Jun 2020 13:59:41 +0530 Subject: [PATCH 2/2] docs: remove hasura con banner (#5213) --- docs/_static/hasura-custom.css | 126 +---------------------------- docs/_theme/djangodocs/layout.html | 26 ------ 2 files changed, 1 insertion(+), 151 deletions(-) diff --git a/docs/_static/hasura-custom.css b/docs/_static/hasura-custom.css index d3179c67f15..11f799cd261 100644 --- a/docs/_static/hasura-custom.css +++ b/docs/_static/hasura-custom.css @@ -214,94 +214,6 @@ p { #mce-responses .success-message { color: #1cd3c6 !important; } -.bannerStripWrapper { - background-color: #3D1BB7; - box-shadow: 0 1px 6px 0 rgba(0, 0, 0, 0.4); - position: relative; - min-height: 56px; - max-height: 56px; - display: flex; - align-items: center; -} -.bannerStripWrapper .bannerInnerWrapper { - padding: 0 15px; -} -.bannerStripWrapper .displayFlex -{ - display: flex; - align-items: center; - width: 100%; -} -.bannerStripWrapper .displayFlex a { - flex: 1; - text-decoration: none; -} -.bannerStripWrapper .bannerStripImg { - position: absolute; - right: 0; - top: 0; -} -.bannerStripWrapper .bannerStripImg img { - max-height: 56px; - opacity: .4; -} -.bannerStripWrapper .bannerStrip -{ - padding: 8px 0px; - display: flex; - align-items: center; - position: relative; - z-index: 10; -} -.bannerStripWrapper .bannerStrip .announceIcon { - display: inline-flex; -} -.bannerStripWrapper .bannerStrip .announceIcon img { - margin-top: 4px; - margin-right: 16px; - width: 32px; -} -.bannerStripWrapper .displayFlex a:hover, .bannerStripWrapper .displayFlex a:focus { - text-decoration: none; -} -.bannerStripWrapper .closeBanner { - cursor: pointer; - text-align: right; - display: flex; - align-items: center; - justify-content: center; - z-index: 11; - margin-left: auto; - width: 40px; - height: 40px; - border-radius: 50%; - background-color: rgba(61,27,183,.8); -} -.bannerStripWrapper .closeBanner img { - margin-right: 0; -} -.bannerStripWrapper .bannerStrip .bodyTextSmall -{ - font-family: Poppins; - text-align: left; - padding-top: 0; - letter-spacing: normal; - font-weight: 600; - display: inline-block; - line-height: 17px; - color: #fff; - padding-bottom: 0; - padding-right: 10px; -} -.bannerStripWrapper .bannerStrip .bodyTextSmall .fontNormal { - font-weight: 400; -} -.bannerStripWrapper .bannerStrip .bodyTextSmall .mLeft15 { - margin-left: 15px; -} -.bannerStripWrapper .bannerStrip .bodyTextSmall .underLine { - text-decoration: underline; -} .content_inner_wrapper { width: 75% !important; /* height: 100vh; */ @@ -1121,21 +1033,6 @@ article ol ol { } } @media (min-width: 768px) and (max-width: 1385px) { - .bannerStripWrapper { - /* padding-left: 4vw; */ - } - .bannerStripWrapper .bannerStrip .bodyTextSmall { - line-height: 21px; - } - .bannerStripWrapper .bannerStripImg { - display: none; - } - .bannerStripWrapper .bannerStrip .displayFlex { - justify-content: flex-start; - } - .bannerStripWrapper .closeBanner { - right: 0; - } #mc_embed_signup form { padding-top: 10px !important; } @@ -1152,27 +1049,6 @@ article ol ol { } /*** Mobile overrides ***/ @media (max-width: 767px) { - .bannerStripWrapper { - max-height: none; - padding: 0 0px; - } - .bannerStripWrapper .bannerStrip { - padding-left: 0px; - } - .bannerStripWrapper .bannerStrip .bodyTextSmall { - padding-left: 8px; - line-height: 120%; - font-size: 15px; - } - .bannerStripWrapper .bannerStripImg { - display: none; - } - .bannerStripWrapper .bannerStrip .bodyTextSmall { - padding-left: 0; - } - .bannerStripWrapper .bannerStrip .bodyTextSmall .mLeft15 { - margin-left: 5px; - } #sidebar { top: 170px; height: calc(100% - 170px); @@ -1626,4 +1502,4 @@ article ol ol { .tabbarContainerWrapper .tabbarTabActive span { color: rgba(255, 255, 255, 1) !important; border-bottom: 2px solid white !important; -} \ No newline at end of file +} diff --git a/docs/_theme/djangodocs/layout.html b/docs/_theme/djangodocs/layout.html index a08300602ce..6e472660324 100644 --- a/docs/_theme/djangodocs/layout.html +++ b/docs/_theme/djangodocs/layout.html @@ -29,32 +29,6 @@
{% include 'pages/loading.html' %} -