Commit Graph

217 Commits

Author SHA1 Message Date
David Marby
5f6f0edd39 Merge branch 'release/2022.3.0-beta.4' into develop 2022-04-21 19:50:06 +02:00
Dimitri Mitropoulos
213e1dd1c8
rename insomnia-app/app to insomnia/src (#4491) 2022-04-20 17:42:19 +00:00
David Marby
0d46d18847 Bump app version to 2022.3.0-beta.4 and lerna package versions 2022-04-20 15:19:38 +00:00
Jack Kavanagh
6e3e6ac102
remove packedDependencies and custom package script (#4704)
Co-authored-by: Dimitri Mitropoulos <dimitrimitropoulos@gmail.com>
Co-authored-by: David Marby <david@dmarby.se>
2022-04-20 13:49:07 +00:00
Dimitri Mitropoulos
305df5109b
removes duplicated "config.longName" (#4706) 2022-04-19 16:03:52 -04:00
dependabot[bot]
74fff0c973
Bump urijs from 1.19.10 to 1.19.11 in /packages/insomnia-inso (#4692)
Bumps [urijs](https://github.com/medialize/URI.js) from 1.19.10 to 1.19.11.
- [Release notes](https://github.com/medialize/URI.js/releases)
- [Changelog](https://github.com/medialize/URI.js/blob/gh-pages/CHANGELOG.md)
- [Commits](https://github.com/medialize/URI.js/compare/v1.19.10...v1.19.11)

---
updated-dependencies:
- dependency-name: urijs
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2022-04-19 17:35:24 +01:00
James Gatz
eb21506d40
️vite/esbuild (#4329)
* ️ vite

* replace webpack with esbuild in build script

* move build sr to esbuild

* esbuild send-request shim

* remove main externals

* fix lint

* remove webpack from insomnia-testing

* removes more webpack stuff

TODO after this PR: make debugging work again

* pin swagger-ui-react to version before esm change

* restore prepare script to build in bootstrap

* use default tsconfig for eslint and apply fixes

* bundle insomnia-components as cjs/esm

* makes ca_certs.ts pass linting

* builds types for insomnia-components

* improve build script for production

* skip typechecking insomnia-components

* separate package from build

* add electron to externals

* add preload bundling and fix build output

* exclude grpc/proto-loader from the bundle

* move node packages to commonjs

* don't bundle grpc since it's a node module

* fix content security error

* use vite lib mode for insomnia-components

* tidy up vite config and tsconfig options

* update package-locks

* use process.env. for static build time variables

* fix vscode debugging

Co-authored-by: jackkav <jackkav@gmail.com>
Co-authored-by: Dimitri Mitropoulos <dimitrimitropoulos@gmail.com>
2022-04-18 17:27:39 +02:00
Dimitri Mitropoulos
727c1f3366
chore: bracket lint rules (#4694) 2022-04-13 17:04:29 -04:00
Filipe Freire
03fdd2eb7d Bump app version to 2022.3.0-beta.3 and lerna package versions 2022-04-07 16:59:54 +00:00
Dimitri Mitropoulos
9700e7bde8
Remove flow (and webpack) from portal plugin, replace with TS and ESBuild (#4650) 2022-04-04 12:17:01 +00:00
Filipe Freire
273b26b0b4 Bump app version to 2022.3.0-beta.2 and lerna package versions 2022-03-31 14:28:34 +00:00
Filipe Freire
298f394e3b Bump app version to 2022.3.0-beta.1 and lerna package versions 2022-03-28 15:17:18 +00:00
Filipe Freire
eb9fa48e14
All dependabot PRS 2022 03 24 (#4636)
* Bump minimist from 1.2.5 to 1.2.6 in /packages/insomnia-config

Bumps [minimist](https://github.com/substack/minimist) from 1.2.5 to 1.2.6.
- [Release notes](https://github.com/substack/minimist/releases)
- [Commits](https://github.com/substack/minimist/compare/1.2.5...1.2.6)

---
updated-dependencies:
- dependency-name: minimist
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] <support@github.com>

* Bump minimist from 1.2.5 to 1.2.6 in /packages/insomnia-testing

Bumps [minimist](https://github.com/substack/minimist) from 1.2.5 to 1.2.6.
- [Release notes](https://github.com/substack/minimist/releases)
- [Commits](https://github.com/substack/minimist/compare/1.2.5...1.2.6)

---
updated-dependencies:
- dependency-name: minimist
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] <support@github.com>

* Bump minimist from 1.2.5 to 1.2.6 in /packages/insomnia-smoke-test

Bumps [minimist](https://github.com/substack/minimist) from 1.2.5 to 1.2.6.
- [Release notes](https://github.com/substack/minimist/releases)
- [Commits](https://github.com/substack/minimist/compare/1.2.5...1.2.6)

---
updated-dependencies:
- dependency-name: minimist
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] <support@github.com>

* Bump minimist from 1.2.5 to 1.2.6 in /packages/openapi-2-kong

Bumps [minimist](https://github.com/substack/minimist) from 1.2.5 to 1.2.6.
- [Release notes](https://github.com/substack/minimist/releases)
- [Commits](https://github.com/substack/minimist/compare/1.2.5...1.2.6)

---
updated-dependencies:
- dependency-name: minimist
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] <support@github.com>

* Bump minimist from 1.2.5 to 1.2.6 in /packages/insomnia-send-request

Bumps [minimist](https://github.com/substack/minimist) from 1.2.5 to 1.2.6.
- [Release notes](https://github.com/substack/minimist/releases)
- [Commits](https://github.com/substack/minimist/compare/1.2.5...1.2.6)

---
updated-dependencies:
- dependency-name: minimist
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] <support@github.com>

* Bump minimist from 1.2.5 to 1.2.6 in /packages/insomnia-inso

Bumps [minimist](https://github.com/substack/minimist) from 1.2.5 to 1.2.6.
- [Release notes](https://github.com/substack/minimist/releases)
- [Commits](https://github.com/substack/minimist/compare/1.2.5...1.2.6)

---
updated-dependencies:
- dependency-name: minimist
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] <support@github.com>

* (temp) run bootstrap

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2022-03-25 10:19:20 +00:00
David Marby
f96d151371 Bump app version to 2022.3.0-beta.0 and lerna package versions 2022-03-24 12:33:04 +00:00
Filipe Freire
a4369bea1e Merge branch 'release/2022.2.1' into develop 2022-03-23 09:53:07 +00:00
Dimitri Mitropoulos
58ab0c636d
chore(deps): reselect (#4620) 2022-03-22 15:21:32 -04:00
Filipe Freire
ef855863e2 Bump app version to 2022.2.1 and lerna package versions 2022-03-21 15:13:28 +00:00
CommanderRoot
600e0af1fd
Replace deprecated String.prototype.substr() (#4578)
Co-authored-by: Dimitri Mitropoulos <dimitrimitropoulos@gmail.com>
2022-03-17 16:48:05 +00:00
David Marby
ba785e6731 Merge branch 'release/2022.2.0' into develop 2022-03-17 17:09:19 +01:00
Dimitri Mitropoulos
28c1a66e9c
dependabot PRs as of 2022 03 16 (#4598)
* Bump lodash from 4.17.19 to 4.17.21 in /packages/insomnia-smoke-test

Bumps [lodash](https://github.com/lodash/lodash) from 4.17.19 to 4.17.21.
- [Release notes](https://github.com/lodash/lodash/releases)
- [Commits](https://github.com/lodash/lodash/compare/4.17.19...4.17.21)

---
updated-dependencies:
- dependency-name: lodash
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] <support@github.com>

* Bump urijs from 1.19.7 to 1.19.10 in /packages/insomnia-send-request

Bumps [urijs](https://github.com/medialize/URI.js) from 1.19.7 to 1.19.10.
- [Release notes](https://github.com/medialize/URI.js/releases)
- [Changelog](https://github.com/medialize/URI.js/blob/gh-pages/CHANGELOG.md)
- [Commits](https://github.com/medialize/URI.js/compare/v1.19.7...v1.19.10)

---
updated-dependencies:
- dependency-name: urijs
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] <support@github.com>

* Bump urijs from 1.19.6 to 1.19.10 in /packages/insomnia-inso

Bumps [urijs](https://github.com/medialize/URI.js) from 1.19.6 to 1.19.10.
- [Release notes](https://github.com/medialize/URI.js/releases)
- [Changelog](https://github.com/medialize/URI.js/blob/gh-pages/CHANGELOG.md)
- [Commits](https://github.com/medialize/URI.js/compare/v1.19.6...v1.19.10)

---
updated-dependencies:
- dependency-name: urijs
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] <support@github.com>

* runs bootstrap

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2022-03-16 14:05:14 +00:00
David Marby
1cd225a9f5 Bump app version to 2022.2.0 and lerna package versions 2022-03-15 11:18:53 +00:00
David Marby
d3b4322bf2
Fix lerna version bumps and don't run release recurring for release PRs (#4576) 2022-03-10 16:58:42 +01:00
Dimitri Mitropoulos
539f2b4c59
removes lodash types (#4571)
in https://github.com/Kong/insomnia/pull/4550 we removed lodash.  this PR is a follow-up to that that removes the (now, also unused) types.
2022-03-10 14:57:08 +01:00
David Marby
6f81d98125 Bump app version to 2022.2.0-alpha.0 and lerna package versions 2022-03-10 12:00:04 +00:00
Filipe Freire
1ebfb4dee2 version packages lib@2.6.0-beta.0 2022-03-09 17:17:03 +00:00
Filipe Freire
b3aa6b9cec
Easier Alpha/Beta/Stable releases (INS-1435) (#4516)
Co-authored-by: David Marby <david@dmarby.se>
2022-03-09 16:06:53 +01:00
David Marby
0d86e8e0e7 Merge branch 'release/2022.1.1' into develop 2022-03-09 15:12:25 +01:00
David Marby
53816f1eb9 version packages lib@2.5.2 2022-03-09 13:21:56 +01:00
Dimitri Mitropoulos
29479b8bcf
removes lodash (#4550) 2022-03-08 14:28:37 +00:00
Jack Kavanagh
1f05683fad
Chore/upgrade-electron-17 (#4529)
* bump node, electron, libcurl

* bump electron-builder

* stub performance, because inso imports react

* bump @types/node

* match up builder versions

* Disable consent prompts for oidc server

* bump electron and libcurl to latest

* waitForCookies for oauth tests

* Bump NodeJS to 16.13.0

* removes node 14 hack for BufferEncoding

* Replace oidc-provider html interaction pages with a simple html form

* make document cookie wait explicit

Co-authored-by: David Marby <david@dmarby.se>
2022-03-07 13:10:35 +00:00
Jack Kavanagh
8585eea9e6
electron v15 pre-upgrade refactoring (#4524)
* now with 100% fat free cancellation

Co-authored-by: James Gatz <jamesgatzos@gmail.com>

* unblock electron 15

* fix cookielist and temp fix curl types

* fix types

* fix inso

* default to verbose inso test

* implement readdata function

* fix test

* revert test changes

* isomorphic cancel

* reduce typing issues

* curl types

* turns out the tests were wrong

* handle errors

* remove unused inso mock

* remove request delay

* fix lint and add logs

* Revert "remove request delay"

This reverts commit f07d8c90a7a7279ca10f8a8de1ea0c82caa06390.

* simplify and add cancel fallback

* skip cancel test

* playwright is fast and insomnia is slow

* trailing spaces are serious yo

* cancel is flake town

* hmm

* unblock nunjucks and storeTimeline

* fix nunjucks tests

* preload writeFile

* oops forgot to remove the reload

* debugging CI takes all day, log stuff and pray

* also warn if nunjucks is being lame

* Stop using environment variables

* revert debugging logs

Co-authored-by: James Gatz <jamesgatzos@gmail.com>
Co-authored-by: David Marby <david@dmarby.se>
2022-03-03 13:42:04 +00:00
David Marby
6bd1173c7a Merge branch 'release/2022.1.0' into develop 2022-03-01 18:45:22 +01:00
David Marby
2b802ceb0d version packages lib@2.5.1 2022-03-01 18:21:42 +01:00
David Marby
2dd8ef20bb version packages lib@2.5.1-beta.2 2022-03-01 18:05:04 +01:00
David Marby
a9fc51fbe5 version packages lib@2.5.1-beta.1 2022-03-01 17:44:30 +01:00
David Marby
a19466fc97 version packages lib@2.5.1-beta.0 2022-03-01 17:15:38 +01:00
David Marby
66ea00edd8 version packages lib@2.5.0 2022-03-01 15:24:59 +01:00
Dimitri Mitropoulos
0b7a61fdee Merge branch 'release/2022.1.0-beta.0' into develop 2022-02-15 09:13:42 -05:00
Dimitri Mitropoulos
e621006db0
dependabot PRs as of 2022 02 14 (#4492) 2022-02-14 22:18:53 +00:00
Dimitri Mitropoulos
8490bad55c version packages lib@2.5.0-beta.1 2022-02-08 11:39:25 -05:00
Dimitri Mitropoulos
081fb995a6 version packages lib@2.5.0-beta.0 2022-02-08 11:37:36 -05:00
Dimitri Mitropoulos
04436fca56
updates redux dependencies (#4456) 2022-02-08 11:16:46 -05:00
Dimitri Mitropoulos
810e4320c9
all dependabot PRs as of 2022 02 04 (#4452) 2022-02-04 16:26:10 -05:00
Dimitri Mitropoulos
4940348dd9
removes insomnia designer migration code (#4404) 2022-01-25 11:14:24 -05:00
Jack Kavanagh
48ac330d95
chore: move GA events to segment (#4403)
* drop events

* move pageview to segment

* replace trackEvent with trackSegmentEvent

* remove categories and set ids

* remove duplicate events

* fxi tests

* fix lint

* fix inso

* use analytics setting and dont log boring stuff

* add context to page view
2022-01-25 14:50:46 +00:00
Jack Kavanagh
c858df990d
don't eat logs in verbose mode (#4368) 2022-01-18 18:33:29 +00:00
John Chadwick
914bcf30ed
Apple M1 support (#4140)
* Apple M1 support

* Fix appUrl calculation.

* adds guard for targetPlatform

Co-Authored-By: John Chadwick <john.chadwick@konghq.com>

Co-authored-by: Dimitri Mitropoulos <dimitrimitropoulos@gmail.com>
2022-01-12 16:31:33 -05:00
Dimitri Mitropoulos
67ebf2a193
All current dependabot PRs (#4360)
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2022-01-12 15:09:10 -05:00
Jack Kavanagh
21ab3dd081
Chore/upgrade-electron-12 (#4232)
Co-authored-by: Dimitri Mitropoulos <dimitrimitropoulos@gmail.com>
2021-12-21 13:03:36 -05:00
Jack Kavanagh
0abbefaf9e
fix watch regex and parse args (#4270) 2021-12-15 11:26:44 +00:00
Jack Kavanagh
b2dd09341c
cache lint (#4302) 2021-12-10 23:10:20 +00:00
Opender Singh
dc442174c0 version packages lib@2.4.1 2021-12-09 10:19:11 +13:00
Opender Singh
f1284ed469 version packages lib@2.4.1-beta.1 2021-12-07 07:11:47 +13:00
Falon Darville
2297fcb7d9
[DOCU-2032] Add Inso CLI development instructions (#4224)
Co-authored-by: Opender Singh <opender.singh@konghq.com>
2021-11-17 14:13:44 -08:00
Jack Kavanagh
df9617ed0b
feat: add format option to inso generate config (#4203)
* feat: add json arg to inso

* feedback
2021-11-16 12:49:49 +00:00
Opender Singh
c0aaa8f64f
use explicit filename with tar (#4202) 2021-11-11 09:44:58 +13:00
Opender Singh
24d2d4d76f
use tar -J instead of tar -j (#4192) 2021-11-10 06:53:53 +13:00
Jack Kavanagh
9de7c8c1d0
chore: minimal webpack noise (#4172) 2021-11-03 10:54:40 -04:00
Falon Darville
6c34d9088e
[DOCU-1970] rm duplicate doc content and add link to docs (#4169) 2021-11-02 13:46:32 -07:00
James Gatz
46db5beb97
inso: use --src for loading a git dir (#4162)
* Use --src as an override to workingDir for loading a git dir

* update test snapshots
2021-11-02 09:18:47 +01:00
James Gatz
9bfbd5c6a8
add vscode launch config for debugging inso (#4161)
* add vscode launch config for debugging inso

* remove undeclared task
2021-11-01 16:13:30 +01:00
Opender Singh
8918b15113 Merge branch 'release/2021.6' into develop 2021-10-28 10:48:51 +13:00
Opender Singh
e02e5d404f version packages lib@2.4.0 2021-10-28 09:47:44 +13:00
Opender Singh
b29a0f2602
improve wording (#4146) 2021-10-25 09:03:06 +00:00
Opender Singh
b7248025e7 version packages lib@2.4.0-alpha.1 2021-10-21 22:15:57 +13:00
Jack Kavanagh
e0ff79a2a6
Transform OAS -> Kong DC JSON rather than YAML (#4129)
* output JSON

* add test for declarative config

* feedback

Co-authored-by: gatzjames <jamesgatzos@gmail.com>
2021-10-20 14:21:19 +02:00
Opender Singh
9fb54ec187 version packages lib@2.3.3-alpha.4 2021-10-15 13:12:49 +13:00
Opender Singh
06b873eb27 version packages lib@2.3.3-alpha.3 2021-10-15 11:19:53 +13:00
Opender Singh
71f8393fba
Notarize raw binary (#4108) 2021-10-14 22:16:30 +00:00
Opender Singh
c3465204aa
Rename "compress" terminology to "artifacts" to be more representative (#4091) 2021-10-12 21:23:25 +00:00
Opender Singh
210db0dd01
Allow specifying a custom version for Inso (#4086) 2021-10-12 00:35:59 +00:00
Opender Singh
3b7b505c74
Inso binaries codesign & notarize on macOS (#4082) 2021-10-12 13:10:09 +13:00
Opender Singh
615287ccfc
Create single inso executable using pkg (#4049)
Co-authored-by: Dimitri Mitropoulos <dimitrimitropoulos@gmail.com>
2021-10-06 22:01:43 +00:00
Dimitri Mitropoulos
02c65a852d
implements sort order for projects (#3953)
Co-authored-by: Opender Singh <opender94@gmail.com>
2021-09-09 21:42:57 +00:00
Giuseppe B
e8551bd792
Insomnia v4 support for CLI (#3055)
* Initial draft for insomnia-adapter.js

* Added global options on cli types

* Added command description on cli

* Updating commands to support global flag

* First adapter implementation

* Fix object representation for send-request package

* Improved command description

* Fix test expected result

* Added db & adapter tests

* Improved flow on the InsomniaAdaptor

* Reverting to previous version

* Applying requested fixes

* Revised insomnia-adapter.js

* Applying requested changes

* Fixed new path for fixtures

* Introducing typescript support

* A few minor updates

* fixes from rebase

* update type mapping

* Use __dirname for fixture paths

* and tests for malformed data or unexpected version

* Update docs & use src with generate config cmd

* runs lint:fix

* minor error message copy adjustment

Co-authored-by: Opender Singh <opender.singh@konghq.com>
Co-authored-by: Dimitri Mitropoulos <dimitrimitropoulos@gmail.com>
2021-09-01 17:17:19 +00:00
Opender Singh
7ffc391428
add eslint rules for semi colons (#3989)
* add rules for semi colons

* run lint fix

* remove invalid eslint disable
2021-09-01 10:50:26 -04:00
Opender Singh
59827aad84 Merge branch 'release/2021.5.1' into develop 2021-08-31 09:52:45 +12:00
David Marby
d4048846aa version packages lib@2.3.2 2021-08-30 22:47:18 +02:00
Dimitri Mitropoulos
422d5a809c
adds markdown linting (#3931) 2021-08-27 15:44:01 +12:00
Opender Singh
376ac03703 version packages lib@2.3.1 2021-08-26 08:15:00 +12:00
Opender Singh
09e3e370a2 Merge branch 'release/2021.5.0' into develop 2021-08-25 13:06:30 +12:00
Dimitri Mitropoulos
2bf4370fd2
Inso -> Inso CLI (in docs) (#3936) 2021-08-23 20:21:19 -04:00
Opender Singh
4d0ec3f7b2 version packages lib@2.3.1-alpha.3 2021-08-23 12:55:10 +12:00
Dimitri Mitropoulos
f1808a4956
fixes outdated Insomnia Designer documentation references (#3927) 2021-08-20 17:50:41 +00:00
Opender Singh
1dd421e4f0 version packages lib@2.3.1-alpha.2 2021-08-16 12:59:26 +12:00
Dimitri Mitropoulos
407432aa02
adds eslint-config-helpers (#3912) 2021-08-12 18:01:54 -04:00
Opender Singh
0debbe9c9c version packages lib@2.3.1-alpha.1 2021-08-10 16:17:55 +12:00
Opender Singh
f48cef02bd
Update some ESLint rules (#3883) 2021-08-08 05:08:56 +00:00
Opender Singh
4dda066254
Update help text to disable cert validation (#3875)
* update help text

* fix snapshots
2021-08-05 10:39:26 +03:00
Opender Singh
706b0f076a
Disable cert validation option while running tests in inso (#3492) 2021-07-30 03:10:19 +00:00
Dimitri Mitropoulos
0178533e52
Feat/eslint import order (#3782) 2021-07-23 11:04:56 +12:00
John Chadwick
b07cd1cf16
Upgrade Electron to 11.2.3. (#3798)
* Upgrade Electron from 9.3.5 to 11.2.3.

* bump version

* update preid to alpha

* version packages lib@2.3.1-alpha.0

* Downgrade electron-builder to 22.11.3.

We tried to upgrade electron-builder to 22.11.7, but this fails
because electron-builder 22.11.4 introduces imports into fs/promises.
This module is only available in Node 14+, so we have to stick to
22.11.3 until we update to Electron 12.

* Revert npm script changes from alpha release.

Co-authored-by: Opender Singh <opender.singh@konghq.com>
2021-07-16 13:35:32 -07:00
Ross McDonald
c24d08ad66
Update Spectral to latest release (#3179) 2021-06-30 15:11:20 +00:00
Opender Singh
3998e8b489 Merge branch 'release/2021.4.0-stable' into develop 2021-06-30 11:03:39 +12:00
Opender Singh
c2c41f3d84 version packages lib@2.3.0 2021-06-29 21:44:26 +12:00
Opender Singh
af8e59b4ea version packages lib@2.3.0-beta.4 2021-06-23 15:54:20 +12:00
Opender Singh
d7b630f17b
Add formatting ESLint rules (#3425)
* add rules

* run lint:fix

* quick manual fix for lint errors

* indent fix

* add jsx prop multiline

Co-authored-by: Dimitri Mitropoulos <dimitrimitropoulos@gmail.com>
2021-05-27 14:00:32 -04:00
Josh Soref
9006babd38
fix spelling (#2976) 2021-05-25 12:16:43 -04:00
Dimitri Mitropoulos
5cd52b2bc9
Fix: o2k optional tags signatures (#3416)
* removes unnecessary plugin indirection

there is no reason to have functions that literally call other functions with the same argument.  well... maybe not _no_ reason, but the one valid reason I can think of (to satisfy an abstraction's constraints) is not met here.  This serves no documentational value either because it creates indirection rather than showing what it's really doing (which is, to generate a plugin).

* reworks generatePlugins and generatePlugin signatures

adds Entry, removes optional `tags`, curries

* use option parameter syntax for generateRequestValidatorPlugin

also, many errors were occurring for OA3Operation.responses not being passed over and over again, leading me to believe it's valid to do so.

* ensures `generateOperationPlugins` has tags, uses option parameter

* removes flowtype comments

* updates readme examples along with readme function signatures

parseSpec and generate were `async` but never awaited

Co-authored-by: Opender Singh <opender.singh@konghq.com>
2021-05-25 08:26:42 -04:00
Opender Singh
88ed96fc47 merge release branch with develop and resolve conflicts 2021-05-25 09:30:09 +12:00