Merge branch '0.13'
Conflicts: app/lib/dal/fileDALs/LinksDAL.js install.sh package.json test/integration/branches.js
Showing
- .travis.yml 9 additions, 1 deletion.travis.yml
- app/controllers/abstract.js 15 additions, 0 deletionsapp/controllers/abstract.js
- app/controllers/blockchain.js 80 additions, 182 deletionsapp/controllers/blockchain.js
- app/controllers/network.js 42 additions, 78 deletionsapp/controllers/network.js
- app/controllers/node.js 3 additions, 6 deletionsapp/controllers/node.js
- app/controllers/transactions.js 64 additions, 180 deletionsapp/controllers/transactions.js
- app/controllers/uds.js 38 additions, 88 deletionsapp/controllers/uds.js
- app/controllers/wot.js 183 additions, 282 deletionsapp/controllers/wot.js
- app/lib/blockchainContext.js 249 additions, 104 deletionsapp/lib/blockchainContext.js
- app/lib/constants.js 36 additions, 7 deletionsapp/lib/constants.js
- app/lib/crypto.js 2 additions, 5 deletionsapp/lib/crypto.js
- app/lib/dal/fileDAL.js 162 additions, 199 deletionsapp/lib/dal/fileDAL.js
- app/lib/dal/fileDALs/AbstractLoki.js 0 additions, 86 deletionsapp/lib/dal/fileDALs/AbstractLoki.js
- app/lib/dal/fileDALs/BlockDAL.js 0 additions, 244 deletionsapp/lib/dal/fileDALs/BlockDAL.js
- app/lib/dal/fileDALs/CertDAL.js 0 additions, 66 deletionsapp/lib/dal/fileDALs/CertDAL.js
- app/lib/dal/fileDALs/LinksDAL.js 0 additions, 92 deletionsapp/lib/dal/fileDALs/LinksDAL.js
- app/lib/dal/fileDALs/MembershipDAL.js 0 additions, 79 deletionsapp/lib/dal/fileDALs/MembershipDAL.js
- app/lib/dal/fileDALs/PeerDAL.js 0 additions, 42 deletionsapp/lib/dal/fileDALs/PeerDAL.js
- app/lib/dal/sqliteDAL/AbstractSQLite.js 327 additions, 0 deletionsapp/lib/dal/sqliteDAL/AbstractSQLite.js
- app/lib/dal/sqliteDAL/BlockDAL.js 135 additions, 0 deletionsapp/lib/dal/sqliteDAL/BlockDAL.js
Please register or sign in to comment