Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: quantumchainlabs/wavesplatform.core.js
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: master
Choose a base ref
...
head repository: AgateChain/Agate.core.js
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: master
Choose a head ref
Able to merge. These branches can be automatically merged.

Commits on May 26, 2017

  1. Added WavesPool.NET as a verified asset

    xenohunter committed May 26, 2017
    Copy the full SHA
    0054c4c View commit details
  2. Added EFYT as a verified asset

    xenohunter committed May 26, 2017
    Copy the full SHA
    2df4de2 View commit details
  3. Copy the full SHA
    72b2e30 View commit details
  4. Merge pull request #37 from xenohunter/master

    Added WavesPool.NET and EFYT as verified assets
    Phil Filippak authored May 26, 2017
    Copy the full SHA
    9fc5cfd View commit details

Commits on May 29, 2017

  1. Added getTradableBalance method

    xenohunter committed May 29, 2017
    Copy the full SHA
    6b73340 View commit details
  2. Merge pull request #38 from xenohunter/master

    Added getTradableBalance method
    Phil Filippak authored May 29, 2017
    Copy the full SHA
    9b1d1ee View commit details
  3. Removed trash

    xenohunter committed May 29, 2017
    Copy the full SHA
    9df2dbf View commit details
  4. Removed unused build steps

    Bumped the version
    xenohunter committed May 29, 2017
    Copy the full SHA
    526476b View commit details
  5. Merge pull request #39 from xenohunter/master

    Cleaned up the repo
    Phil Filippak authored May 29, 2017
    Copy the full SHA
    d20c8f9 View commit details

Commits on Jun 2, 2017

  1. Added method for checking unique asset names

    xenohunter committed Jun 2, 2017
    Copy the full SHA
    690a892 View commit details

Commits on Jun 4, 2017

  1. Copy the full SHA
    539c9e0 View commit details

Commits on Jun 5, 2017

  1. Added Mobile Go Token as a verified asset

    xenohunter committed Jun 5, 2017
    Copy the full SHA
    1fe11df View commit details
  2. Merge pull request #40 from xenohunter/master

    Started work on unique assets + added MGO
    Phil Filippak authored Jun 5, 2017
    Copy the full SHA
    dcae657 View commit details

Commits on Jun 6, 2017

  1. Added EncryptoTel as a verified asset

    xenohunter committed Jun 6, 2017
    Copy the full SHA
    e450aa8 View commit details
  2. Copy the full SHA
    eb6a5c1 View commit details
  3. Merge pull request #41 from xenohunter/master

    Added EncryptoTel as a verified asset
    Phil Filippak authored Jun 6, 2017
    Copy the full SHA
    6968214 View commit details
  4. Added makeAssetNameUnique methods

    xenohunter committed Jun 6, 2017
    Copy the full SHA
    73c3bc2 View commit details
  5. Copy the full SHA
    c66bd07 View commit details
  6. Merge pull request #42 from xenohunter/master

    Added makeAssetNameUnique methods
    Phil Filippak authored Jun 6, 2017
    Copy the full SHA
    fcf5412 View commit details

Commits on Jun 7, 2017

  1. Added temporary fix for the API format

    xenohunter committed Jun 7, 2017
    Copy the full SHA
    957c41d View commit details
  2. Renamed the license file

    xenohunter committed Jun 7, 2017
    Copy the full SHA
    3775eb5 View commit details
  3. Migrated to npm@5

    xenohunter committed Jun 7, 2017
    Copy the full SHA
    4e8691f View commit details
  4. Changes the readme file

    xenohunter committed Jun 7, 2017
    Copy the full SHA
    95676d7 View commit details
  5. Merge pull request #43 from xenohunter/master

    Various fixes
    Phil Filippak authored Jun 7, 2017
    Copy the full SHA
    04657ae View commit details
  6. Changed the heading size

    xenohunter committed Jun 7, 2017
    Copy the full SHA
    30f6ac1 View commit details
  7. Merge pull request #44 from xenohunter/master

    Changed the heading size
    Phil Filippak authored Jun 7, 2017
    Copy the full SHA
    70b5338 View commit details

