Merge branch 'master' of https://github.com/amplication/amplication

Spotrix · Feb 6, 2022 · 5308ac6 · 5308ac6
2 parents e33ce33 + 305e95c
commit 5308ac6
Show file tree

Hide file tree

Showing 15 changed files with 27 additions and 16 deletions.
diff --git a/.all-contributorsrc b/.all-contributorsrc
@@ -413,6 +413,16 @@
       "contributions": [
         "doc"
       ]
+    },
+    {
+      "login": "alexbass86",
+      "name": "Alex Bass",
+      "avatar_url": "https://avatars.githubusercontent.com/u/96179897?v=4",
+      "profile": "https://github.com/alexbass86",
+      "contributions": [
+        "design",
+        "bug"
+      ]
     }
   ],
   "contributorsPerLine": 7,

diff --git a/README.md b/README.md
@@ -26,7 +26,7 @@
 <div align="center">
 
 <!-- ALL-CONTRIBUTORS-BADGE:START - Do not remove or modify this section -->
-[![All Contributors](https://img.shields.io/badge/all_contributors-43-orange.svg?style=flat-square)](#contributors-)
+[![All Contributors](https://img.shields.io/badge/all_contributors-44-orange.svg?style=flat-square)](#contributors-)
 <!-- ALL-CONTRIBUTORS-BADGE:END -->
 
   </div>
@@ -194,6 +194,7 @@ Thanks goes to these wonderful people ([emoji key](https://allcontributors.org/d
   </tr>
   <tr>
     <td align="center"><a href="https://github.com/Rutam21"><img src="https://avatars.githubusercontent.com/u/47860497?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Rutam Prita Mishra</b></sub></a><br /><a href="https://github.com/amplication/amplication/commits?author=Rutam21" title="Documentation">📖</a></td>
+    <td align="center"><a href="https://github.com/alexbass86"><img src="https://avatars.githubusercontent.com/u/96179897?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Alex Bass</b></sub></a><br /><a href="#design-alexbass86" title="Design">🎨</a> <a href="https://github.com/amplication/amplication/issues?q=author%3Aalexbass86" title="Bug reports">🐛</a></td>
   </tr>
 </table>
 

diff --git a/lerna.json b/lerna.json
@@ -4,7 +4,7 @@
     "packages/amplication-data-service-generator/src/admin/static/",
     "packages/amplication-data-service-generator/src/server/static/"
   ],
-  "version": "0.11.1",
+  "version": "0.11.2",
   "command": {
     "bootstrap": {
       "ignore": [

diff --git a/packages/amplication-cli/package-lock.json b/packages/amplication-cli/package-lock.json
diff --git a/packages/amplication-cli/package.json b/packages/amplication-cli/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@amplication/cli",
   "description": "Amplication CLI",
-  "version": "0.11.1",
+  "version": "0.11.2",
   "repository": {
     "type": "git",
     "url": "https://github.com/amplication/amplication.git"

diff --git a/packages/amplication-client/package-lock.json b/packages/amplication-client/package-lock.json
diff --git a/packages/amplication-client/package.json b/packages/amplication-client/package.json
@@ -1,10 +1,10 @@
 {
   "name": "@amplication/client",
-  "version": "0.11.1",
+  "version": "0.11.2",
   "private": true,
   "dependencies": {
     "@amplication/data": "^0.11.1",
-    "@amplication/design-system": "^0.11.1",
+    "@amplication/design-system": "^0.11.2",
     "@apollo/client": "3.3.16",
     "@extra-set/difference": "2.2.3",
     "@rooks/use-window-size": "3.6.0",

diff --git a/packages/amplication-data-service-generator/package-lock.json b/packages/amplication-data-service-generator/package-lock.json
diff --git a/packages/amplication-data-service-generator/package.json b/packages/amplication-data-service-generator/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@amplication/data-service-generator",
-  "version": "0.11.1",
+  "version": "0.11.2",
   "private": true,
   "main": "./dist/index.js",
   "scripts": {

diff --git a/packages/amplication-data-service-generator/src/admin/static/package-lock.json b/packages/amplication-data-service-generator/src/admin/static/package-lock.json
diff --git a/packages/amplication-data-service-generator/src/admin/static/package.json b/packages/amplication-data-service-generator/src/admin/static/package.json
@@ -1,6 +1,6 @@
 {
   "name": "admin-template",
-  "version": "0.11.1",
+  "version": "0.11.2",
   "private": true,
   "dependencies": {
     "@apollo/client": "3.3.18",

diff --git a/packages/amplication-design-system/package-lock.json b/packages/amplication-design-system/package-lock.json
diff --git a/packages/amplication-design-system/package.json b/packages/amplication-design-system/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@amplication/design-system",
-  "version": "0.11.1",
+  "version": "0.11.2",
   "main": "dist/index.js",
   "scripts": {
     "check-format": "prettier --check .",

diff --git a/packages/amplication-server/package-lock.json b/packages/amplication-server/package-lock.json
diff --git a/packages/amplication-server/package.json b/packages/amplication-server/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@amplication/server",
-  "version": "0.11.1",
+  "version": "0.11.2",
   "private": true,
   "scripts": {
     "prebuild": "rimraf dist",
@@ -33,7 +33,7 @@
   "dependencies": {
     "@amplication/container-builder": "^0.11.1",
     "@amplication/data": "^0.11.1",
-    "@amplication/data-service-generator": "^0.11.1",
+    "@amplication/data-service-generator": "^0.11.2",
     "@amplication/deployer": "^0.11.1",
     "@apollo/gateway": "0.42.3",
     "@codebrew/nestjs-storage": "0.1.6",