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

Initialization buttons are not well aligned - Closes #1553 #1552 #1551 #1550 #1554

Merged
merged 17 commits into from
Dec 10, 2018
Merged

Initialization buttons are not well aligned - Closes #1553 #1552 #1551 #1550 #1554

Show file tree
Hide file tree
Changes from 15 commits
Commits
Show all changes
17 commits
Select commit Hold shift + click to select a range
ea8c6c0
upgrade cypress version
Dec 5, 2018
e03d215
:white_check_mark: migrate wallet integration tests
Dec 5, 2018
b3409c0
:white_check_mark: activity tests refactoring
Dec 5, 2018
473376c
Merge remote-tracking branch 'origin/1.8.0' into 1538-migrate-integra…
Dec 7, 2018
3b95783
:white_check_mark: request tests reimplementation
Dec 7, 2018
c29b552
:white_check_mark: unit test fix
Dec 7, 2018
712b12e
:recycle: Fix css files for correct buttons aligment between pages
Dec 7, 2018
be37bf5
Merge pull request #1541 from LiskHQ/1538-migrate-integration-wallet]
Dec 7, 2018
b750e2e
:nail_care: Update css files for send LSK to properly aligne buttons
Dec 9, 2018
809ebb2
:recycle: Fix css files for correct buttons aligment between pages
Dec 7, 2018
ba010ee
:nail_care: Update css files for send LSK to properly aligne buttons
Dec 9, 2018
1a68c34
:recycle: Fix merge conflicts
Dec 9, 2018
0f79185
:recycle: Fix merge conflicts
Dec 9, 2018
e76b7b7
:recycle: Update confirmation file as css class was missing
Dec 9, 2018
9b15073
:recycle: Update confirmation test file as css class was missing
Dec 9, 2018
edbf945
:nail_care: Update result box css file to avoid important use
Dec 10, 2018
3e919ab
:recycle: Update routes file private parameter was missing for reques…
Dec 10, 2018
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
5 changes: 0 additions & 5 deletions i18n/locales/en/common.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -252,7 +252,6 @@
"Rank": "Rank",
"Rank / Status": "Rank / Status",
"Read More": "Read More",
"Receiver": "Receiver",
"Recent searches": "Recent searches",
"Recipient": "Recipient",
"Redo": "Redo",
Expand All @@ -269,7 +268,6 @@
"Request": "Request",
"Request LSK": "Request LSK",
"Request specific amount": "Request specific amount",
"Request specific amount (LSK)": "Request specific amount (LSK)",
"Required": "Required",
"Reset": "Reset",
"Reset timer & continue": "Reset timer & continue",
Expand Down Expand Up @@ -316,7 +314,6 @@
"Sign back in": "Sign back in",
"Sign in": "Sign in",
"Sorry": "Sorry",
"Specify Amount": "Specify Amount",
"Standby": "Standby",
"Start here": "Start here",
"Start the tour": "Start the tour",
Expand Down Expand Up @@ -355,7 +352,6 @@
"Transaction is being processed and will be confirmed. It may take up to 15 minutes to be secured in the blockchain.": "Transaction is being processed and will be confirmed. It may take up to 15 minutes to be secured in the blockchain.",
"Transaction not found": "Transaction not found",
"Transactions can’t be reversed": "Transactions can’t be reversed",
"Transfer": "Transfer",
"Try Again": "Try Again",
"Try again": "Try again",
"Try using menu for navigation.": "Try using menu for navigation.",
Expand Down Expand Up @@ -422,7 +418,6 @@
"Your passphrase is used to access your Lisk ID.": "Your passphrase is used to access your Lisk ID.",
"Your registration is secured on the blockchain": "Your registration is secured on the blockchain",
"Your registration is secured on the blockchain.": "Your registration is secured on the blockchain.",
"Your request": "Your request",
"Your second passphrase registration is being processed and will be confirmed.": "Your second passphrase registration is being processed and will be confirmed.",
"Your selection": "Your selection",
"Your session was timed out after 10 minutes of no network activity. You may continue to use certain sections of your Lisk Hub or sign back in to access everything.": "Your session was timed out after 10 minutes of no network activity. You may continue to use certain sections of your Lisk Hub or sign back in to access everything.",
Expand Down
4 changes: 1 addition & 3 deletions jest.config.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,6 @@ module.exports = {
'src/components/newsFeed/index.test.js', // This component doesn't meet the setted tresholds for mocha but in jest
'src/components/passphraseCreation/index.test.js',
'src/components/register/register.test.js',
'src/components/request/specifyRequest.test.js',
'src/components/transactions/votedDelegates.test.js',
'src/components/voteUrlProcessor/index.test.js',
'src/store/middlewares/login.test.js',
Expand Down Expand Up @@ -60,9 +59,8 @@ module.exports = {
'src/components/passphraseCreation/index.js',
'src/components/passphraseSteps/index.js', // FollowUp #1515
'src/components/passphraseSteps/index.js', // FollowUp #1515
'src/components/receive/index.js',
'src/components/request/index.js',
'src/components/register/register.js',
'src/components/request/specifyRequest.js',
'src/components/resultBox/index.js',
'src/components/resultBox/resultBox.js', // FollowUp #1515
'src/components/resultBox/resultBox.js', // FollowUp #1515
Expand Down
85 changes: 39 additions & 46 deletions package-lock.json
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading