Commit Graph

7665 Commits

Author SHA1 Message Date
Arkadiy Paronyan
14a9942d14 Update appveyor.yml 2016-12-18 01:11:48 +01:00
Arkadiy Paronyan
fc10d15b75 Update appveyor.yml 2016-12-18 01:11:29 +01:00
Gav Wood
e755c09446 Merge pull request #3884 from ethcore/fix-diff-adj
Fix difficulty adjustment.
2016-12-17 16:35:20 +01:00
Gav Wood
ec5b867a22 Merge pull request #3883 from ethcore/fix-win-ci
Final fixups for updater
2016-12-17 16:10:08 +01:00
Gav Wood
d98f0d8fb5
No need to test windows for every PR. 2016-12-17 16:00:33 +01:00
Gav Wood
023d413610
Fix difficulty adjustment.
Closes #3861
2016-12-17 15:53:06 +01:00
Gav Wood
efd4036a9a
Fix build. 2016-12-17 15:40:55 +01:00
Gav Wood
6e12f4f719
Alter port for icarus. 2016-12-17 15:22:31 +01:00
Gav Wood
b418cb8da3
Merge remote-tracking branch 'origin/master' into fix-win-ci 2016-12-17 15:10:17 +01:00
Gav Wood
b2b3a0eb34
Final fixups for updater
- Wire up platforms to match those of CI.
- Introduce "final" feature to tag version with "nightly".
2016-12-17 14:36:30 +01:00
Gav Wood
6634b2e3da Merge pull request #3882 from ethcore/fix-win-ci
Attempt to fix windows CI.
2016-12-17 13:13:08 +01:00
Gav Wood
a81e833fcc Merge pull request #3881 from ethcore/tx-test-fix
Fixing racy test
2016-12-17 12:57:15 +01:00
arkpar
b34d3ee5a2 Fixin racy test 2016-12-17 12:28:31 +01:00
Gav Wood
adb0f6fb26 Merge pull request #3880 from ethcore/fix-updater-permissions
Fix updater permissions
2016-12-17 12:15:05 +01:00
Gav Wood
f00eb060c1
Attempt to fix windows CI. 2016-12-17 12:06:51 +01:00
Arkadiy Paronyan
4c0741e568 Fixed windows stub signature 2016-12-16 22:26:12 +01:00
Gav Wood
75c92e9356
Add Parity.png 2016-12-16 20:34:08 +01:00
Gav Wood
83e6e03dd6 Merge pull request #3865 from ethcore/tx-block
Delayed transactions
2016-12-16 20:28:18 +01:00
Gav Wood
6f977f03ae
Rename from troublesome filename 2016-12-16 20:26:49 +01:00
Gav Wood
c14d34e347 Merge pull request #3853 from ethcore/jg-token-log
Don't log auth token
2016-12-16 20:24:23 +01:00
Gav Wood
fa721f5cdf Merge pull request #3875 from ethcore/config-fix
Loading default config from default path
2016-12-16 20:24:12 +01:00
Gav Wood
c2448f6c2f
Add mac icon. 2016-12-16 18:32:33 +01:00
Gav Wood
14e4fefbcf
Fix updater permissions and refactor existing code. 2016-12-16 18:17:15 +01:00
Gav Wood
45f141b52f Merge pull request #3877 from ethcore/path-fix
New paths
2016-12-16 17:38:20 +01:00
Gav Wood
b9cd68e7e6 Minor paths change 2016-12-16 17:38:02 +01:00
Gav Wood
e8624fda88 Merge pull request #3876 from ethcore/fix-ci
Update tests, gitlabci
2016-12-16 16:56:46 +01:00
arkpar
6966fd6c63 New paths 2016-12-16 15:25:53 +01:00
Gav Wood
b89d10239b
Update tests, gitlabci 2016-12-16 15:12:35 +01:00
Tomasz Drwięga
f345458b65 Loading config from default path 2016-12-16 15:03:31 +01:00
arkpar
65f07e5aa7 Renamed some functions 2016-12-16 14:54:26 +01:00
arkpar
6c9de9e6f8 Merge branch 'master' of github.com:ethcore/parity into tx-block 2016-12-16 13:36:07 +01:00
arkpar
f967713d08 Added a test 2016-12-16 13:27:14 +01:00
GitLab Build Bot
3450538208 [ci skip] js-precompiled 20161216-121923 2016-12-16 12:22:56 +00:00
Gav Wood
72f278efed Merge pull request #3868 from ethcore/new-dirs
Base directory option
2016-12-16 13:04:31 +01:00
Gav Wood
6e5a583cb4 Merge pull request #3505 from ethcore/check-updates
Auto-updating
2016-12-16 13:01:49 +01:00
Gav Wood
b437265082
Fix build. 2016-12-16 11:27:00 +01:00
Gav Wood
90d3d330f5
Use info! for blockchain status rather than stdout. 2016-12-16 11:00:17 +01:00
Gav Wood
396ab5b361
Refactor and make is_syncing. 2016-12-16 10:31:10 +01:00
Gav Wood
35b18485d4
Don't check for updates while syncing. 2016-12-16 10:14:44 +01:00
Gav Wood
ba60e046be
Tone down logging. 2016-12-16 10:02:42 +01:00
Gav Wood
d9b9172089 Merge pull request #3873 from ethcore/fix-collision
Fix naming collision
2016-12-16 02:09:36 +01:00
keorn
d8470cc5ca revert slack 2016-12-16 00:07:07 +01:00
keorn
447196398a fix start_step 2016-12-15 23:36:06 +01:00
Gav Wood
6ea5638240 Merge pull request #3858 from ethcore/fetcher-ref
Get rid of unecessary redirection while fetching content
2016-12-15 23:08:37 +01:00
Gav Wood
a6a8e431f5
Fix lint 2016-12-15 22:46:36 +01:00
Gav Wood
7cac50601f
Add JS tests for parity_netPeers 2016-12-15 22:45:35 +01:00
Gav Wood
869fbf5108
Fix linting. 2016-12-15 22:07:25 +01:00
Gav Wood
ca0d87da10
125 -> 69. 2016-12-15 22:05:54 +01:00
arkpar
e2371632c5 Base dir option 2016-12-15 21:56:45 +01:00
arkpar
060cc799a6 Minor tweaks 2016-12-15 21:44:31 +01:00