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

Merge from develop to preprod #514

Merged
merged 52 commits into from
Apr 4, 2024
Merged

Merge from develop to preprod #514

merged 52 commits into from
Apr 4, 2024

Conversation

slavas490
Copy link
Contributor

Pull Request Details

The MR contains these updates:

  1. fix redirect for bookmarked links
  2. update i18n link to handbook
  3. fix e2e test cases

tafonina and others added 30 commits June 9, 2023 14:22
@tafonina
Merge pull request #12 from ProxeusApp/preprod
9bfb0ac 
reverse merge from preprod to s-pro dev
fix web3.fromAscii to web3.utils.asciiToHex method in document floe
9d3d6a2
@tafonina
Merge pull request #14 from sprotest/feature/fix-web3-method-fromAscii
029ab3e 
feature/fix-web3-method-fromAscii
replace web3 to this.wallet.proxeusFS.web3 as metamask no longer inje…
028563a 
…cts web3
@tafonina
Merge pull request #15 from sprotest/feature/fix-web3-method-fromAscii
b069463 
 feature/fix-web3-method-fromAscii
@tafonina
Merge pull request #16 from ProxeusApp/preprod
a5e9d02 
sync Preprod branch from main repo
@slavas490
remove outdated methods of old smart contract
26ef319
add public urls in case user doesnt have metamask
6b2c7fc
@slavas490
Merge pull request #18 from sprotest/feature/remove-old-smartcontract…
7bff03b 
…-methods

remove outdated methods of old smart contract
@tafonina
Merge branch 'develop' into feature/verify-doc
614e5a9
@tafonina
Merge pull request #19 from sprotest/feature/verify-doc
3710bb3 
feature/verify-doc
@slavas490
fix js frontend typos
18b6f1c
use public url only if user doesnt have metamask installed
29e1324
Merge branch 'feature/verify-doc' of github.com:sprotest/proxeus-core…
be08fea 
… into feature/verify-doc
use public url only if user doesnt have metamask installed
e164676
@tafonina
Merge branch 'develop' into feature/verify-doc
d700aa2
@tafonina
Merge pull request #20 from sprotest/feature/verify-doc
88dd2fd 
Feature/verify doc
@slavas490
add wrong metamask network selected issue handler
f3ecefe
@slavas490
fix user validation network screen
4a98f86
@slavas490
remove unnecessary html code from VerificationFileEntry component
1d8af13
fix invalid character, updates in BN lib
e11d139
fix invalid character, updates in BN lib
b8056f0
fix invalid character, updates in BN lib, revert to string and number…
e1ac271 
…s format
@tafonina
Merge pull request #21 from sprotest/feature/fix-invalid-charachter
11f7378 
fix invalid character, updates in BN lib
@slavas490
remove delete buttons for form inputs
458c0c1
@slavas490
remove skipValidateFor date entry
cc08ea4
@slavas490
Merge pull request #22 from sprotest/feature/delete_property
6065564 
Feature/delete property
@slavas490
fix frontend error message for file not found
0a4489f
@tafonina
Merge pull request #23 from sprotest/fix/file-validation
968c255 
fix frontend error message for file not found
@slavas490
update digitalocean deployment script
a2db174
tafonina and others added 17 commits November 23, 2023 13:44
@tafonina
Merge pull request #24 from sprotest/feature/droplet-support
c8fec16 
update digitalocean deployment script
@tafonina
Merge branch 'preprod' into develop
4fafb6f
@slavas490
fix document name max length at 80 symbols
ad9ed28
@slavas490
fix signup with metamask
e8dcae7
@slavas490
fix restore-demo.sh file
54631b7
@slavas490
WIP: initial commit
f9dac47
@slavas490
update baseApp.js
c2744dd
@slavas490
Merge pull request #25 from sprotest/feature/dynamic-config
9e8a9e1 
Feature/dynamic config
@slavas490
Revert "fix restore-demo.sh file"
45aac19 
This reverts commit 54631b7.
@slavas490
revert dynamic-config
d36bc1b
@slavas490
fix e2e test cases
02e2562
@slavas490
remove waitforproxeus Makefile commang
b7eaeca
@slavas490
Merge pull request #26 from sprotest/fix/e2e
d23f44b 
Fix/e2e
@slavas490
update i18n link to handbook
763c2ae
@slavas490
add redirect for bookmarked links
14dc9d2
@slavas490
fix redirect for bookmarked links
08e7325
@slavas490
fix redirect for bookmarked links
9da3df6
loleg
loleg requested changes Feb 29, 2024
View reviewed changes
demo/restore-demo.sh Outdated Show resolved Hide resolved
@loleg
Copy link
Contributor

loleg commented Feb 29, 2024

Getting this error in CI:

main/www/security.go
Format validation error.  Please run make fmt
make: *** [Makefile:120: validate] Error 1

loleg
loleg reviewed Feb 29, 2024
View reviewed changes
main/www/security.go Outdated Show resolved Hide resolved
@loleg loleg mentioned this pull request Mar 7, 2024
Closed
@loleg
Copy link
Contributor

loleg commented Mar 7, 2024

Test is failing due to redirect issue in UI test:


  1 failing

  1) User signup & login at http://localhost:1323
       User creation
         profile
           should remove account and logout when clicking again:

      Timed out retrying
      + expected - actual

      -'http://localhost:1323/login?redirect=%2Fadmin%2Fworkflow'
      +'http://localhost:1323/login'
      
      at Context.eval (http://localhost:1323/__cypress/tests?p=cypress/integration/1_user.js:993:18)

@loleg loleg merged commit 89d1936 into ProxeusApp:preprod Apr 4, 2024
0 of 2 checks passed
@loleg loleg mentioned this pull request Apr 4, 2024
Merged
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@loleg loleg loleg approved these changes

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

Successfully merging this pull request may close these issues.
3 participants
@slavas490 @loleg @tafonina