Commits on Jun 16, 2017

  1. Added ZrCoin as a verified asset

    xenohunter committed Jun 16, 2017
    Copy the full SHA
    03b34ce View commit details
  2. Merge pull request #45 from xenohunter/master

    Added ZrCoin as a verified asset
    Phil Filippak authored Jun 16, 2017
    Copy the full SHA
    537a594 View commit details

Commits on Jun 20, 2017

  1. Added privateBANKX as a verified asset

    xenohunter committed Jun 20, 2017
    Copy the full SHA
    0365ef4 View commit details
  2. Added CryptoPing as a verified asset

    xenohunter committed Jun 20, 2017
    Copy the full SHA
    7e62306 View commit details
  3. Merge pull request #46 from xenohunter/master

    CryptoPing and privateBANKX are now verified
    Phil Filippak authored Jun 20, 2017
    Copy the full SHA
    dd67330 View commit details

Commits on Jun 21, 2017

  1. Added Starrie and BearWaves as verified assets

    xenohunter committed Jun 21, 2017
    Copy the full SHA
    78fa71b View commit details
  2. Merge pull request #47 from xenohunter/master

    Added Starrie and BearWaves as verified assets
    Phil Filippak authored Jun 21, 2017
    Copy the full SHA
    583d03a View commit details

Commits on Jun 23, 2017

  1. Added Darcrus and GLIPP as verified assets

    xenohunter committed Jun 23, 2017
    Copy the full SHA
    7876df4 View commit details
  2. Merge pull request #48 from xenohunter/master

    Added Darcrus and GLIPP as verified assets
    Phil Filippak authored Jun 23, 2017
    Copy the full SHA
    ffd7e0f View commit details

Commits on Jun 26, 2017

  1. Copy the full SHA
    69e742c View commit details

Commits on Jun 27, 2017

  1. Added method returning aliases by address

    xenohunter committed Jun 27, 2017
    Copy the full SHA
    74a5845 View commit details

Commits on Jun 28, 2017

  1. Refactored alias creation code

    xenohunter committed Jun 28, 2017
    Copy the full SHA
    40be6ed View commit details
  2. Added aliases to transfer and leasing transactions

    xenohunter committed Jun 28, 2017
    Copy the full SHA
    f3e9d35 View commit details
  3. Avoided alias changes in the address cleanup

    xenohunter committed Jun 28, 2017
    Copy the full SHA
    890391a View commit details
  4. Copy the full SHA
    937b439 View commit details
  5. Merge pull request #49 from xenohunter/master

    Added alias support
    Phil Filippak authored Jun 28, 2017
    Copy the full SHA
    6daab14 View commit details

Commits on Jun 29, 2017

  1. Added Primalbase Token as a verified asset

    xenohunter committed Jun 29, 2017
    Copy the full SHA
    8ef5566 View commit details
  2. Copy the full SHA
    b5c733a View commit details
  3. Removed unused field symbol from Currency

    xenohunter committed Jun 29, 2017
    Copy the full SHA
    5407697 View commit details
  4. Removed unused field symbol from Currency

    xenohunter committed Jun 29, 2017
    Copy the full SHA
    6394eb6 View commit details
  5. Merge pull request #50 from xenohunter/master

    Primalbase Token and cleanup
    Phil Filippak authored Jun 29, 2017
    Copy the full SHA
    5733aba View commit details
  6. Added sign service

    Used sign service in leasing service
    Used sign service in asset service (partially)
    xenohunter committed Jun 29, 2017
    Copy the full SHA
    5835ca9 View commit details
  7. Added validate service

    xenohunter committed Jun 29, 2017
    Copy the full SHA
    00d429c View commit details
  8. Fixed naming and code style

    xenohunter committed Jun 29, 2017
    Copy the full SHA
    848752a View commit details
