Commit Graph

  • 277586417a Merge commit '96696d1' into LokiMergeUpstream Doyle 2019-05-02 11:13:33 +1000
  • 6d44629bd5 Add missing depends to version.cpp generator (#583) Jason Rhinelander 2019-05-01 22:13:03 -0300
  • bad39ac86b Merge commit '45a4145' into LokiMergeUpstream Doyle 2019-05-01 18:11:56 +1000
  • 6833cffee4 Merge commit '2fa31a7' into LokiMergeUpstream Doyle 2019-05-01 17:33:33 +1000
  • f19e937a05 Merge commit '46c477a' into LokiMergeUpstream Doyle 2019-05-01 17:32:57 +1000
  • 5374632e2f Merge commit '1f809e7' into LokiMergeUpstream Doyle 2019-05-01 17:06:47 +1000
  • 97f5968876 Merge commit '9bd0983' into LokiMergeUpstream Doyle 2019-05-01 17:06:00 +1000
  • cba031f277 Merge commit 'e31559d' into LokiMergeUpstream Doyle 2019-05-01 17:05:48 +1000
  • 56d88abc35 Merge commit '8bf0a3f' into LokiMergeUpstream Doyle 2019-05-01 17:04:33 +1000
  • 8f1e65522e Merge commit '98f4c8a' into LokiMergeUpstream Doyle 2019-05-01 17:04:00 +1000
  • c213454e98 Remove wallet dns code Doyle 2019-05-01 16:39:02 +1000
  • 455129c8ca Merge branch 'dev' into LokiMergeUpstream Doyle 2019-05-01 16:31:54 +1000
  • e90cab06d5
    Merge pull request #582 from loki-project/master Doyle 2019-05-01 16:02:33 +1000
  • cc0d51078c Merge dev into upstream Doyle 2019-05-01 16:01:17 +1000
  • 73e8ac0343
    Service Node Checkpoint Storage (#579) Doyle 2019-05-01 15:57:41 +1000
  • ef01f7d499
    Increment patch version to 5 (#581) Doyle 2019-05-01 12:33:51 +1000
  • e5a0cae8b8
    Remove stack overflow in key image blacklist constructor (#580) Doyle 2019-05-01 11:35:27 +1000
  • b622d42eed extend get service nodes rpc with block height and block hash (#577) Maxim Shishmarev 2019-04-29 10:21:03 +1000
  • bb852a8bd9
    Fix mistaken tag name Duke Leto 2019-04-28 05:12:32 -0700
  • 46867570dd
    Fix git checkout commands, those tags do not exist Duke Leto 2019-04-27 08:11:28 -0700
  • 15c7a2dc7b Add one liner for Ubuntu 18.04 George 2019-04-25 23:57:50 -0500
  • c216103641
    Merge pull request #576 from Doy-lee/BackportMasterToDev Doyle 2019-04-26 14:39:09 +1000
  • 2715050afe Merge branch 'master' into dev Doyle 2019-04-26 13:56:40 +1000
  • bf30b891e2
    Remove duplicate description section in bug report (#575) Doyle 2019-04-26 13:29:17 +1000
  • 0d4f2361ee
    Ensure clear() also clears out the key image blacklist (#573) Doyle 2019-04-26 13:19:08 +1000
  • 4dca5bf314
    Initialise test class members to 0 to fix intermittent failures (#574) Doyle 2019-04-26 13:17:11 +1000
  • 47522768f0
    Remove loading checkpoints from DNS (#570) Doyle 2019-04-26 13:16:56 +1000
  • 9cf91bb9ed
    allow passing a passphrase for SSL certs (from command line or file) moneromooo-monero 2019-04-25 16:39:18 +0000
  • ab2333d60e
    Revert behaviour for is_alternative_block_allowed (#568) Doyle 2019-04-24 11:34:40 +1000
  • 54255b7134
    Fix nullptr check dereferencing in the checking condition (#569) Doyle 2019-04-24 11:01:27 +1000
  • dee66d4556
    Non-Enforced Transient Service Node Checkpointing (#566) Doyle 2019-04-23 12:04:47 +1000
  • 6024539e13
    Allow storing multiple quorum types (#562) Doyle 2019-04-23 10:53:17 +1000
  • 05ab99fd63
    wallet: add a configure function moneromooo-monero 2019-04-20 10:34:05 +0000
  • 502272864d Update issue templates (#565) Kee Jefferys 2019-04-17 16:34:27 +1000
  • fbf15ec6ac Simplify locked stakes API Doyle 2019-04-15 13:18:45 +1000
  • 28b976e060 Update welcome prompt, don't default ask for background mining Doyle 2019-04-15 11:02:38 +1000
  • 2b589eba28
    rpc.getblocktemplate: set reserved_offset to zero when reserve_size==0 /monero#5428 stoffu 2019-04-12 12:28:54 +0900
  • 5653661258 Merge commit '9c77dbf' into LokiMergeUpstream Doyle 2019-04-12 19:04:00 +1000
  • 4c771e4e84 Merge commit 'e03b9bc' into LokiMergeUpstream Doyle 2019-04-12 18:41:54 +1000
  • 721fd318d5 Merge commit '5db72d1' into LokiMergeUpstream Doyle 2019-04-12 18:41:07 +1000
  • 4778d862c9 Merge commit 'bd42903' into LokiMergeUpstream Doyle 2019-04-12 18:37:56 +1000
  • e92357478c Merge commit '7c85f3b' into LokiMergeUpstream Doyle 2019-04-12 18:21:56 +1000
  • c53bee7177 Merge commit '5dbcceb' into LokiMergeUpstream Doyle 2019-04-12 18:21:16 +1000
  • ba0cd9afcf Merge commit '7e5651c' into LokiMergeUpstream Doyle 2019-04-12 18:12:04 +1000
  • 9d1df98f37 Merge commit '4308a2e' into LokiMergeUpstream Doyle 2019-04-12 18:00:11 +1000
  • 6c70b007c9 Merge commit '3b1fa54' into LokiMergeUpstream Doyle 2019-04-12 17:47:47 +1000
  • aded2cef69 Merge commit '1ed6441' into LokiMergeUpstream Doyle 2019-04-12 17:44:20 +1000
  • ac844eebe3 Merge commit '4500236f259cac0e768bfe364edcffa14859c816' into LokiMergeUpstream Doyle 2019-04-12 17:22:58 +1000
  • 403b6f6df8 Merge commit '30a3a73' into LokiMergeUpstream Doyle 2019-04-12 17:22:42 +1000
  • 8d51a83f25 Merge commit 'e55b3f9' into LokiMergeUpstream Doyle 2019-04-12 17:13:06 +1000
  • 450dc8dda8 Merge commit '7acfa9f3cc7b52c0f4776dde3c3f80674cc3306f' into LokiMergeUpstream Doyle 2019-04-12 16:56:45 +1000
  • 9f2e091280 Merge commit 'e4b049d' into LokiMergeUpstream Doyle 2019-04-12 16:45:24 +1000
  • b985a05dd3 Merge commit 'cd776b1' into LokiMergeUpstream Doyle 2019-04-12 16:23:54 +1000
  • 692cb8579a Merge commit '6c0c7d7' into LokiMergeUpstream Doyle 2019-04-12 16:01:05 +1000
  • 36f379cdc1 Merge commit '39107e18d5603046bbb301538986e5334547d42a' into LokiMergeUpstream Doyle 2019-04-12 15:59:35 +1000
  • dd5597d7ff Merge commit '7632dede7b9b3b2be609866c6f814ae4d3aa079b' into LokiMergeUpstream Doyle 2019-04-12 15:59:29 +1000
  • a2bbb9398f Merge commit 'f9b1c4f962152f50fbfb96013dfae3c161acd3cd' into LokiMergeUpstream Doyle 2019-04-12 15:58:58 +1000
  • 8bfffb0fa9 Add misnamed tx construction data member v3_use_bulletproofs Doyle 2019-04-12 15:56:33 +1000
  • 9d9d309d03 Merge commit '48e3a341f8bb601895c94e7b637475f8911ae530' into LokiMergeUpstream Doyle 2019-04-12 15:48:19 +1000
  • 8f292af653 Don't query moneropulse in DNS code Doyle 2019-04-12 15:37:23 +1000
  • ab52f6f61e Merge commit '6f07b8ffa555fb3b64c4d5007acd46f496c28d19' into LokiMergeUpstream Doyle 2019-04-12 15:33:38 +1000
  • 2fe5ddb2ca Merge commit 'f2f725d8db3535055d1c7e102c0bba75b22a3409' into LokiMergeUpstream Doyle 2019-04-12 15:23:01 +1000
  • ae5667a0e1 Merge commit '38dcd975f2ce6867be343edda140ad2919be57ab' into LokiMergeUpstream Doyle 2019-04-12 15:20:27 +1000
  • 5162a30621 Merge commit 'c3de019f565674fd19b9d5cafba015d9ea7f69f7' into LokiMergeUpstream Doyle 2019-04-12 15:10:33 +1000
  • 6f779e7a3d Merge commit '429930534df43b8bef46a4a39dbfbc3d3b5939b0' into LokiMergeUpstream Doyle 2019-04-12 15:06:49 +1000
  • f9a6b06771 Merge commit '09b3b061bc4913b805a1207eb64f2bee6c1d0894' into LokiMergeUpstream Doyle 2019-04-12 14:53:01 +1000
  • 5e2022c895 Merge commit '6d5849d9bbb42ff6cedc6d5912d97f531ed3fc5f' into LokiMergeUpstream Doyle 2019-04-12 14:49:37 +1000
  • ca8cd71ed5 Merge commit '4c91eb23a0e2af645350cc13dd67de9f6ca54d2f' into LokiMergeUpstream Doyle 2019-04-12 14:39:02 +1000
  • 78acf90805 Merge commit 'e063615a0ef026ae5b83f59b7916881229df0b6b' into LokiMergeUpstream Doyle 2019-04-12 14:38:43 +1000
  • 8bbc87d470 Add more 2019 license updates for Monero Doyle 2019-04-12 14:38:30 +1000
  • 892469ded1 Update monero copyright to 2019 pre-emptively to make merge simpler Doyle 2019-04-12 14:36:43 +1000
  • 550e56ac1e Merge commit 'c88e9921043d7c40f023d24c3a3f39f2e96f8738' into LokiMergeUpstream Doyle 2019-04-12 14:17:05 +1000
  • 33488c1723 Merge commit '503b2fd964342a63876a7d16539ae9ceb27b7b70' into LokiMergeUpstream Doyle 2019-04-11 17:36:24 +1000
  • 229ce36182 Merge commit '49afbd0c53d29656689f319c7d3543204ead4e59' into LokiMergeUpstream Doyle 2019-04-11 17:14:47 +1000
  • cdc1e2c936 Merge commit '5bbbe3902b4ee77ca1eb23edc0b5495812353b1f' into LokiMergeUpstream Doyle 2019-04-11 17:14:33 +1000
  • 8d7d90c374 Merge commit 'ed6aa76cca69e4f6d0b84eb55ef7061dc4b6fc77' into LokiMergeUpstream Doyle 2019-04-11 15:08:26 +1000
  • 2f9105d5c1
    Remove unneeded SFINAE on check_tx/block_verification (#558) Doyle 2019-04-11 11:13:10 +1000
  • 6e1eb51c0f Merge commit '39d7d3113bfe3655e721fa08b132d3b7fbcfb9b3' into LokiMergeUpstream Doyle 2019-04-10 16:18:34 +1000
  • a3280d8d29 Merge commit '5057eb1199a9f1e4be4f0f9e0fe7cea5eea6027c' into LokiMergeUpstream Doyle 2019-04-10 16:17:50 +1000
  • 9e03bd668a Fix incomplete struct zero init merge Doyle 2019-04-10 16:17:08 +1000
  • 69693ddbc2 Add missing include for integration hook Doyle 2019-04-10 16:11:42 +1000
  • 8130b24e44 Merge commit '5fb4a9719cb799ae59e04cda0a3d760be969d7e8' into LokiMergeUpstream Doyle 2019-04-10 16:00:32 +1000
  • cdd8243d48 Merge commit 'c83e80c2634f2c14fbd9fe4dbfb6a0abc2eb20ea' into LokiMergeUpstream Doyle 2019-04-10 15:36:02 +1000
  • 3fda0a071a Fix uninitialised variable in core tests causing intermittent failures Doyle 2019-04-10 15:16:28 +1000
  • a41bed8a32 Merge branch 'dev' into LokiMergeUpstream Doyle 2019-04-10 13:55:30 +1000
  • 1b08000114
    Merge pull request #555 from Doy-lee/IntegrationTestUpdate Doyle 2019-04-10 13:52:58 +1000
  • a4a25cef28 Merge commit 'a6adbdc0b0f90f122e5b58ca9bb7421c7b3989a0' into LokiMergeUpstream Doyle 2019-04-10 10:06:00 +1000
  • 4926d73bb2 Merge commit 'a28237c9cacb074216b1ee1db40da32acde3acd0' into LokiMergeUpstream Doyle 2019-04-10 10:02:15 +1000
  • bec79a13c3 Merge commit 'e1a177f0da175b20cf9a2a84043fb4afa2a02a9b' into LokiMergeUpstream Doyle 2019-04-10 10:00:49 +1000
  • 4f0a729533 Merge commit '4466f4504e8bc41d353a6becce0526df8272bc1d' into LokiMergeUpstream Doyle 2019-04-10 09:59:38 +1000
  • e2a29bf490 Merge commit '927b2300b3f437787b5833aa011cf97525fac9ff' into LokiMergeUpstream Doyle 2019-04-10 09:36:50 +1000
  • bfa314aa88 Merge commit '815c8a48ab38586baf7963f7a4d9a87263811855' into LokiMergeUpstream Doyle 2019-04-10 09:25:07 +1000
  • 603e738be0 Merge commit '1b4fa00d7c21a72267968438b0a3cd8eeac50977' into LokiMergeUpstream Doyle 2019-04-10 09:21:23 +1000
  • 0458a4849e Merge commit '55305559c1ce10ec5d5d5a1c5d31e5056b8a9dd6' into LokiMergeUpstream Doyle 2019-04-09 18:57:11 +1000
  • 7ae4342f07 Merge commit '403fa6b4a3cac18752ef70a282d7660c40e40035' into LokiMergeUpstream Doyle 2019-04-09 18:30:23 +1000
  • 47566c63df Merge commit '973403bc9f54ab0722b67a3c76ab6e7bafbfeedc' Doyle 2019-04-09 18:07:13 +1000
  • c4e1feae6c Revert IPV6 changes and merge back in upstream Doyle 2019-04-09 16:58:38 +1000
  • b1c92fd216 Add helper functions to facilitate more reliable integration tests Doyle 2019-04-09 15:47:23 +1000
  • f0a2e4a192
    Merge pull request #529 from Doy-lee/QuorumCopRemoveBoundaryCode Doyle 2019-04-08 13:30:25 +1000
  • 765441d3dc Future proof, uptime proof's version checks by changing == to >= Doyle 2019-03-28 16:54:38 +1100