Skip to content

Commit

Permalink
Conflict resolution (#1300)
Browse files Browse the repository at this point in the history
* v3.1.6 release 🚀 (#1265)

* fix(1205): Resource fetching performance improvement for OVH

* Update civo.mdx

update to test mintlify workflow

* fix: Resource fetching performance improvement for Scaleway (#1212)

Co-authored-by: Azanul Haque <[email protected]>

* [KOM-38]: Resource fetching performance improvement for CIVO, DigitalOcean, OCI, Linode, K8s, Tencent (#1215)

* making fetching resources parallelized for all providers

Signed-off-by: bishal7679 <[email protected]>

* updating fetching resources for civo and tencent

Signed-off-by: bishal7679 <[email protected]>

---------

Signed-off-by: bishal7679 <[email protected]>
Co-authored-by: Azanul Haque <[email protected]>

* fix: no OVH in docs (#1218)

Signed-off-by: Azanul <[email protected]>

* Update hello-to-new-contributors.yml

* [FEAT-1092]: Update color names and box-shadows to match Design-System (#1143)

* feat: update colors in tailwind config

* fix: update color class-names to match new palette

* fix: update primary & secondary color class-names to match new palette

* fix: update box-shadows to match design system

* fix: update tailwind config and class-names

* feat: add aws codebuild resource (#1216)

Co-authored-by: amal richwin <[email protected]>
Co-authored-by: Azanul Haque <[email protected]>

* feat: add aws codedeploy resource (#1228)

* Fix accidental loop capture (#1252)

* chore: remove dot import

Signed-off-by: Azanul <[email protected]>

* fix: capture of the loop variable

Signed-off-by: Azanul <[email protected]>

* chore: remove duplicate import

Signed-off-by: Azanul <[email protected]>

---------

Signed-off-by: Azanul <[email protected]>

* feat: add aws codecommit resource (#1229)

* feat: add aws codecommit resource

* chore: remove unused code

* chore: remove commented code

---------

Co-authored-by: amal richwin <[email protected]>

* Check for nil VpcId and SubnetId before use (#1254)

Fixes #1250

Co-authored-by: Azanul Haque <[email protected]>

* Migration Nextjs 13 to 14 (#1217)

* Migration Nextjs 13 to 14

* fix: next export

* add output export property

---------

Co-authored-by: Azanul Haque <[email protected]>

* Rebase to master (#1268)

* fix(1205): Resource fetching performance improvement for OVH

* Update civo.mdx

update to test mintlify workflow

* fix: Resource fetching performance improvement for Scaleway (#1212)

Co-authored-by: Azanul Haque <[email protected]>

* [KOM-38]: Resource fetching performance improvement for CIVO, DigitalOcean, OCI, Linode, K8s, Tencent (#1215)

* making fetching resources parallelized for all providers

Signed-off-by: bishal7679 <[email protected]>

* updating fetching resources for civo and tencent

Signed-off-by: bishal7679 <[email protected]>

---------

Signed-off-by: bishal7679 <[email protected]>
Co-authored-by: Azanul Haque <[email protected]>

* fix: no OVH in docs (#1218)

Signed-off-by: Azanul <[email protected]>

* Update hello-to-new-contributors.yml

* [FEAT-1092]: Update color names and box-shadows to match Design-System (#1143)

* feat: update colors in tailwind config

* fix: update color class-names to match new palette

* fix: update primary & secondary color class-names to match new palette

* fix: update box-shadows to match design system

* fix: update tailwind config and class-names

* feat: add aws codebuild resource (#1216)

Co-authored-by: amal richwin <[email protected]>
Co-authored-by: Azanul Haque <[email protected]>

* feat: add aws codedeploy resource (#1228)

* Fix accidental loop capture (#1252)

* chore: remove dot import

Signed-off-by: Azanul <[email protected]>

* fix: capture of the loop variable

Signed-off-by: Azanul <[email protected]>

* chore: remove duplicate import

Signed-off-by: Azanul <[email protected]>

---------

Signed-off-by: Azanul <[email protected]>

* feat: add aws codecommit resource (#1229)

* feat: add aws codecommit resource

* chore: remove unused code

* chore: remove commented code

---------

Co-authored-by: amal richwin <[email protected]>

* Check for nil VpcId and SubnetId before use (#1254)

Fixes #1250

Co-authored-by: Azanul Haque <[email protected]>

* Migration Nextjs 13 to 14 (#1217)

* Migration Nextjs 13 to 14

* fix: next export

* add output export property

---------

Co-authored-by: Azanul Haque <[email protected]>

---------

Signed-off-by: bishal7679 <[email protected]>
Signed-off-by: Azanul <[email protected]>
Co-authored-by: LABOUARDY Mohamed <[email protected]>
Co-authored-by: tanbirali <[email protected]>
Co-authored-by: Jake Page <[email protected]>
Co-authored-by: Tanbir Ali <[email protected]>
Co-authored-by: Bishal Das <[email protected]>
Co-authored-by: Avinesh Tripathi <[email protected]>
Co-authored-by: Umar Abid <[email protected]>
Co-authored-by: Richwin <[email protected]>
Co-authored-by: amal richwin <[email protected]>
Co-authored-by: Vanshul Bhatia <[email protected]>
Co-authored-by: Josh VanderLinden <[email protected]>
Co-authored-by: Shivam Sharma <[email protected]>

* fix: wrong slack guide url (#1264)

This commit fixes #1259

Signed-off-by: Shikhar Vashistha <[email protected]>

---------

Signed-off-by: bishal7679 <[email protected]>
Signed-off-by: Azanul <[email protected]>
Signed-off-by: Shikhar Vashistha <[email protected]>
Co-authored-by: tanbirali <[email protected]>
Co-authored-by: LABOUARDY Mohamed <[email protected]>
Co-authored-by: Jake Page <[email protected]>
Co-authored-by: Tanbir Ali <[email protected]>
Co-authored-by: Bishal Das <[email protected]>
Co-authored-by: Avinesh Tripathi <[email protected]>
Co-authored-by: Umar Abid <[email protected]>
Co-authored-by: Richwin <[email protected]>
Co-authored-by: amal richwin <[email protected]>
Co-authored-by: Vanshul Bhatia <[email protected]>
Co-authored-by: Josh VanderLinden <[email protected]>
Co-authored-by: Shivam Sharma <[email protected]>
Co-authored-by: Shikhar Vashistha <[email protected]>

* merge: rebase

Signed-off-by: Azanul <[email protected]>

* lint: unused

Signed-off-by: Azanul <[email protected]>

---------

Signed-off-by: bishal7679 <[email protected]>
Signed-off-by: Azanul <[email protected]>
Signed-off-by: Shikhar Vashistha <[email protected]>
Co-authored-by: tanbirali <[email protected]>
Co-authored-by: LABOUARDY Mohamed <[email protected]>
Co-authored-by: Jake Page <[email protected]>
Co-authored-by: Tanbir Ali <[email protected]>
Co-authored-by: Bishal Das <[email protected]>
Co-authored-by: Avinesh Tripathi <[email protected]>
Co-authored-by: Umar Abid <[email protected]>
Co-authored-by: Richwin <[email protected]>
Co-authored-by: amal richwin <[email protected]>
Co-authored-by: Vanshul Bhatia <[email protected]>
Co-authored-by: Josh VanderLinden <[email protected]>
Co-authored-by: Shivam Sharma <[email protected]>
Co-authored-by: Shikhar Vashistha <[email protected]>
  • Loading branch information
14 people committed Dec 28, 2023
1 parent f03588d commit 5456c06
Showing 0 changed files with 0 additions and 0 deletions.

0 comments on commit 5456c06

Please sign in to comment.