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.

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

Preprod to main for release v1.6.7 #622

Merged
merged 261 commits into from
Aug 9, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
261 commits
Select commit Hold shift + click to select a range
3edb833
Test autodeploy flow (#290)
tafonina Feb 3, 2023
eb86793
add more static js to Cache-Control
epadalkin Feb 21, 2023
20e0707
Merge pull request #4 from epadalkin/feature/fix_load_preview
tafonina Feb 22, 2023
e84518f
Merge pull request #5 from ProxeusApp/preprod
tafonina Feb 22, 2023
942a06b
Fix preview document bug (#295)
tafonina Feb 22, 2023
e5ad6bc
fix open prevuew
epadalkin Feb 23, 2023
1d5722f
Merge pull request #6 from epadalkin/feature/fix_load_preview
tafonina Feb 23, 2023
8a26ab7
Update docker-compose-cloud.override.yml
sprotest Feb 24, 2023
5fe455a
Merge pull request #7 from ProxeusApp/preprod
tafonina Feb 24, 2023
b4a3e86
Update docker-compose-cloud.override.yml
sprotest Feb 24, 2023
cbfc147
The Watchtower service will never be used (#296)
sprotest Feb 24, 2023
2cd2ee7
back merge master to preprod
Mar 31, 2023
7513ff3
Merge pull request #8 from ProxeusApp/preprod
tafonina Mar 31, 2023
17eca00
add configuration for polygon and update addresses
Mar 31, 2023
448e920
Merge pull request #9 from sprotest/feature/polygon
tafonina Mar 31, 2023
045c662
update configs atrribute for polygon
Mar 31, 2023
82d3a82
Merge pull request #10 from sprotest/feature/polygon
tafonina Mar 31, 2023
5e6e35f
Add polygon configs (#301)
tafonina Apr 3, 2023
454630d
Yarn update
loleg Apr 5, 2023
4471579
Deployment doc update
loleg Apr 5, 2023
8b61084
Better enc key generation
loleg Apr 17, 2023
9112e52
Merge branch 'main' of https://github.com/ProxeusApp/proxeus-core
loleg Apr 17, 2023
1b405ea
Go 1.18 in CircleCI
loleg May 22, 2023
ea29cb3
Go 1.18
loleg May 22, 2023
dd814e1
Go update
loleg May 23, 2023
9cd9639
Go update
loleg May 23, 2023
5dcc6b8
Vue-cli pinned to 4.x
loleg May 23, 2023
1bc53f6
CircleCI builder
loleg May 23, 2023
6456ccb
Add go-bindata install
loleg May 23, 2023
f175b54
Add gopath to CircleCI
loleg May 24, 2023
dfd80a6
CircleCI config, go install
loleg May 25, 2023
318346e
Go update, go-ethereum Azimir
loleg May 25, 2023
f26ef03
Go 1.20
loleg May 25, 2023
3d8255f
make fmt
loleg May 25, 2023
5361e88
Go-bindata again
loleg May 25, 2023
e9ac427
README
loleg May 25, 2023
3d8141b
Image based test-ui
loleg May 25, 2023
c2bbde4
Sync nodejs ver in test-ui
loleg May 25, 2023
1fb7c0d
Add libxtst6 library for Cypress
loleg May 25, 2023
30ffe0d
Add full deps for Cypress
loleg May 25, 2023
bbed874
Quickstart docs
loleg Jun 8, 2023
6691fb5
Documentation changes, Yarn update (#303)
loleg Jun 8, 2023
0d6bccc
update support for sopelia network in the code and docs
Jun 9, 2023
0d70290
Merge pull request #11 from sprotest/feature/sepolia-support
tafonina Jun 9, 2023
a24335a
Merge branch 'develop' into preprod
tafonina Jun 9, 2023
c7d7858
Merge branch 'main' into preprod
tafonina Jun 9, 2023
f7ab5b0
update go mod
Jun 9, 2023
6547457
Light script for Docker
loleg Jun 13, 2023
07edf75
Network usage notes
loleg Jun 13, 2023
31d7c8a
Go modules updated
loleg Jun 13, 2023
6482176
Feature/fix web3 method from ascii (#312)
tafonina Jun 13, 2023
b183b2a
Update from ascii call in web3 (#313)
tafonina Jun 13, 2023
f83ddf7
Update CircleCI build config
loleg Jun 14, 2023
5d9ec48
Merge branch 'preprod' of github.com:proxeusapp/proxeus-core into pre…
loleg Jun 14, 2023
4ec79e7
Merged
loleg Jun 26, 2023
74abc91
Cleaned up CircleCI, added version release
loleg Jun 26, 2023
25bf7b0
Yarn upgrade
loleg Jul 3, 2023
efabceb
Go update #316
loleg Jul 3, 2023
52ccbcb
Merged
loleg Jul 3, 2023
82beac2
Go modules
loleg Jul 3, 2023
578f756
Removed demo and staging from workflow
loleg Jul 3, 2023
9df4364
yarn lock conflicts resolve
Jul 20, 2023
e83e04a
Merged branch 318
loleg Aug 11, 2023
f317ceb
Updated Go mods, downgrading x/exp due to go-ethereum/issues/27894
loleg Aug 11, 2023
baf7ada
Merged main
loleg Aug 11, 2023
f0b5a60
Merge branch 'main' into preprod
loleg Aug 11, 2023
7885682
Go fix, Yarn upgrade
loleg Aug 11, 2023
5ebcb29
Revert to Debian Slim in Dockerfile
loleg Aug 11, 2023
d740ae9
Update Go modules (#323)
loleg Aug 18, 2023
0a7f154
Merge branch 'preprod' of github.com:proxeusapp/proxeus-core into pre…
loleg Aug 18, 2023
36e4d81
Merge branch 'main' into preprod
tafonina Aug 18, 2023
65cffa5
Merged
loleg Aug 21, 2023
db0d76b
Create dependabot.yml (#324)
loleg Aug 23, 2023
5745a6b
Merge branch 'main' into preprod
loleg Aug 24, 2023
7714089
Merged preprod
loleg Aug 24, 2023
f470d53
Database command
loleg Aug 28, 2023
5d0f59b
Added Handbook
loleg Aug 31, 2023
40f2c5c
Contributing and about
loleg Aug 31, 2023
7d77520
Handbook
loleg Aug 31, 2023
b005d9f
Improve getting started for users (#340)
Ibrahim-Halil-Kuray Sep 5, 2023
6e1842a
Fixes from s-pro (#349)
slavas490 Sep 13, 2023
90898b7
Merged
loleg Sep 20, 2023
6989dcf
Package updates
loleg Sep 21, 2023
2622438
Refreshing the Docker Compose set up
loleg Sep 21, 2023
0e39f90
Update quickstart.md (#365)
Ibrahim-Halil-Kuray Sep 21, 2023
5357911
Merge branch 'preprod' of github.com:ProxeusApp/proxeus-core into pre…
loleg Sep 21, 2023
ec25faf
Merged
loleg Sep 21, 2023
378ceb9
Merge branch 'main' of github.com:ProxeusApp/proxeus-core
loleg Sep 21, 2023
585bcca
Merged
loleg Sep 21, 2023
ce56d35
Fixed lint errors
loleg Sep 21, 2023
e1c3b7e
Add extra to Makefile in tests
loleg Sep 21, 2023
f9b8b2e
Oops mis-copied HTML code in SignatureRequest
loleg Sep 21, 2023
f24883d
Move forex-rates to cnode.override, Docs wording
loleg Sep 21, 2023
559cdcb
Order of chapters in Handbook (#387)
loleg Oct 18, 2023
a347dbe
Bump sass from 1.68.0 to 1.69.4 in /ui (#390)
dependabot[bot] Oct 20, 2023
ed674dd
Bump eslint-plugin-standard from 4.1.0 to 5.0.0 in /ui (#391)
dependabot[bot] Oct 20, 2023
9351241
Bump async from 2.6.4 to 3.2.4 in /ui (#394)
dependabot[bot] Oct 20, 2023
b382555
Installation guide (#396)
loleg Oct 20, 2023
51dbfe8
Bump @vue/eslint-config-standard from 4.0.0 to 5.1.2 in /ui (#400)
dependabot[bot] Oct 26, 2023
571c94a
Bump tippy.js from 2.6.0 to 6.3.7 in /ui (#399)
dependabot[bot] Oct 26, 2023
7e3d3e8
Bump ethereumjs-util from 5.2.1 to 7.1.5 in /ui (#398)
dependabot[bot] Oct 26, 2023
3b472cf
Bump eslint-plugin-vue from 9.17.0 to 9.18.1 in /ui (#408)
dependabot[bot] Nov 1, 2023
abcf6f3
Bump sass from 1.69.4 to 1.69.5 in /ui (#407)
dependabot[bot] Nov 1, 2023
9a5c09e
Server-side Verification of documents (#412)
tafonina Nov 3, 2023
b8295ab
fix invalid character, updates in BN lib (#413)
tafonina Nov 6, 2023
c9556f0
Bump @cypress/webpack-preprocessor from 3.0.1 to 4.1.5 in /ui (#417)
dependabot[bot] Nov 6, 2023
0dafa99
Go library updates (#427)
loleg Nov 16, 2023
662ab77
Merge branch 'main' into preprod
loleg Nov 16, 2023
53a2efa
Bump async from 3.2.4 to 3.2.5 in /ui (#415)
dependabot[bot] Nov 18, 2023
bc3d14a
Bump vue-cropperjs from 3.0.0 to 4.2.0 in /ui (#416)
dependabot[bot] Nov 18, 2023
2902484
Merge branch 'main' of github.com:ProxeusApp/proxeus-core
loleg Nov 18, 2023
0661fcb
Bump core-js from 3.32.2 to 3.33.3 in /ui (#431)
dependabot[bot] Nov 20, 2023
642c68b
Bump vue-tour from 1.6.0 to 2.0.0 in /ui (#430)
dependabot[bot] Nov 20, 2023
db0587e
Droplet support updates (#434)
tafonina Dec 1, 2023
28e4d24
Bump eslint-plugin-import from 2.28.1 to 2.29.0 in /ui (#437)
dependabot[bot] Dec 12, 2023
90b4edc
Bump golang.org/x/net from 0.18.0 to 0.19.0 (#442)
dependabot[bot] Dec 12, 2023
7056d33
Bump go.mongodb.org/mongo-driver from 1.13.0 to 1.13.1 (#444)
dependabot[bot] Dec 12, 2023
3dfcbab
Bump interactjs from 1.2.9 to 1.10.26 in /ui (#445)
dependabot[bot] Dec 12, 2023
b0c8c44
Bump vue-multiselect from 2.1.7 to 2.1.8 in /ui (#448)
dependabot[bot] Dec 18, 2023
b07619c
Bump core-js from 3.33.3 to 3.34.0 in /ui (#446)
dependabot[bot] Dec 18, 2023
33b9a3c
Bump axios from 0.21.4 to 1.6.2 in /ui (#449)
dependabot[bot] Dec 18, 2023
dbff8b0
Bump js-sha3 from 0.7.0 to 0.9.3 in /ui (#447)
dependabot[bot] Dec 18, 2023
d30f3c7
Merge branch 'main' of github.com:ProxeusApp/proxeus-core
loleg Dec 21, 2023
b92df69
Merged with main
loleg Dec 21, 2023
b60549b
Bump to Go 1.21
loleg Dec 22, 2023
785bc90
Bump follow-redirects from 1.15.3 to 1.15.4 in /ui (#463)
dependabot[bot] Jan 11, 2024
908c0c2
Bump vue and vue-template-compiler in /ui (#461)
dependabot[bot] Jan 11, 2024
611717e
Bump eslint-plugin-vue from 9.18.1 to 9.19.2 in /ui (#460)
dependabot[bot] Jan 11, 2024
64057d2
Bump eslint-plugin-import from 2.29.0 to 2.29.1 in /ui (#456)
dependabot[bot] Jan 11, 2024
e96cd95
Bump sortablejs from 1.15.0 to 1.15.1 in /ui (#457)
dependabot[bot] Jan 11, 2024
dbd9aa1
Bump github.com/robertkrimen/otto from 0.2.1 to 0.3.0 (#455)
dependabot[bot] Jan 11, 2024
307b844
Bump github.com/ethereum/go-ethereum from 1.13.5 to 1.13.8 (#454)
dependabot[bot] Jan 11, 2024
37553fb
Bump github.com/labstack/gommon from 0.4.1 to 0.4.2 (#453)
dependabot[bot] Jan 11, 2024
222202c
Merge branch 'main' of github.com:ProxeusApp/proxeus-core
loleg Jan 11, 2024
fec36c0
Upgrade backend to echo v4 (#388)
loleg Jan 12, 2024
61cdb0a
Bump moment from 2.29.4 to 2.30.1 in /ui (#466)
dependabot[bot] Jan 22, 2024
4e99153
Bump golang.org/x/crypto from 0.17.0 to 0.18.0 (#469)
dependabot[bot] Jan 22, 2024
6760592
Bump github.com/ethereum/go-ethereum from 1.13.8 to 1.13.10 (#470)
dependabot[bot] Jan 22, 2024
e039cbe
Bump golang.org/x/net from 0.19.0 to 0.20.0 (#471)
dependabot[bot] Jan 22, 2024
8f36917
Bump core-js from 3.34.0 to 3.35.1 in /ui (#480)
dependabot[bot] Jan 22, 2024
b280607
Bump github.com/labstack/echo/v4 from 4.11.2 to 4.11.4 (#472)
dependabot[bot] Jan 22, 2024
8f80657
Bump sass from 1.69.5 to 1.70.0 in /ui (#478)
dependabot[bot] Jan 22, 2024
7234fa3
Bump github.com/onsi/gomega from 1.30.0 to 1.31.1 (#476)
dependabot[bot] Jan 22, 2024
838b54e
Merged with main
loleg Jan 22, 2024
fa1c8a3
Bump github.com/ethereum/go-ethereum from 1.13.10 to 1.13.11 (#485)
dependabot[bot] Jan 29, 2024
889fae2
Bump sortablejs from 1.15.1 to 1.15.2 in /ui (#483)
dependabot[bot] Jan 29, 2024
d59748d
Bump eslint-plugin-vue from 9.19.2 to 9.20.1 in /ui (#482)
dependabot[bot] Jan 29, 2024
eed09f5
Bump axios from 1.6.2 to 1.6.7 in /ui (#487)
dependabot[bot] Feb 8, 2024
5585ce5
Bump eslint-plugin-vue from 9.20.1 to 9.21.1 in /ui (#486)
dependabot[bot] Feb 8, 2024
696a397
Bump @mdi/font from 2.8.94 to 7.4.47 in /ui (#494)
dependabot[bot] Feb 15, 2024
0297cde
Bump golang.org/x/crypto from 0.18.0 to 0.19.0 (#490)
dependabot[bot] Feb 15, 2024
ee7d7c4
Bump github.com/ethereum/go-ethereum from 1.13.11 to 1.13.12 (#492)
dependabot[bot] Feb 15, 2024
bb272de
Bump golang.org/x/net from 0.20.0 to 0.21.0 (#491)
dependabot[bot] Feb 15, 2024
8c1f0c4
Bump core-js from 3.35.1 to 3.36.0 in /ui (#498)
dependabot[bot] Feb 21, 2024
adc3d20
Bump go.mongodb.org/mongo-driver from 1.13.1 to 1.14.0 (#500)
dependabot[bot] Feb 21, 2024
3d27dce
Merged
loleg Feb 22, 2024
32c858c
Bump vue-flatpickr-component from 7.0.6 to 11.0.4 in /ui (#507)
dependabot[bot] Feb 29, 2024
4bc7549
Bump eslint-plugin-vue from 9.21.1 to 9.22.0 in /ui (#506)
dependabot[bot] Feb 29, 2024
634d976
Bump sass from 1.70.0 to 1.71.1 in /ui (#504)
dependabot[bot] Feb 29, 2024
0b74496
Bump github.com/ethereum/go-ethereum from 1.13.12 to 1.13.13 (#503)
dependabot[bot] Feb 29, 2024
b6e6681
Update docs cover page (#511)
loleg Feb 29, 2024
cef545e
Bump vue-multiselect from 2.1.8 to 2.1.9 in /ui (#519)
dependabot[bot] Mar 7, 2024
0bf93ec
Bump github.com/stretchr/testify from 1.8.4 to 1.9.0 (#517)
dependabot[bot] Mar 7, 2024
ee999c8
Bump github.com/ethereum/go-ethereum from 1.13.13 to 1.13.14 (#516)
dependabot[bot] Mar 7, 2024
0662f47
Bump golang.org/x/crypto from 0.19.0 to 0.20.0 (#515)
dependabot[bot] Mar 7, 2024
822e62d
Merged
loleg Mar 7, 2024
5370457
Bump github.com/onsi/gomega from 1.31.1 to 1.32.0 (#529)
dependabot[bot] Mar 29, 2024
8c92cb0
Bump golang.org/x/crypto from 0.20.0 to 0.21.0 (#520)
dependabot[bot] Mar 29, 2024
a1fbcf6
Bump vue-flatpickr-component from 11.0.4 to 11.0.5 in /ui (#522)
dependabot[bot] Mar 29, 2024
d78f32d
Bump axios from 1.6.7 to 1.6.8 in /ui (#526)
dependabot[bot] Mar 29, 2024
5ab9c32
Bump eslint-plugin-vue from 9.22.0 to 9.23.0 in /ui (#527)
dependabot[bot] Mar 29, 2024
bb44cc1
Bump golang.org/x/net from 0.21.0 to 0.22.0 (#521)
dependabot[bot] Mar 29, 2024
3fbf595
Bump google.golang.org/protobuf from 1.31.0 to 1.33.0 (#524)
dependabot[bot] Mar 29, 2024
74a0422
Bump follow-redirects from 1.15.5 to 1.15.6 in /ui (#525)
dependabot[bot] Mar 29, 2024
660f2cd
Bump eslint-plugin-vue from 9.23.0 to 9.24.0 in /ui (#536)
dependabot[bot] Apr 4, 2024
6bdbbac
Bump interactjs from 1.10.26 to 1.10.27 in /ui (#533)
dependabot[bot] Apr 4, 2024
fd4ab21
Bump sass from 1.71.1 to 1.72.0 in /ui (#534)
dependabot[bot] Apr 4, 2024
8648dfc
Merged
loleg Apr 4, 2024
7fa3fc3
Feature/placeholder node (#531)
slavas490 Apr 4, 2024
89d1936
Merge from develop to preprod (#514)
slavas490 Apr 4, 2024
f2f3654
Bump github.com/labstack/echo-contrib from 0.15.0 to 0.16.0 (#528)
dependabot[bot] Apr 4, 2024
b0a8bdf
Go mod tidy
loleg Apr 4, 2024
a2f0a6c
Make fmt
loleg Apr 4, 2024
24b385f
Added redirect to login test
loleg Apr 6, 2024
205a2f6
Merge branch 'main' of github.com:ProxeusApp/proxeus-core
loleg Apr 6, 2024
634c2bd
Go version 1.22
loleg Apr 6, 2024
3841dc2
Echo test exit value
loleg Apr 6, 2024
31adb3c
Bump github.com/labstack/echo-contrib from 0.16.0 to 0.17.0 (#545)
dependabot[bot] Apr 18, 2024
1552402
Bump go.mongodb.org/mongo-driver from 1.14.0 to 1.15.0 (#544)
dependabot[bot] Apr 18, 2024
378c2bb
Bump sass from 1.72.0 to 1.75.0 in /ui (#543)
dependabot[bot] Apr 18, 2024
4177403
Bump golang.org/x/net from 0.22.0 to 0.24.0 (#542)
dependabot[bot] Apr 18, 2024
25c7f6f
Bump core-js from 3.36.0 to 3.36.1 in /ui (#540)
dependabot[bot] Apr 18, 2024
e21a424
Bump vue-select from 2.6.4 to 3.20.3 in /ui (#539)
dependabot[bot] Apr 18, 2024
baed775
Merge branch 'preprod' of github.com:ProxeusApp/proxeus-core into pre…
loleg Apr 18, 2024
c6f89a4
Go package updates
loleg Apr 18, 2024
d547b1c
Reverted baed77576c
loleg Apr 18, 2024
f869f1d
Merged with main
loleg Apr 18, 2024
42a6018
Bump vue-multiselect from 2.1.9 to 3.0.0 in /ui (#554)
dependabot[bot] Apr 25, 2024
269cd9e
Bump eslint-plugin-vue from 9.24.0 to 9.25.0 in /ui (#553)
dependabot[bot] Apr 25, 2024
0ad3e85
Bump github.com/onsi/gomega from 1.32.0 to 1.33.0 (#551)
dependabot[bot] Apr 25, 2024
b8495a0
Bump github.com/labstack/echo/v4 from 4.11.4 to 4.12.0 (#550)
dependabot[bot] Apr 25, 2024
72a80a1
Bump github.com/ethereum/go-ethereum from 1.13.14 to 1.13.15 (#548)
dependabot[bot] Apr 25, 2024
98d6998
Bump github.com/labstack/echo-contrib from 0.17.0 to 0.17.1 (#549)
dependabot[bot] Apr 25, 2024
34b0b14
Bump github.com/robertkrimen/otto from 0.3.0 to 0.4.0 (#547)
dependabot[bot] Apr 25, 2024
01f7327
Fix for issues/200 (#557)
slavas490 Apr 25, 2024
f0edc1c
Merge branch 'preprod' of github.com:ProxeusApp/proxeus-core into pre…
loleg Apr 25, 2024
07ea8aa
Merged with main
loleg Apr 26, 2024
c319235
Merge to preprod (#565)
slavas490 May 4, 2024
90f0ca2
Bump jquery-ui from 1.13.2 to 1.13.3 in /ui (#564)
dependabot[bot] May 4, 2024
2bf6492
Bump core-js from 3.36.1 to 3.37.0 in /ui (#563)
dependabot[bot] May 4, 2024
a32c2b9
Bump github.com/ethereum/go-ethereum from 1.13.15 to 1.14.0 (#562)
dependabot[bot] May 4, 2024
95366ba
Bump sass from 1.75.0 to 1.77.2 in /ui (#576)
dependabot[bot] May 21, 2024
0937ed4
Bump golang.org/x/crypto from 0.22.0 to 0.23.0 (#575)
dependabot[bot] May 21, 2024
2087d58
Bump ajv from 6.12.6 to 8.13.0 in /ui (#569)
dependabot[bot] May 21, 2024
043199a
Bump github.com/onsi/gomega from 1.33.0 to 1.33.1 (#567)
dependabot[bot] May 21, 2024
5353f22
Bump github.com/ethereum/go-ethereum from 1.14.0 to 1.14.3 (#574)
dependabot[bot] May 21, 2024
abcace1
Bump golang.org/x/net from 0.24.0 to 0.25.0 (#573)
dependabot[bot] May 21, 2024
c6b9fe1
Bump ajv from 8.13.0 to 8.14.0 in /ui (#579)
dependabot[bot] Jun 7, 2024
2257cec
Bump core-js from 3.37.0 to 3.37.1 in /ui (#578)
dependabot[bot] Jun 7, 2024
cd6727f
Merge from develop to preprod (#582)
slavas490 Jun 14, 2024
d0c6c18
Bump github.com/ethereum/go-ethereum from 1.14.3 to 1.14.5 (#587)
dependabot[bot] Jun 14, 2024
87355a7
Bump eslint-plugin-vue from 9.25.0 to 9.26.0 in /ui (#584)
dependabot[bot] Jun 14, 2024
1bc2fcc
Bump golang.org/x/crypto from 0.23.0 to 0.24.0 (#586)
dependabot[bot] Jun 14, 2024
05cd23a
Bump axios from 1.6.8 to 1.7.2 in /ui (#583)
dependabot[bot] Jun 14, 2024
7c256af
Bump ajv from 8.14.0 to 8.16.0 in /ui (#591)
dependabot[bot] Jun 21, 2024
3043519
Bump sass from 1.77.2 to 1.77.5 in /ui (#590)
dependabot[bot] Jun 21, 2024
a673aa9
Bump github.com/gorilla/sessions from 1.2.2 to 1.3.0 (#589)
dependabot[bot] Jun 21, 2024
2fe1eac
Bump go.mongodb.org/mongo-driver from 1.15.0 to 1.15.1 (#588)
dependabot[bot] Jun 21, 2024
4e5491a
Bump golang.org/x/net from 0.25.0 to 0.26.0 (#585)
dependabot[bot] Jun 21, 2024
f82b290
Merge branch 'preprod' of github.com:ProxeusApp/proxeus-core into pre…
loleg Jun 21, 2024
2730446
Merged
loleg Jun 21, 2024
77a11aa
Bump sass from 1.77.5 to 1.77.6 in /ui (#597)
dependabot[bot] Jun 28, 2024
5297ad9
Bump go.mongodb.org/mongo-driver from 1.15.1 to 1.16.0 (#600)
dependabot[bot] Jul 1, 2024
1de1290
Merge branch 'preprod' of github.com:ProxeusApp/proxeus-core into pre…
loleg Jul 1, 2024
5fb43f9
Go update
loleg Jul 1, 2024
7da0615
Merged with main
loleg Jul 3, 2024
5981469
Merge branch 'main' into preprod
loleg Jul 3, 2024
e61168f
Bump golang.org/x/crypto from 0.24.0 to 0.25.0 (#607)
dependabot[bot] Jul 8, 2024
8ef0c3e
Bump github.com/ethereum/go-ethereum from 1.14.5 to 1.14.6 (#606)
dependabot[bot] Jul 8, 2024
98772e8
Bump golang.org/x/net from 0.26.0 to 0.27.0 (#605)
dependabot[bot] Jul 19, 2024
32b616f
Bump github.com/ethereum/go-ethereum from 1.14.6 to 1.14.7 (#609)
dependabot[bot] Jul 19, 2024
ad04cb5
Merge branch 'preprod' of github.com:ProxeusApp/proxeus-core into pre…
loleg Jul 19, 2024
d577abb
Fix formbuilder drag&drop (#610)
slavas490 Jul 19, 2024
ba1b578
Merge branch 'preprod' of github.com:ProxeusApp/proxeus-core into pre…
loleg Jul 19, 2024
041ed81
Bump github.com/onsi/gomega from 1.33.1 to 1.34.1 (#619)
dependabot[bot] Aug 7, 2024
ad75a70
Bump sass from 1.77.6 to 1.77.8 in /ui (#615)
dependabot[bot] Aug 7, 2024
886161e
Bump underscore from 1.13.6 to 1.13.7 in /ui (#614)
dependabot[bot] Aug 7, 2024
2290a48
Update 072024 (#611)
loleg Aug 7, 2024
541d784
Merge branch 'preprod' of github.com:ProxeusApp/proxeus-core into pre…
loleg Aug 7, 2024
26ac59b
Merged with main
loleg Aug 7, 2024
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ require (
github.com/h2non/filetype v1.1.3
github.com/imkira/go-interpol v1.1.0 // indirect
github.com/labstack/gommon v0.4.2
github.com/onsi/gomega v1.33.1
github.com/onsi/gomega v1.34.1
github.com/patrickmn/go-cache v2.1.0+incompatible
github.com/pkg/errors v0.9.1
github.com/robertkrimen/otto v0.4.0
Expand Down Expand Up @@ -101,7 +101,7 @@ require (
github.com/yalp/jsonpath v0.0.0-20180802001716-5cc68e5049a0 // indirect
github.com/yudai/gojsondiff v1.0.0 // indirect
github.com/yudai/golcs v0.0.0-20170316035057-ecda9a501e82 // indirect
golang.org/x/exp v0.0.0-20240613232115-7f521ea00fb8 // indirect
golang.org/x/exp v0.0.0-20240719175910-8a7402abbf56 // indirect
golang.org/x/sync v0.7.0 // indirect
golang.org/x/sys v0.22.0 // indirect
golang.org/x/text v0.16.0 // indirect
Expand Down
16 changes: 8 additions & 8 deletions go.sum
Original file line number Diff line number Diff line change
Expand Up @@ -219,11 +219,11 @@ github.com/olekukonko/tablewriter v0.0.5/go.mod h1:hPp6KlRPjbx+hW8ykQs1w3UBbZlj6
github.com/onsi/ginkgo v1.6.0/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+WWjE=
github.com/onsi/ginkgo v1.10.1 h1:q/mM8GF/n0shIN8SaAZ0V+jnLPzen6WIVZdiwrRlMlo=
github.com/onsi/ginkgo v1.10.1/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+WWjE=
github.com/onsi/ginkgo/v2 v2.17.2 h1:7eMhcy3GimbsA3hEnVKdw/PQM9XN9krpKVXsZdph0/g=
github.com/onsi/ginkgo/v2 v2.17.2/go.mod h1:nP2DPOQoNsQmsVyv5rDA8JkXQoCs6goXIvr/PRJ1eCc=
github.com/onsi/ginkgo/v2 v2.19.0 h1:9Cnnf7UHo57Hy3k6/m5k3dRfGTMXGvxhHFvkDTCTpvA=
github.com/onsi/ginkgo/v2 v2.19.0/go.mod h1:rlwLi9PilAFJ8jCg9UE1QP6VBpd6/xj3SRC0d6TU0To=
github.com/onsi/gomega v1.7.0/go.mod h1:ex+gbHU/CVuBBDIJjb2X0qEXbFg53c61hWP/1CpauHY=
github.com/onsi/gomega v1.33.1 h1:dsYjIxxSR755MDmKVsaFQTE22ChNBcuuTWgkUDSubOk=
github.com/onsi/gomega v1.33.1/go.mod h1:U4R44UsT+9eLIaYRB2a5qajjtQYn0hauxvRm16AVYg0=
github.com/onsi/gomega v1.34.1 h1:EUMJIKUjM8sKjYbtxQI9A4z2o+rruxnzNvpknOXie6k=
github.com/onsi/gomega v1.34.1/go.mod h1:kU1QgUvBDLXBJq618Xvm2LUX6rSAfRaFRTcdOeDLwwY=
github.com/patrickmn/go-cache v2.1.0+incompatible h1:HRMgzkcYKYpi3C8ajMPV8OFXaaRUnok+kx1WdO15EQc=
github.com/patrickmn/go-cache v2.1.0+incompatible/go.mod h1:3Qf8kWWT7OJRJbdiICTKqZju1ZixQ/KpMGzzAfe6+WQ=
github.com/pkg/errors v0.8.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0=
Expand Down Expand Up @@ -335,8 +335,8 @@ golang.org/x/crypto v0.0.0-20210513164829-c07d793c2f9a/go.mod h1:P+XmwS30IXTQdn5
golang.org/x/crypto v0.0.0-20210921155107-089bfa567519/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc=
golang.org/x/crypto v0.25.0 h1:ypSNr+bnYL2YhwoMt2zPxHFmbAN1KZs/njMG3hxUp30=
golang.org/x/crypto v0.25.0/go.mod h1:T+wALwcMOSE0kXgUAnPAHqTLW+XHgcELELW8VaDgm/M=
golang.org/x/exp v0.0.0-20240613232115-7f521ea00fb8 h1:yixxcjnhBmY0nkL253HFVIm0JsFHwrHdT3Yh6szTnfY=
golang.org/x/exp v0.0.0-20240613232115-7f521ea00fb8/go.mod h1:jj3sYF3dwk5D+ghuXyeI3r5MFf+NT2An6/9dOA95KSI=
golang.org/x/exp v0.0.0-20240719175910-8a7402abbf56 h1:2dVuKD2vS7b0QIHQbpyTISPd0LeHDbnYEryqj5Q1ug8=
golang.org/x/exp v0.0.0-20240719175910-8a7402abbf56/go.mod h1:M4RDyNAINzryxdtnbRXRL/OHtkFuWGRjvuhBJpk2IlY=
golang.org/x/image v0.0.0-20191009234506-e7c1f5e7dbb8/go.mod h1:FeLwcggjj3mMvU+oOTbSwawSJRM1uh48EjtB4UJZlP0=
golang.org/x/image v0.18.0 h1:jGzIakQa/ZXI1I0Fxvaa9W7yP25TqT6cHIHn+6CqvSQ=
golang.org/x/image v0.18.0/go.mod h1:4yyo5vMFQjVjUcVk4jEQcU9MGy/rulF5WvUILseCM2E=
Expand Down Expand Up @@ -393,8 +393,8 @@ golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGm
golang.org/x/tools v0.0.0-20191119224855-298f0cb1881e/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo=
golang.org/x/tools v0.1.1/go.mod h1:o0xws9oXOQQZyjljx8fwUC0k7L1pTE6eaCbjGeHmOkk=
golang.org/x/tools v0.1.12/go.mod h1:hNGJHUnrk76NpqgfD5Aqm5Crs+Hm0VOH/i9J2+nxYbc=
golang.org/x/tools v0.22.0 h1:gqSGLZqv+AI9lIQzniJ0nZDRG5GBPsSi+DRNHWNz6yA=
golang.org/x/tools v0.22.0/go.mod h1:aCwcsjqvq7Yqt6TNyX7QMU2enbQ/Gt0bo6krSeEri+c=
golang.org/x/tools v0.23.0 h1:SGsXPZ+2l4JsgaCKkx+FQ9YZ5XEtA1GZYuoDjenLjvg=
golang.org/x/tools v0.23.0/go.mod h1:pnu6ufv6vQkll6szChhK3C3L/ruaIv5eBeztNG8wtsI=
golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
Expand Down
4 changes: 2 additions & 2 deletions ui/core/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -38,10 +38,10 @@
"js-sha3": "^0.9.3",
"moment": "^2.30.1",
"popper.js": "^1.14.4",
"sass": "^1.77.6",
"sass": "^1.77.8",
"sortablejs": "^1.15.2",
"tippy.js": "^6.3.7",
"underscore": "^1.8.3",
"underscore": "^1.13.7",
"v-tooltip": "^2.0.0-rc.33",
"velocity-animate": "^1.5.1",
"vis": "^4.21.0",
Expand Down
68 changes: 34 additions & 34 deletions ui/core/src/baseApp.js
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import WalletInterface from './libs/WalletAdapter'

export default {
data() {
data () {
return {
me: null,
meta: null,
Expand All @@ -16,7 +16,7 @@ export default {
}
},
methods: {
makeURL(uri) {
makeURL (uri) {
let origin = location.origin
if (/.*\/$/.test(origin)) {
origin = origin.substring(0, origin.length - 1)
Expand All @@ -26,7 +26,7 @@ export default {
}
return origin + uri
},
isLangAvailable(lang) {
isLangAvailable (lang) {
if (this.meta && this.meta.activeLangs) {
for (let i = 0; i < this.meta.activeLangs.length; i++) {
if (this.meta.activeLangs[i] &&
Expand All @@ -37,37 +37,37 @@ export default {
}
return false
},
userIsRoot() {
userIsRoot () {
if (this.me) {
return this.me.role === 100
}
return false
},
userIsSuperAdmin() {
userIsSuperAdmin () {
if (this.me) {
return this.me.role > 10
}
return false
},
userIsAdminOrHigher() {
userIsAdminOrHigher () {
if (this.me) {
return this.me.role >= 10
}
return false
},
userIsCreatorOrHigher() {
userIsCreatorOrHigher () {
if (this.me) {
return this.me.role >= 7
}
return false
},
userIsUserOrHigher() {
userIsUserOrHigher () {
if (this.me) {
return this.me.role >= 5
}
return false
},
amIWriteGrantedFor(item) {
amIWriteGrantedFor (item) {
try {
// check authority
if (this.me.role >= 100) {
Expand Down Expand Up @@ -110,7 +110,7 @@ export default {
} catch (e) {}
return false
},
handleError(o) {
handleError (o) {
if (this.isConToServerLostError(o)) {
// couldn't reach the server
if (!this.intervalID) {
Expand All @@ -119,15 +119,15 @@ export default {
}
}
},
isConToServerLostError(o) {
isConToServerLostError (o) {
let txt = ''
try {
txt = o.data || o.request.response || o.request.responseText
} catch (e) {}
return (o.request && !o.response) ||
(window.webpackHotUpdate && /^.*\(ECONNREFUSED\)\.$/m.test(txt))
},
pingService() {
pingService () {
console.log('pingService')
axios.get('/api/config').then((r) => {
if (r.data) {
Expand All @@ -142,10 +142,10 @@ export default {
this.handleError(err)
})
},
getSelectedLang() {
getSelectedLang () {
return this.$cookie.get('lang') || this.fallbackLang()
},
setSelectedLang(lang) {
setSelectedLang (lang) {
if (lang) {
this.$cookie.set('lang', lang, {
expires: '1Y'
Expand All @@ -156,10 +156,10 @@ export default {
this.$i18n.set(this.fallbackLang())
}
},
checkUserHasSession() {
checkUserHasSession () {
return !!localStorage.getItem('userhassession')
},
initUserHasSession(redirectTo) {
initUserHasSession (redirectTo) {
localStorage.setItem('userhassession', true)

const hasRequestedRedirect = new URLSearchParams(window.location.search).get('redirect')
Expand All @@ -170,13 +170,13 @@ export default {
window.location.href = redirectTo
}
},
deleteUserHasSession() {
deleteUserHasSession () {
localStorage.removeItem('userhassession')
},
redirectToLogin (backUrl) {
window.location.href = `/login?redirect=${backUrl}`
},
loadMe(clb) {
loadMe (clb) {
if (!this.checkUserHasSession()) {
return
}
Expand All @@ -196,7 +196,7 @@ export default {
this.handleError(err)
})
},
loadLastExportResults(clb, delParams) {
loadLastExportResults (clb, delParams) {
let url = '/api/export/results'
if (delParams) {
url += '?' + delParams
Expand All @@ -215,7 +215,7 @@ export default {
this.handleError(err)
})
},
loadLastImportResults(clb, delParams) {
loadLastImportResults (clb, delParams) {
let url = '/api/import/results'
if (delParams) {
url += '?' + delParams
Expand All @@ -234,7 +234,7 @@ export default {
this.handleError(err)
})
},
exportData(params, cb, url, name) {
exportData (params, cb, url, name) {
if (!url) {
url = '/api/export?include=' + params
} else {
Expand Down Expand Up @@ -289,7 +289,7 @@ export default {
})
})
},
importData(file, skipExisting, cb) {
importData (file, skipExisting, cb) {
if (!file) {
return
}
Expand Down Expand Up @@ -327,10 +327,10 @@ export default {
this.handleError(err)
})
},
async validateSessionCookie() {
async validateSessionCookie () {
return axios.get('/api/session/validate')
},
loadMeta(clb) {
loadMeta (clb) {
axios.get('/api/i18n/meta').then((response) => {
this.meta = response.data
if (this.meta && this.meta.langFallback) {
Expand All @@ -349,7 +349,7 @@ export default {
this.handleError(err)
})
},
updateLangLabel() {
updateLangLabel () {
if (this.meta && this.meta.activeLangs) {
for (let i = 0; i < this.meta.activeLangs.length; i++) {
this.meta.activeLangs[i].label = this.$t(
Expand All @@ -358,13 +358,13 @@ export default {
return this.meta.activeLangs
}
},
fallbackLang() {
fallbackLang () {
if (this.meta) {
return this.meta.langFallback
}
return null
},
getSelectedLangIndex() {
getSelectedLangIndex () {
if (this.meta && this.meta.activeLangs) {
for (let i = 0; i < this.meta.activeLangs.length; i++) {
if (this.meta.activeLangs[i].Code === this.getSelectedLang()) {
Expand All @@ -374,7 +374,7 @@ export default {
}
return null
},
reloadI18n() {
reloadI18n () {
axios.get('/api/i18n/all').then(
(response) => {
this.$i18n.add(this.getSelectedLang(), response.data)
Expand All @@ -385,7 +385,7 @@ export default {
this.handleError(err)
})
},
loadConfig() {
loadConfig () {
axios.get('/api/config').then(r => {
if (r.data) {
this.setConfig(r.data)
Expand All @@ -394,7 +394,7 @@ export default {
this.handleError(err)
})
},
async setConfig(d) {
async setConfig (d) {
if (d.blockchainNet) {
this.blockchainNet = d.blockchainNet
}
Expand All @@ -410,7 +410,7 @@ export default {
await this.wallet.validateUserNetwork(() => this.$root.$emit('service-off'), () => this.$root.$emit('service-on'))
}
},
acknowledgeFirstLogin() {
acknowledgeFirstLogin () {
// Show the following overlays starting now (they can be delayed)
localStorage.setItem('showFirstLoginMessageOn-documents', new Date())
if (this.userIsCreatorOrHigher()) {
Expand All @@ -420,13 +420,13 @@ export default {
},
computed: {
app: {
get() {
get () {
return this.$root.$children[0]
},
set(a) {}
set (a) {}
}
},
created() {
created () {
const tmpLangToPreventFromWarnings = 'en'
this.$i18n.fallback(tmpLangToPreventFromWarnings)
this.$i18n.set(tmpLangToPreventFromWarnings)
Expand Down
4 changes: 2 additions & 2 deletions ui/wallet/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -29,12 +29,12 @@
"js-sha3": "^0.9.3",
"moment": "^2.30.1",
"popper.js": "^1.14.4",
"sass": "^1.77.6",
"sass": "^1.77.8",
"sortablejs": "^1.15.2",
"tippy.js": "^6.3.7",
"truffle-assertions": "^0.9.1",
"typeahead": "^0.2.2",
"underscore": "^1.8.3",
"underscore": "^1.13.7",
"v-money": "^0.8.1",
"v-tooltip": "^2.0.0-rc.33",
"velocity-animate": "^1.5.1",
Expand Down
16 changes: 8 additions & 8 deletions ui/yarn.lock
Original file line number Diff line number Diff line change
Expand Up @@ -10313,10 +10313,10 @@ sass-loader@^10.1.1:
schema-utils "^3.0.0"
semver "^7.3.2"

sass@^1.77.6:
version "1.77.6"
resolved "https://registry.yarnpkg.com/sass/-/sass-1.77.6.tgz#898845c1348078c2e6d1b64f9ee06b3f8bd489e4"
integrity sha512-ByXE1oLD79GVq9Ht1PeHWCPMPB8XHpBuz1r85oByKHjZY6qV6rWnQovQzXJXuQ/XyE1Oj3iPk3lo28uzaRA2/Q==
sass@^1.77.8:
version "1.77.8"
resolved "https://registry.yarnpkg.com/sass/-/sass-1.77.8.tgz#9f18b449ea401759ef7ec1752a16373e296b52bd"
integrity sha512-4UHg6prsrycW20fqLGPShtEvo/WyHRVRHwOP4DzkUrObWoWI05QBSfzU71TVB7PFaL104TwNaHpjlWXAZbQiNQ==
dependencies:
chokidar ">=3.0.0 <4.0.0"
immutable "^4.0.0"
Expand Down Expand Up @@ -11504,10 +11504,10 @@ unbox-primitive@^1.0.2:
has-symbols "^1.0.3"
which-boxed-primitive "^1.0.2"

underscore@^1.8.3:
version "1.13.6"
resolved "https://registry.yarnpkg.com/underscore/-/underscore-1.13.6.tgz#04786a1f589dc6c09f761fc5f45b89e935136441"
integrity sha512-+A5Sja4HP1M08MaXya7p5LvjuM7K6q/2EaC0+iovj/wOcMsTzMvDFbasi/oSapiwOlt252IqsKqPjCl7huKS0A==
underscore@^1.13.7:
version "1.13.7"
resolved "https://registry.yarnpkg.com/underscore/-/underscore-1.13.7.tgz#970e33963af9a7dda228f17ebe8399e5fbe63a10"
integrity sha512-GMXzWtsc57XAtguZgaQViUOzs0KTkk8ojr3/xAxXLITqf/3EMwxC0inyETfDFjH/Krbhuep0HNbbjI9i/q3F3g==

unicode-canonical-property-names-ecmascript@^2.0.0:
version "2.0.0"
Expand Down