Skip to content

Commit

Permalink
Merge branch 'release'
Browse files Browse the repository at this point in the history
* release:
  Fixes Giveth/giveth-dapp#239
  for some reason winston captures FeathersError objects, don't mutate them
  remove dir warning for file logger
  Update winston and optionally save json logs
  quite down NotFound logger
  Milestones can now be deleted again.
  fixes Giveth#453 correctly set isReturn for delegated pledges
  set homeTxHash for initialDonations not processed via ui
  fix bug where faildTxMonitor was creating new events instead of patching the existing event
  fix bug where milestone update was blocked for disbursing milestone payment
  fix bug with milestone state updates
  remove console.log statement
  fix typo to prevent milestone state regression

# Conflicts:
#	src/blockchain/watcher.js
  • Loading branch information
vojtechsimetka committed Sep 7, 2018
2 parents d893be9 + c4ff411 commit 3236427
Show file tree
Hide file tree
Showing 16 changed files with 503 additions and 222 deletions.
1 change: 1 addition & 0 deletions config/default.json
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@
"nedb": "../data",
"uploads": "../uploads",
"uploadsBaseUrl": "http://localhost:3030/uploads/",
"logDir": "",
"blockchain": {
"nodeUrl": "ws://localhost:8546",
"homeNodeUrl": "ws://localhost:8545",
Expand Down
Loading

0 comments on commit 3236427

Please sign in to comment.