Skip to content

Commit

Permalink
Merge pull request #139 from adshares/develop
Browse files Browse the repository at this point in the history
Release 0.2.0
  • Loading branch information
m-pilarczyk authored Sep 28, 2018
2 parents 9277c42 + a0ccd12 commit 9f199fa
Show file tree
Hide file tree
Showing 61 changed files with 3,097 additions and 282 deletions.
13 changes: 13 additions & 0 deletions .env.dist
Original file line number Diff line number Diff line change
Expand Up @@ -32,3 +32,16 @@ JWT_SECRET_KEY=%kernel.project_dir%/config/jwt/private.pem
JWT_PUBLIC_KEY=%kernel.project_dir%/config/jwt/public.pem
JWT_PASSPHRASE=65e733d6aafb79704a0fe864ec92d480
JWT_TOKEN_TTL=3600

# Queue
QUEUE_HOST=adshares_ads-operator_queue_1
QUEUE_PORT=5672
QUEUE_USER=guest
QUEUE_PASSWORD=guest

MAILER_URL=null://localhost
[email protected]
[email protected]

CHANGE_EMAIL_CONFIRMATION_TEMPLATE=change-email-confirmation.twig

19 changes: 19 additions & 0 deletions .env.travis
Original file line number Diff line number Diff line change
Expand Up @@ -11,10 +11,29 @@ ADS_ADDRESS=
ADS_SECRET=
ADS_HOST=127.0.0.1
ADS_PORT=9091
ADS_BINARY=ads
ADS_WORKING_DIR=/tmp/.ads10

HOST_IP=10.69.3.39

GENESIS_TIME=1531390976
BLOCK_SEQ_TIME=32

API_URI=http://127.0.0.1:8000

# JWT Token
JWT_SECRET_KEY=%kernel.project_dir%/config/jwt/private.pem
JWT_PUBLIC_KEY=%kernel.project_dir%/config/jwt/public.pem
JWT_PASSPHRASE=65e733d6aafb79704a0fe864ec92d480
JWT_TOKEN_TTL=3600

# Queue
QUEUE_HOST=adshares_ads-operator_queue_1
QUEUE_PORT=5672
QUEUE_USER=guest
QUEUE_PASSWORD=guest

MAILER_URL=null://localhost
[email protected]

CHANGE_EMAIL_CONFIRMATION_TEMPLATE=change-email-confirmation.twig
14 changes: 13 additions & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,17 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0

## [Unreleased]

## [0.2.0] - 2018-09-28
### Added
- Import data starting from the last block
- Use MongoDB `upsert` functionality to insert or update data
- User email change
- User password change

### Changed
- Update ADS PHP Client library
- Removed transformation from hexadecimal `nodeId` to decimal regarding to the new version of ADS PHP Client

## [0.1.0] - 2018-09-24
### Added
- Support for all block explorer endpoints:
Expand Down Expand Up @@ -40,6 +51,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
- Contributing


[Unreleased]: https://github.com/adshares/ads-operator/compare/v0.1.0...HEAD
[Unreleased]: https://github.com/adshares/ads-operator/compare/v0.2.0...HEAD

[0.2.0]: https://github.com/adshares/ads-operator/compare/v0.1.0...v0.2.0
[0.1.0]: https://github.com/adshares/ads-operator/releases/tag/v0.1.0
5 changes: 4 additions & 1 deletion composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,10 @@
"adshares/ads-client": "^1.0",
"lexik/jwt-authentication-bundle": "^2.5",
"symfony/validator": "^4.1",
"stof/doctrine-extensions-bundle": "^1.3"
"stof/doctrine-extensions-bundle": "^1.3",
"php-amqplib/php-amqplib": "^2.7",
"symfony/proxy-manager-bridge": "^4.1",
"symfony/swiftmailer-bundle": "^3.2"
},
"require-dev": {
"phpunit/phpunit": "^7.0",
Expand Down
Loading

0 comments on commit 9f199fa

Please sign in to comment.