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 into master branch #364

Open
wants to merge 60 commits into
base: master
Choose a base branch
from
Open

Merge into master branch #364

wants to merge 60 commits into from

Conversation

iketheadore
Copy link
Member

Changes:

  • Merge from develop branch

Does this change need to mentioned in CHANGELOG.md?
No.

Senyoret1 and others added 30 commits July 10, 2019 19:40
@Senyoret1
Multiple improvements
ec30de9
@Senyoret1
Small fix for the search bar
ef490c3
@gz-c
Update README.md
357ef07
@Senyoret1
Use the singular form of the coin hours name when appropriate
46a1003
@gz-c
Merge branch 'develop' into improvements
9f7f402
@gz-c
Merge pull request skycoin#305 from Senyoret1/improvements
4388d8a 
Multiple improvements
@Senyoret1
Solve the travis build problem
e192bee
@Senyoret1
Improve the code that calculates pending coins and hours
ebfb42a
@Senyoret1
Improve the code and add comments
338434d
@Senyoret1
Fix small code error
d7fa4e3
@Senyoret1
Improve the code and add comments p2
46fa6ca
@Senyoret1
Remove unused assets
2a61abf
@Senyoret1
Improve AmountPipe
f7721c9
@Senyoret1
Improve the documentation
9df0742
@Senyoret1
Improvements for the scss classes
c2b73e6
@Senyoret1
Update to Angular 8
95ec9ae
@Senyoret1
Updaste the Spanish translation
8a8aee4
@Senyoret1
Update the Node.js version used by Travis
3e1058e
@Senyoret1
Update the docs for Angular 8
5fc9037
@gz-c
Merge pull request skycoin#307 from Senyoret1/improvements-2
bce7925 
Improvements and fixes
@iketheadore
Rename to skycoin.com
a19370b
@iketheadore
Remove merch.skycoin.com
0160204
@iketheadore
Update protractor to fix the incompatible webdriver and chrome
7b629a6
@iketheadore
Use chrome: stable
11e26a4
@iketheadore
Merge pull request skycoin#7 from iketheadore/fix/remove-merch
41dc6e0 
Remove merch.skycoin.com from store
@dependabot
Bump js-yaml from 3.12.0 to 3.13.1
adcc0da 
Bumps [js-yaml](https://github.com/nodeca/js-yaml) from 3.12.0 to 3.13.1.
- [Release notes](https://github.com/nodeca/js-yaml/releases)
- [Changelog](https://github.com/nodeca/js-yaml/blob/master/CHANGELOG.md)
- [Commits](nodeca/js-yaml@3.12.0...3.13.1)

Signed-off-by: dependabot[bot] <support@github.com>
@iketheadore
Merge pull request skycoin#10 from SkycoinProject/dependabot/npm_and_…
2d4d268 
…yarn/js-yaml-3.13.1

Bump js-yaml from 3.12.0 to 3.13.1
@Senyoret1
Use /api/v2/transactions to get transactions for addresses
3da741f
@iketheadore
Remove hook for docker building
0bf3e6a 
Update docker README
@iketheadore
Merge pull request skycoin#12 from iketheadore/fix/remove-docker-hook
cee9ac1 
Remove hook for docker building
iketheadore and others added 28 commits February 26, 2020 01:36
@iketheadore
Merge pull request skycoin#11 from Senyoret1/pagination
13f39df 
Use /api/v2/transactions to get transactions for addresses
@iketheadore
Format explorer.go to fix lint error
29522f9
@iketheadore
Add pull requet template
08a9773
@iketheadore
Merge pull request skycoin#14 from iketheadore/fix/go-format
8509420 
Format explorer.go to fix lint error
@Senyoret1
Update to Angular 9
a7d59ab
@Senyoret1
Improve how the current balance is displayed
f6e20f6
@Senyoret1
Fix the e2e tests and a small bug
71785c8
@Senyoret1
Update to Angular 10
c9c65f4
@Senyoret1
Improvements for the explorer
cecd28c
@Senyoret1
Fix e2e tests
24cfa19
@Senyoret1
Update Snyk
b7ce592
@Senyoret1
Remove unused test files
61206c7
@Senyoret1
Improvements for using a local node directly
aba0f07
@Senyoret1
Add node-sass as dependency
dd2bb91
@Senyoret1
Update to Angular 11
e9120a1
@iketheadore
Rename org skyconproject to skycoin
129a064
@SkycoinSynth
Merge pull request skycoin#345 from iketheadore/develop
7e7e93a 
Move changes from skycoinproject
@iketheadore
Fix docker image build error
92aa4ad
@SkycoinSynth
Merge pull request skycoin#352 from iketheadore/fix/dockerfile
72b20e7 
Fix docker image build error
@Senyoret1
Fix Travis build
ebc10ca
@iketheadore
Merge pull request skycoin#354 from Senyoret1/travis-b
e357ca5 
Fix Travis build
@Senyoret1
Merge remote-tracking branch 'upstream/develop' into balance
e333c3a
@Senyoret1
Merge remote-tracking branch 'upstream/develop' into improvements-v10
065646f
@Senyoret1
Fix problems with dependencies
14b38a9
@iketheadore
Merge pull request skycoin#351 from Senyoret1/improvements-v10
ebebea9 
General improvements
@Senyoret1
Merge remote-tracking branch 'upstream/develop' into balance
d7dec51
@iketheadore
Merge pull request skycoin#350 from Senyoret1/balance
c2df581 
Change how the balance is shown
@iketheadore
Merge branch 'develop'
b8be1b3 
* develop: (42 commits)
  Fix problems with dependencies
  Fix Travis build
  Fix docker image build error
  Rename org skyconproject to skycoin
  Update to Angular 11
  Add node-sass as dependency
  Improvements for using a local node directly
  Remove unused test files
  Update Snyk
  Fix e2e tests
  Improvements for the explorer
  Update to Angular 10
  Fix the e2e tests and a small bug
  Improve how the current balance is displayed
  Update to Angular 9
  Add pull requet template
  Format explorer.go to fix lint error
  Add dockerignore
  Remove hook for docker building
  Use /api/v2/transactions to get transactions for addresses
  ...
@CLAassistant
Copy link

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.
4 out of 5 committers have signed the CLA.

✅ SkycoinSynth
✅ iketheadore
✅ gz-c
✅ Senyoret1
❌ dependabot[bot]
You have signed the CLA already but the status is still pending? Let us recheck it.

@iketheadore iketheadore changed the title Master Merge into master branch May 4, 2021
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.
5 participants
@iketheadore @CLAassistant @Senyoret1 @gz-c @SkycoinSynth