84 changes: 7 additions & 77 deletions Gruntfile.js
Original file line number Diff line number Diff line change
@@ -1,7 +1,5 @@
/*global module:false*/
module.exports = function (grunt) {

// Project configuration
grunt.initConfig({
pkg: grunt.file.readJSON('package.json'),
meta: {
@@ -10,7 +8,7 @@ module.exports = function (grunt) {
prod: ['src/**/*.js', '!src/**/*.spec.js'],
ordered: {
libraries: [
// this library doesn't work properly being included after angular
// This library doesn't work properly if included after Angular
'bower_components/js-sha3/src/sha3.js',

'bower_components/angular/angular.js',
@@ -27,9 +25,7 @@ module.exports = function (grunt) {
local: [
'src/vendor/blake2b.js',
'src/vendor/converters.js',
'src/vendor/extensions.js',

// project sources
'src/core/waves.money.js',
'src/core/core.module.js',
'src/core/core.constants.js',
@@ -43,6 +39,7 @@ module.exports = function (grunt) {
'src/core/crypto.service.js',
'src/core/asset.service.js',
'src/core/alias.request.service.js',
'src/core/unique.assets.request.service.js',
'src/core/leasing.request.service.js',
'src/core/api.service.js',
'src/core/utility.service.js',
@@ -57,14 +54,15 @@ module.exports = function (grunt) {
'src/core/matcher.api.service.js',
'src/core/datafeed.api.service.js',
'src/core/matcher.request.service.js',
'src/core/order.price.js'
'src/core/order.price.js',
'src/core/sign.service.js',
'src/core/validate.service.js'
]
}
},
editor: 'gedit --new-window -s ',
target: 'wavesplatform-core'
},
// Task configuration.
jshint: {
all: ['<%= meta.sources.all %>', '!src/vendor/*.js']
},
@@ -132,68 +130,9 @@ module.exports = function (grunt) {
}
}
},
clean: ['distr/**'],
bump: {
options: {
files: ['package.json', 'bower.json'],
updateConfigs: ['pkg'],
commit: true, // debug
push: 'branch', // debug
pushTo: 'origin',
createTag: false,
commitMessage: "chore(version): bumping version v%VERSION%",
}
},
shell: {
release: {
command: "<%= meta.editor %> distr/CHANGELOG.tmp"
}
},
conventionalChangelog: {
release: {
options: {
changelogOpts: {
// conventional-changelog options go here
preset: 'angular',
append: false,
releaseCount: 0
},
context: {
// context goes here
},
gitRawCommitsOpts: {
// git-raw-commits options go here
},
parserOpts: {
// conventional-commits-parser options go here
},
writerOpts: {
// conventional-changelog-writer options go here
}
},
src: 'distr/CHANGELOG.tmp'
}
},
"github-release": {
options: {
repository : "wavesplatform/wavesplatform.core.js",
auth: {
user: process.env["GITHUB_ACCESS_TOKEN"],
password: ''
},
release: {
tag_name: "v<%= pkg.version %>",
name: "v<%= pkg.version %>",
bodyFilename: 'distr/CHANGELOG.tmp',
draft: true,
prerelease: true
}
},
files: []
}
clean: ['distr/**']
});

// These plugins provide necessary tasks.
grunt.loadNpmTasks('grunt-contrib-jshint');
grunt.loadNpmTasks('grunt-contrib-concat');
grunt.loadNpmTasks('grunt-contrib-uglify');
@@ -203,18 +142,9 @@ module.exports = function (grunt) {
grunt.loadNpmTasks('grunt-contrib-copy');
grunt.loadNpmTasks('grunt-contrib-compress');
grunt.loadNpmTasks('grunt-jscs');
grunt.loadNpmTasks('grunt-bump');
grunt.loadNpmTasks('waves-grunt-github-releaser');
grunt.loadNpmTasks('grunt-shell');
grunt.loadNpmTasks('grunt-karma');
grunt.loadNpmTasks('grunt-conventional-changelog');

grunt.registerTask('emptyChangelog', 'Creates an empty changelog', function() {
grunt.file.write('distr/CHANGELOG.tmp', '');
});

grunt.registerTask('distr', ['clean', 'build', 'emptyChangelog']);
grunt.registerTask('publish', ['distr', 'conventionalChangelog', 'shell', 'github-release']);
grunt.registerTask('distr', ['clean', 'build']);
grunt.registerTask('test', ['jshint', 'jscs', 'karma:development']);
grunt.registerTask('build', [
'jscs',
File renamed without changes.
3 changes: 1 addition & 2 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,2 +1 @@
# wavesplatform.core.js
Shared javascript components for access to waves nodes
### Shared Angular components for accessing the Agate nodes
2 changes: 1 addition & 1 deletion bower.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "wavesplatform-core-js",
"version": "0.2.0",
"version": "0.3.0",
"dependencies": {
"angular": "~1.6.0",
"angular-loader": "~1.6.0",
Loading