Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Preprod to main for v1.6.6 #602

Merged
merged 253 commits into from
Jul 24, 2024
Merged

Preprod to main for v1.6.6 #602

merged 253 commits into from
Jul 24, 2024

Conversation

loleg
Copy link
Contributor

@loleg loleg commented Jul 1, 2024 •
edited
Loading

In addition to a number of minor updates, we are dealing with an issue in the UI of the form editor.

tafonina and others added 30 commits December 16, 2022 18:27
@tafonina
test negative scenario
c82051f
@tafonina
return goerli cobfig
1f20476
@tafonina
remove console metamask error (#286)
3f3d883 
should fix #285
@tafonina
Merge branch 'develop' into preprod
c029847
@sprotest
Merge pull request #1 from ProxeusApp/preprod
eb2d4a0 
Preprod from Main github merge to develop fork
@sprotest
Update README.md
33f810e
add console logs on default accounts setup and on sign request
a890af1
@tafonina
Merge pull request #3 from sprotest/feature/test-autodeploy
42938d9 
PR test autodeploy flow
@tafonina @sprotest
Test autodeploy flow (#290)
3edb833 
* Update README.md

* add console logs on default accounts setup and on sign request

---------

Co-authored-by: s-pro <[email protected]>
@epadalkin
add more static js to Cache-Control
eb86793
@tafonina
Merge pull request #4 from epadalkin/feature/fix_load_preview
20e0707 
add more static js to Cache-Control
@tafonina
Merge pull request #5 from ProxeusApp/preprod
e84518f 
Test autodeploy flow (#290) reverse commit from preprod main repo
@tafonina @sprotest @epadalkin
Fix preview document bug (#295)
942a06b 
* add more static js to Cache-Control

fixes #292
[add more static js to Cache-Control]
---------

Co-authored-by: s-pro <[email protected]>
Co-authored-by: epadalkin <[email protected]>
@epadalkin
fix open prevuew
e5ad6bc
@tafonina
Merge pull request #6 from epadalkin/feature/fix_load_preview
1d5722f 
fix open preview
@sprotest
Update docker-compose-cloud.override.yml
8a26ab7
@tafonina
Merge pull request #7 from ProxeusApp/preprod
5fe455a 
Fix preview document bug (#295) reverse sync
@sprotest
Update docker-compose-cloud.override.yml
b4a3e86
@sprotest @tafonina @epadalkin
The Watchtower service will never be used (#296)
cbfc147 
* fix open prevuew

* Update docker-compose-cloud.override.yml

---------

Co-authored-by: Tatiana <[email protected]>
Co-authored-by: Afonina Tatiana <[email protected]>
Co-authored-by: epadalkin <[email protected]>
back merge master to preprod
2cd2ee7
@tafonina
Merge pull request #8 from ProxeusApp/preprod
7513ff3 
Preprod
add configuration for polygon and update addresses
17eca00
@tafonina
Merge pull request #9 from sprotest/feature/polygon
448e920 
add configuration for polygon and update addresses
update configs atrribute for polygon
045c662
@tafonina
Merge pull request #10 from sprotest/feature/polygon
82d3a82 
update configs atrribute for polygon
@tafonina @sprotest @epadalkin
Add polygon configs (#301)
5e6e35f 
* Update README.md

* add console logs on default accounts setup and on sign request

* add more static js to Cache-Control

* fix open prevuew

* Update docker-compose-cloud.override.yml

* Update docker-compose-cloud.override.yml

* add configuration for polygon and update addresses

* update configs atrribute for polygon

---------

Co-authored-by: s-pro <[email protected]>
Co-authored-by: epadalkin <[email protected]>
@loleg
Yarn update
454630d
@loleg
Deployment doc update
4471579
@loleg
Better enc key generation
8b61084
@loleg
Merge branch 'main' of https://github.com/ProxeusApp/proxeus-core
9112e52
dependabot bot and others added 18 commits June 7, 2024 15:12
@dependabot
Bump ajv from 8.13.0 to 8.14.0 in /ui (#579)
c6b9fe1 
Bumps [ajv](https://github.com/ajv-validator/ajv) from 8.13.0 to 8.14.0.
- [Release notes](https://github.com/ajv-validator/ajv/releases)
- [Commits](ajv-validator/ajv@v8.13.0...v8.14.0)

---
updated-dependencies:
- dependency-name: ajv
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <[email protected]>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
@dependabot
Bump core-js from 3.37.0 to 3.37.1 in /ui (#578)
2257cec 
Bumps [core-js](https://github.com/zloirock/core-js/tree/HEAD/packages/core-js) from 3.37.0 to 3.37.1.
- [Release notes](https://github.com/zloirock/core-js/releases)
- [Changelog](https://github.com/zloirock/core-js/blob/master/CHANGELOG.md)
- [Commits](https://github.com/zloirock/core-js/commits/v3.37.1/packages/core-js)

---
updated-dependencies:
- dependency-name: core-js
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <[email protected]>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
@slavas490
Merge from develop to preprod (#582)
cd6727f
@dependabot
Bump github.com/ethereum/go-ethereum from 1.14.3 to 1.14.5 (#587)
d0c6c18 
Bumps [github.com/ethereum/go-ethereum](https://github.com/ethereum/go-ethereum) from 1.14.3 to 1.14.5.
- [Release notes](https://github.com/ethereum/go-ethereum/releases)
- [Commits](ethereum/go-ethereum@v1.14.3...v1.14.5)

---
updated-dependencies:
- dependency-name: github.com/ethereum/go-ethereum
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <[email protected]>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
@dependabot
Bump eslint-plugin-vue from 9.25.0 to 9.26.0 in /ui (#584)
87355a7 
Bumps [eslint-plugin-vue](https://github.com/vuejs/eslint-plugin-vue) from 9.25.0 to 9.26.0.
- [Release notes](https://github.com/vuejs/eslint-plugin-vue/releases)
- [Commits](vuejs/eslint-plugin-vue@v9.25.0...v9.26.0)

---
updated-dependencies:
- dependency-name: eslint-plugin-vue
  dependency-type: direct:development
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <[email protected]>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
@dependabot
Bump golang.org/x/crypto from 0.23.0 to 0.24.0 (#586)
1bc2fcc 
Bumps [golang.org/x/crypto](https://github.com/golang/crypto) from 0.23.0 to 0.24.0.
- [Commits](golang/crypto@v0.23.0...v0.24.0)

---
updated-dependencies:
- dependency-name: golang.org/x/crypto
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <[email protected]>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
@dependabot
Bump axios from 1.6.8 to 1.7.2 in /ui (#583)
05cd23a 
Bumps [axios](https://github.com/axios/axios) from 1.6.8 to 1.7.2.
- [Release notes](https://github.com/axios/axios/releases)
- [Changelog](https://github.com/axios/axios/blob/v1.x/CHANGELOG.md)
- [Commits](axios/axios@v1.6.8...v1.7.2)

---
updated-dependencies:
- dependency-name: axios
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <[email protected]>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
@dependabot
Bump ajv from 8.14.0 to 8.16.0 in /ui (#591)
7c256af
@dependabot
Bump sass from 1.77.2 to 1.77.5 in /ui (#590)
3043519
@dependabot
Bump github.com/gorilla/sessions from 1.2.2 to 1.3.0 (#589)
a673aa9
@dependabot
Bump go.mongodb.org/mongo-driver from 1.15.0 to 1.15.1 (#588)
2fe1eac
@dependabot
Bump golang.org/x/net from 0.25.0 to 0.26.0 (#585)
4e5491a
@loleg
Merge branch 'preprod' of github.com:ProxeusApp/proxeus-core into pre…
f82b290 
…prod
@loleg
Merged
2730446
@dependabot
Bump sass from 1.77.5 to 1.77.6 in /ui (#597)
77a11aa 
Bumps [sass](https://github.com/sass/dart-sass) from 1.77.5 to 1.77.6.
- [Release notes](https://github.com/sass/dart-sass/releases)
- [Changelog](https://github.com/sass/dart-sass/blob/main/CHANGELOG.md)
- [Commits](sass/dart-sass@1.77.5...1.77.6)

---
updated-dependencies:
- dependency-name: sass
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <[email protected]>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
@dependabot
Bump go.mongodb.org/mongo-driver from 1.15.1 to 1.16.0 (#600)
5297ad9 
Bumps [go.mongodb.org/mongo-driver](https://github.com/mongodb/mongo-go-driver) from 1.15.1 to 1.16.0.
- [Release notes](https://github.com/mongodb/mongo-go-driver/releases)
- [Commits](mongodb/mongo-go-driver@v1.15.1...v1.16.0)

---
updated-dependencies:
- dependency-name: go.mongodb.org/mongo-driver
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <[email protected]>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
@loleg
Merge branch 'preprod' of github.com:ProxeusApp/proxeus-core into pre…
1de1290 
…prod
@loleg
Go update
5fb43f9 
- go 1.22
- bbolt 1.3.10
- regexp2 1.11.0
- x/image 0.18.0
- protobuf 1.34.2
- wmi 1.2.4
@loleg
Copy link
Contributor Author

loleg commented Jul 3, 2024

@slavas490 conflicts resolve. Please review & let me know if you can make progress on #595

dependabot bot added 4 commits July 8, 2024 17:38
@dependabot
Bump golang.org/x/crypto from 0.24.0 to 0.25.0 (#607)
e61168f 
Bumps [golang.org/x/crypto](https://github.com/golang/crypto) from 0.24.0 to 0.25.0.
- [Commits](golang/crypto@v0.24.0...v0.25.0)

---
updated-dependencies:
- dependency-name: golang.org/x/crypto
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <[email protected]>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
@dependabot
Bump github.com/ethereum/go-ethereum from 1.14.5 to 1.14.6 (#606)
8ef0c3e 
Bumps [github.com/ethereum/go-ethereum](https://github.com/ethereum/go-ethereum) from 1.14.5 to 1.14.6.
- [Release notes](https://github.com/ethereum/go-ethereum/releases)
- [Commits](ethereum/go-ethereum@v1.14.5...v1.14.6)

---
updated-dependencies:
- dependency-name: github.com/ethereum/go-ethereum
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <[email protected]>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
@dependabot
Bump golang.org/x/net from 0.26.0 to 0.27.0 (#605)
98772e8 
Bumps [golang.org/x/net](https://github.com/golang/net) from 0.26.0 to 0.27.0.
- [Commits](golang/net@v0.26.0...v0.27.0)

---
updated-dependencies:
- dependency-name: golang.org/x/net
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <[email protected]>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
@dependabot
Bump github.com/ethereum/go-ethereum from 1.14.6 to 1.14.7 (#609)
32b616f 
Bumps [github.com/ethereum/go-ethereum](https://github.com/ethereum/go-ethereum) from 1.14.6 to 1.14.7.
- [Release notes](https://github.com/ethereum/go-ethereum/releases)
- [Commits](ethereum/go-ethereum@v1.14.6...v1.14.7)

---
updated-dependencies:
- dependency-name: github.com/ethereum/go-ethereum
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <[email protected]>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
@loleg loleg requested a review from slavas490 July 19, 2024 13:06
@loleg loleg merged commit dccb432 into main Jul 24, 2024
11 checks passed
loleg added a commit that referenced this pull request Aug 7, 2024
@loleg
Update 072024 (#611)
2290a48 
* Updated go and js

* Preprod to main for v1.6.6 (#602)

Tested on dev and approved.

---------

Co-authored-by: Oleg Lavrovsky <[email protected]>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@slavas490 slavas490 Awaiting requested review from slavas490

Assignees

@slavas490 slavas490

Labels
None yet
Projects
Maintenance - Q1 2024
Status: Done
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
6 participants
@loleg @slavas490 @tafonina @sprotest @epadalkin @Ibrahim-Halil-Kuray