Skip to content

Merge development to master#70

Open
samuelvisscher wants to merge 68 commits into
masterfrom
develop
Open

Merge development to master#70
samuelvisscher wants to merge 68 commits into
masterfrom
develop

Conversation

@samuelvisscher
Copy link
Copy Markdown
Contributor

@samuelvisscher samuelvisscher commented Mar 13, 2018

No description provided.

stdevGeekmidget and others added 30 commits January 10, 2018 12:44
@stdevGeekmidget
Tslint config and code fixes
70499cc
@stdevGeekmidget
update
175688f 
-package.json
-tslint.json
@samuelvisscher
Merge pull request #37 from simelo/ernestomr87_t33_Configure_tslint
603b1dd 
Implement tslint and fix any existing style errors, fixes #33
@stdevGeekmidget
Button Component Created
fdeb757
@stdevGeekmidget
Update branch
52aab47
@stdevGeekmidget
Header Component
31c8da2
@stdevGeekmidget
Update
d0f5482
@stdevGeekmidget
update
5254eea
@stdevGeekmidget
update
01dd058
@stdevGeekmidget
update
c7ca490
@stdevGeekmidget
Update
6eeb86f
@stdevGeekmidget
Update
d1eccad
@stdevGeekmidget
Update
9403105
@stdevGeekmidget
update
db90017
@stdevGeekmidget
update
78528cb
@stdevGeekmidget
Update Button Componet
312d02f
@stdevGeekmidget
On Boad Set/Confirm Pin
f549140 
Add Backspace feature
@stdevGeekmidget
add slides
9f8d141
@stdevGeekmidget
Add/Load Wallet Desing Finish
05041db
@stdevGeekmidget
Update
35e6743
@stdevGeekmidget
Update
07ac5f0
@stdevGeekmidget
update
e63b7a2
@samuelvisscher
Merge pull request #48 from simelo/ernestomr87_t29_On-boarding__Set_C…
55f6ac2 
…onfirm_Pin

Ernestomr87 On-boarding
@stdevGeekmidget
Update
760a02d
@stdevGeekmidget
update
e3234af
@stdevGeekmidget
Merge branch 'develop' of https://github.com/skycoin/skycoin-mobilewa…
3042efd 
…llet into ernestomr87_t43_Create_Header_Component

# Conflicts:
#	src/app/app.scss
#	src/pages/pincode/pincode.html
#	src/pages/pincode/pincode.ts
@stdevGeekmidget
Merge branch 'develop' of https://github.com/skycoin/skycoin-mobilewa…
91e2789 
…llet into ernestomr87_t43_Create_Header_Component

# Conflicts:
#	src/app/app.scss
#	src/pages/pincode/pincode.html
#	src/pages/pincode/pincode.ts
@stdevGeekmidget
fix format issues
1a8598e
@stdevGeekmidget
Merge branch 'develop' of https://github.com/skycoin/skycoin-mobilewa…
cea5528 
…llet into ernestomr87_t38_Create_Button_Component
@stdevGeekmidget
Add Skycoin, WorkSans Fonts
0f755b2
stdevGeekmidget and others added 29 commits January 23, 2018 10:09
@stdevGeekmidget
Fix format
c910d97
@samuelvisscher
Merge pull request #47 from simelo/ernestomr87_t43_Create_Header_Comp…
751bb12 
…onent

Ernestomr87 t43 create header component
@stdevGeekmidget
Fix pincode and Modal styles
5d41021
@stdevGeekmidget
Remove Slide add onboarding CreateWallet
942e638
@stdevGeekmidget
Add Wallet Create Page
f56a68a
@stdevGeekmidget
Wallet Styles Fix
902fb1e
@stdevGeekmidget
Format Fix _All_ App
bf34fb5
@stdevGeekmidget
Update
38acc01
@stdevGeekmidget
Update
66be0fe
@stdevGeekmidget
Transaction List
0caa1fa
@stdevGeekmidget
Update
4f4b576
@stdevGeekmidget
Transactions Details
ca99380
@stdevGeekmidget
Update
106ff87
@samuelvisscher
Merge pull request #50 from simelo/ernestomr87_Join_Components
ddfd13e 
Join components
@stdevGeekmidget
Fixed
95515b3
@stdevGeekmidget
Merge branch 'master' into ernestomr87_Transaction_Send_Screen
b1d4574 
# Conflicts:
#	src/app/app.scss
#	src/components/qr-code/qr-code.ts
#	src/pages/transactions/transactions.html
#	src/pages/transactions/transactions.scss
#	src/pages/transactions/transactions.ts
#	src/pages/wallet-detail/wallet-detail.ts
#	src/pipes/wallet-option/wallet-option.ts
@stdevGeekmidget
Update
f03f1f6
@stdevGeekmidget
Send SkyCoin Page
5aa5f4c
@stdevGeekmidget
Update
d32482a
@stdevGeekmidget
Fix Address create
2aa5294
@stdevGeekmidget
Fix it
ca198dc
@samuelvisscher
Merge pull request #53 from simelo/ernestomr87_Transaction_Send_Screen
e4fbfd3 
Transaction pages
@ernestomr87
Finish refs#62 and refs#63
85f1c09 
- refs#62 Fix Actions Buttons
- refs#63 Add Notification Component
@ernestomr87
Add Close Button to Notification
26a0c0d
@ernestomr87
-Add qr icon
21d0f30 
-Add ionic grid
@stdevGeekmidget
Add QrScanner
b566060
@stdevGeekmidget
Fix tslint issues
35ef730
@stdevGeekmidget
Fix Buttons styles
4485d8d
@samuelvisscher
Merge pull request #67 from simelo/Add_QR_scanner_for_send_screen
68959e1 
[send] fixes #64 - Add qr scanner for send screen
@CLAassistant
Copy link
Copy Markdown

CLAassistant commented Sep 28, 2019 •
edited
Loading

CLA assistant check
Thank you for your submission! We really appreciate it. Like many open source projects, we ask that you all sign our Contributor License Agreement before we can accept your contribution.
0 out of 3 committers have signed the CLA.

❌ stdevGeekmidget
❌ ernestomr87
❌ samuelvisscher
You have signed the CLA already but the status is still pending? Let us recheck it.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

No reviews

Assignees

No one assigned

Labels

None yet

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

4 participants

@samuelvisscher @CLAassistant @stdevGeekmidget @ernestomr87