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

Deriv remodeling #178

Merged
merged 100 commits into from
Jul 3, 2019
Merged

Deriv remodeling #178

merged 100 commits into from
Jul 3, 2019

Conversation

msamprz
Copy link
Contributor

@msamprz msamprz commented Jun 27, 2019

No description provided.

msamprz and others added 30 commits June 7, 2019 10:25
+ Updated `react` and `react-dom`
+ Updated crowdin yaml config
+ Added initial `messages.json` string source file
+ Created function to replace `localize()`
+ Filtered out test file strings from translation scanner
+ Fixed RegExp in `scan-translations`
This reverts commit 1abc5e5.
# Conflicts:
#	src/javascript/app/App/Components/Elements/Calendar/calendar-footer.jsx
#	src/javascript/app/App/Components/Elements/ContractAudit/contract-audit.jsx
#	src/javascript/app/App/Components/Elements/ContractDrawer/contract-drawer.jsx
#	src/javascript/app/App/Components/Elements/Drawer/drawer-header.jsx
#	src/javascript/app/App/Components/Elements/Notifications/empty-notification.jsx
#	src/javascript/app/App/Components/Elements/PositionsDrawer/positions-drawer-card.jsx
#	src/javascript/app/App/Components/Elements/PositionsDrawer/positions-drawer.jsx
#	src/javascript/app/App/Components/Elements/PositionsDrawer/result-details.jsx
#	src/javascript/app/App/Components/Elements/PositionsDrawer/result-overlay.jsx
#	src/javascript/app/App/Components/Elements/SettingsDialog/settings-dialog.jsx
#	src/javascript/app/App/Constants/header-links.js
#	src/javascript/app/App/Containers/AccountSwitcher/account-switcher.jsx
#	src/javascript/app/Modules/Contract/Containers/contract-replay.jsx
#	src/javascript/app/Modules/Contract/Containers/contract.jsx
#	src/javascript/app/Modules/Portfolio/Components/empty-portfolio-message.jsx
#	src/javascript/app/Modules/Reports/Components/profit-loss-card-content.jsx
#	src/javascript/app/Modules/Statement/Components/empty-statement-message.jsx
#	src/javascript/app/Modules/Trading/Components/Form/TradeParams/barrier.jsx
#	src/javascript/app/Modules/Trading/Components/Form/TradeTypeInfo/trade-type-info-item.jsx
#	src/javascript/app/Stores/Helpers/client-notifications.js
#	src/javascript/app/Stores/Modules/Contract/Constants/ui.js
#	src/javascript/app/Stores/Modules/Trading/Helpers/active-symbols.js
@msamprz msamprz mentioned this pull request Jul 2, 2019
+ Fixed existing rules being broken
@negarn negarn merged commit d4d6350 into binary-com:dev Jul 3, 2019
jim-deriv pushed a commit to jim-deriv/deriv-app that referenced this pull request Jan 27, 2023
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.

7 participants