Skip to content

merge test #13

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

Closed
wants to merge 54 commits into from
Closed

merge test #13

wants to merge 54 commits into from

Conversation

ali-fs
Copy link
Owner

@ali-fs ali-fs commented Jul 4, 2021

hubert-deriv and others added 30 commits June 9, 2021 11:17
…ed in. (binary-com#6584)

* adding missing error message.

* changing message

* deactivated account page doesn't redirect anymore

Co-authored-by: Hubert Koster <hubertkoster@Huberts-MacBook-Pro.local>
Co-authored-by: mustofa-binary <mustofa-binary@binary.com>
* test test link

* update to deriv fe app id action

* docs: update readme

* fix: remove test from circleCI

Co-authored-by: mustofa-binary <mustofa-binary@binary.com>
* test

* test: config

* test again

* fix: alias space

Co-authored-by: mustofa-binary <mustofa-binary@binary.com>
Co-authored-by: Mohammadreza Ghorbani <reza@firstsource.email>
* fix: downgrade onfido version

* retrigger circle-ci

* reverted package lock

* fix: ammended comments from code review
* remove_cryptocurrency_market

* filter_markets_with_regex
…ounts are created (binary-com#6581)

* Fixed new account button hidden case when all demo accounts are created

* Fixed linter bug

* Fixed another bug

* Fixed another bug

* Removed extra disabled class

* empty commit
Co-authored-by: Mohammadreza Ghorbani <reza@firstsource.email>
* fix comment on PR

* fix artifact url

* Update .github/workflows/generate_app_id.yml

Co-authored-by: Mustofa Ghaleb Amami (Front End) <52783019+mustofa-binary@users.noreply.github.com>
* changed element to display none

* new virtual signuop flow for cr

* added svgs for welcome page

* added redirection if not cr client

* added and styled sub options

* git status

* added more styling to welcome page

* added redirection to mt5 for au users

* did review changes

* changing file namings as per comments

* increased assets font

* changed sub-options color to black
… logout (binary-com#6575)

* fix: login history for DP2P

* fix: add check for Dart VM
…#6571)

* changing message for isle of man when setting currency.

* changing text also in cashier message

* splitting up ternary to not conflict with new text.

* refactoring code

Co-authored-by: Hubert Koster <hubertkoster@Huberts-MacBook-Pro.local>
* changed element to display none

* read more signup

* modifying read more for real account

* added in profssional client
* changed element to display none

* replaced binary password reset text

* changing forgot password  text

* removing double fullstop

* reverting changes

* fixing text in /user/lost_passwordsws.html
* removing buggy code

* fixing form input alignment and fixing js styling code causing bugs.

* some fixes

* adding functionality to center text in select inputs

* fixing form, aligning everything left

* fixing also realws form

* styling on select fix

* centering text only on real account creation mobile

* removing text indent, breaking on safari

* refactoring code

Co-authored-by: Hubert Koster <hubertkoster@Huberts-MacBook-Pro.local>
* mt5-transfer-fee-bold

* comments_added

* comments_removed

Co-authored-by: Amina Ibrahim <aminaibrahim@Aminas-MacBook-Pro.local>
* changing button names from back to cancel.

* merging and solving conflicts

* fixing flickering loading screen after clicking cancel button.

* restarting circleci

* restarting circleci

Co-authored-by: Hubert Koster <hubertkoster@Huberts-MacBook-Pro.local>
Co-authored-by: Mohammadreza Ghorbani <reza@firstsource.email>
* Fix: missing translations in cashier

* Remove dot from multiple translations
Co-authored-by: Mohammadreza Ghorbani <reza@firstsource.email>
Switch to blue/green deployment as a default release strategy

Signed-off-by: Afshin Paydar <afshin.paydar@binary.com>
Co-authored-by: Mohammadreza Ghorbani <reza@firstsource.email>
…om#6476)

* changed virtual to demo only in the specified part

* changed virtual to demo in templates were it makes sense

* changed from demo-money to demo

* changed demo capitalisation

* Changed virtual to Demo in clien base config

* removed empty space3

* changed more from virtual to demo

* changed more text virtual-demo

* changed more virtual tp demo as per QA

* more changes done by copywriters

* change keep safe image

* fixed typo

* forced image rename
* changed element to display none

* center align text in profit and statement tables

* fixed over size of button under 480px

* removed unecessary edits
Co-authored-by: Hubert Koster <hubertkoster@Huberts-MacBook-Pro.local>
amina-deriv and others added 24 commits June 23, 2021 17:20
…to cashier page in one click. (binary-com#6595)

* docs: set project settings

* remove console.log

* fix: remove multi lines

* fix: add funds mt5 double click

* lint: remove eslint errors

* mend

* mend
…-com#6583)

* Added shortcode switch to add regulatory sentence

* Added break to switch case

* Reverted changes in package-lock

* Changed regulatory message

* updated branch

* Added the before sentence
* Added ids to onfido documents

* Changed variable name

* Shortened the code
…com#6612)

* adding function that hides multiple error messages.

* removing the added function and updating email regex

Co-authored-by: Hubert Koster <hubertkoster@Huberts-MacBook-Pro.local>
* added affiliate token to banner link

* added link with token

* fix href

* gettingn affiliate token from url params
* fixed internal limit error

* fixed internal limit error

* fixed eslint error

* fix: added internal transfer limit error on load

* trigger build

* fix: minor modification
* feat: add derivx to account closure

* chore: remove extra param

* chore: show derivx accounts in account closure error

* chore: remove unnecessary condition

* chore: remove unused imports

* fix: issues after resolving conflicts
Co-authored-by: Mohammadreza Ghorbani <reza@firstsource.email>
Co-authored-by: Mohammadreza Ghorbani <reza@firstsource.email>
…om#6634)

* Revert "Nikita/Add funds redirect button in MT5 manage funds not redirecting to cashier page in one click. (binary-com#6595)"

This reverts commit abe8601.

* fixed validation bug

* Fixed linter bug
…binary-com#6604)

* Change of social icon links in the footer -  UK and EU - Deriv & Binary

* indentation fix

* handle MX account users social icons
Co-authored-by: Hubert Koster <hubertkoster@Huberts-MacBook-Pro.local>
* fix_mlt_and_uk_market

* fix_conflicts

* use_gaming_company_shortcode_to_filter_markets
* Hide currency when no currency is set

* Refactor usage in the function itself

Co-authored-by: Mohammadreza Ghorbani <reza@firstsource.email>
@vercel
Copy link

vercel bot commented Jul 4, 2021

Deployment failed with the following error:

The most recent charge for your active payment method has failed. Please update it here: https://vercel.com/teams/ali-fs-test/settings/billing.

@ali-fs ali-fs closed this Jul 4, 2021
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.