Commit Graph

  • ad8cdc1d1f Merge commit '702a410' into LokiMergeUpstream20180821 doy-lee 2018-09-19 14:18:52 +1000
  • b64d7048a3 Merge commit '94ed562' into LokiMergeUpstream20180821 doy-lee 2018-09-19 14:15:55 +1000
  • bfa4f75e5c Merge commit '21afa71' into LokiMergeUpstream20180821 doy-lee 2018-09-19 14:05:10 +1000
  • 5b9091d119 Merge commit '025187e' into LokiMergeUpstream20180821 doy-lee 2018-09-19 14:05:07 +1000
  • e3da57f7af Merge commit '7d2d805' into LokiMergeUpstream20180821 doy-lee 2018-09-19 13:48:26 +1000
  • d315b42397 Merge commit 'fc39d3b' into LokiMergeUpstream20180821 doy-lee 2018-09-19 13:48:04 +1000
  • 3f76835e1a Merge commit 'ebf2818' into LokiMergeUpstream20180821 doy-lee 2018-09-19 13:47:21 +1000
  • 027b8281aa Merge commit 'eed4dba' into LokiMergeUpstream20180821 doy-lee 2018-09-19 13:44:41 +1000
  • bfddc9d699 Merge commit '40f85f4' into LokiMergeUpstream20180821 doy-lee 2018-09-19 13:36:21 +1000
  • fea865537c Merge branch 'dev' into LokiMergeUpstream20180821 doy-lee 2018-09-19 13:29:43 +1000
  • 3a46efb488 Set m_height to 0, revert didn't revert this. doy-lee 2018-09-19 13:24:37 +1000
  • 13d524ee02 Merge branch 'dev' into LokiMergeUpstream20180821 doy-lee 2018-09-19 13:23:56 +1000
  • 4f6c0d0685
    Merge pull request #254 from Doy-lee/dev Doyle 2018-09-19 11:52:04 +1000
  • 46a5b51427 blockchain: avoid exception if asked for a block we do not have moneromooo-monero 2018-04-29 11:41:54 +0100
  • 468ef29efd
    Merge 8b491071a0 into 728a947646 moneromooo-monero 2018-09-18 15:09:22 +0000
  • 4cfb140f10
    Merge pull request #253 from Doy-lee/RemoveRCTag Doyle 2018-09-18 15:39:09 +1000
  • 7c8d1caf51
    Merge pull request #252 from Doy-lee/RemoveRCTag Doyle 2018-09-18 15:38:30 +1000
  • 0354c9f135 Remove rc tag from version tag doy-lee 2018-09-18 15:37:35 +1000
  • ce3bdc557e
    Merge pull request #250 from loki-project/master Doyle 2018-09-18 13:40:00 +1000
  • 8b2458dd10
    Revert hardfork scan, this does not comply with core_tests (#249) Doyle 2018-09-18 13:33:59 +1000
  • 2dc9f687ea
    Backport master changes to dev (#248) Doyle 2018-09-18 12:14:11 +1000
  • 489282101e
    Remove get quorum state URI endpoint, use json rpc only (#199) Doyle 2018-09-18 12:10:43 +1000
  • 764d919e8e
    Service Nodes Safe Guard (#246) Doyle 2018-09-18 12:10:31 +1000
  • 071999753f
    Add Discord community link to Readme.md shigutso 2018-09-17 10:59:53 -0300
  • 246ea04cf8 updated checkpoints to remove early hardfork chainsplit jcktm 2018-09-17 06:45:19 +1000
  • f9804db357 updated checkpoints to remove early hardfork chainsplit jcktm 2018-09-17 06:45:19 +1000
  • bdbeae8b7c Fix refresh api changes for compilation doy-lee 2018-09-16 14:27:13 +1000
  • 7423aa962e Merge commit '58cceaad7102c8e1c7130c47fa22cdb50eab97e8' into LokiMergeUpstream20180821 doy-lee 2018-09-14 16:58:20 +1000
  • 38de527bcd Merge commit 'c58758a' into LokiMergeUpstream20180821 doy-lee 2018-09-14 16:19:39 +1000
  • c97b996a64 Merge commit '008b903' into LokiMergeUpstream20180821 doy-lee 2018-09-14 16:15:18 +1000
  • 0c85ff45e3 Merge commit '2329d2f' into LokiMergeUpstream20180821 doy-lee 2018-09-14 16:14:44 +1000
  • 855f4e7693 Merge commit '3ad4ecd' into LokiMergeUpstream20180821 doy-lee 2018-09-14 15:52:03 +1000
  • ed9d21bb9f Merge commit '0cf80ba' into LokiMergeUpstream20180821 doy-lee 2018-09-14 15:51:22 +1000
  • 656a5228bf Merge commit 'dcbc17e' into LokiMergeUpstream20180821 doy-lee 2018-09-14 15:50:42 +1000
  • b963a1e780 Merge commit '2d92fa5' into LokiMergeUpstream20180821 doy-lee 2018-09-14 15:50:01 +1000
  • 2f226e06ad Merge commit 'a844844' into LokiMergeUpstream20180821 doy-lee 2018-09-14 15:49:48 +1000
  • c2e7f22bdf Merge commit '13851b2' into LokiMergeUpstream20180821 doy-lee 2018-09-14 15:49:24 +1000
  • 0e5ba624ec Merge commit '80d7c6c' into LokiMergeUpstream20180821 doy-lee 2018-09-14 15:41:55 +1000
  • 474d5b8c31 Merge commit 'e6f4d4a' into LokiMergeUpstream20180821 doy-lee 2018-09-14 15:41:43 +1000
  • 630213a5ce Merge commit '0e4c7d0' into LokiMergeUpstream20180821 doy-lee 2018-09-14 15:41:22 +1000
  • f8d12478c2 Merge commit '2771a18' into LokiMergeUpstream20180821 doy-lee 2018-09-14 15:40:55 +1000
  • c19976a752 Merge commit '2704624' into LokiMergeUpstream20180821 doy-lee 2018-09-14 15:20:21 +1000
  • 76ac9c5af3 Merge commit '5d3e702' into LokiMergeUpstream20180821 doy-lee 2018-09-14 15:19:44 +1000
  • d8944cb5ca core_tests: more tests and some refactoring (#205) Maxim Shishmarev 2018-09-14 14:35:29 +1000
  • 1afdd98805 Merge commit 'dcfd299239cae50caad7a2f115489f86014b5114' into LokiMergeUpstream20180821 doy-lee 2018-09-14 13:56:28 +1000
  • a91308b82e
    Merge dd60a4f4e2 into 11dbfbc5b3 Gingeropolous 2018-09-13 18:16:47 +0000
  • dd60a4f4e2
    Merge pull request #2 from Gingeropolous/Gingeropolous-patch-1 Gingeropolous 2018-09-13 14:16:29 -0400
  • cdaef99d7b
    readme update fork table with fixed ringsize info Gingeropolous 2018-09-13 14:16:07 -0400
  • 2b6056f796
    cryptonote_protocol: try to recover from a wedge moneromooo-monero 2018-09-12 13:16:59 +0000
  • 13589fad38 Merge commit 'ef2cb6328788e14e8d593593ea9b2b716d72d6bd' into LokiMergeUpstream20180821 doy-lee 2018-09-13 19:07:10 +1000
  • b7e4e28ca1 Merge commit 'f025ae9' into LokiMergeUpstream20180821 doy-lee 2018-09-13 19:06:56 +1000
  • 6d7658ba91 Merge commit '41be339' into LokiMergeUpstream20180821 doy-lee 2018-09-13 19:05:57 +1000
  • 0b452f5d26 Merge commit 'f7f1917' into LokiMergeUpstream20180821 doy-lee 2018-09-13 18:59:49 +1000
  • f36a8e86bb Merge commit 'ba8331c' into LokiMergeUpstream20180821 doy-lee 2018-09-13 18:59:23 +1000
  • 7a563d1030 Merge commit '31a895e' into LokiMergeUpstream20180821 doy-lee 2018-09-13 18:58:58 +1000
  • 5214dae73f Merge commit '57ea902' into LokiMergeUpstream20180821 doy-lee 2018-09-13 18:58:31 +1000
  • ae4d7e4465 Merge commit 'a830db25775f7b708210e736154caf147ddf0ef3' into LokiMergeUpstream20180821 doy-lee 2018-09-13 18:42:56 +1000
  • ca464be3bd Merge commit 'ed2c81e' into LokiMergeUpstream20180821 doy-lee 2018-09-13 18:42:49 +1000
  • 8d769392d9 replace std::list with std::vector on some hot paths moneromooo-monero 2018-04-16 00:16:02 +0100
  • 1c0f82a57e Merge commit '209ec96' into LokiMergeUpstream20180821 doy-lee 2018-09-13 17:54:16 +1000
  • bc1d39bfab Merge commit '6795bd0' into LokiMergeUpstream20180821 doy-lee 2018-09-13 17:53:58 +1000
  • 85aba12d01 Merge commit 'a2b557f' into LokiMergeUpstream20180821 doy-lee 2018-09-13 17:53:42 +1000
  • 5138bf10a2 Merge commit '50af357' into LokiMergeUpstream20180821 doy-lee 2018-09-13 17:53:10 +1000
  • 0b166ffaa3 Merge branch 'dev' into LokiMergeUpstream20180821 doy-lee 2018-09-13 17:46:15 +1000
  • d934e5b4d5 unit tests: check portion amount validation (#214) Maxim Shishmarev 2018-09-13 11:49:30 +1000
  • 76657697ef Revert "core: fix type mismatch between function and declaration" jcktm 2018-09-12 16:30:53 +1000
  • 2c41648563
    Merge 9aec40ecbb into e6d36c1701 Leeeei 2018-09-11 14:13:25 +0000
  • 0349e183ca core: fix type mismatch between function and declaration jcktm 2018-09-11 18:43:26 +1000
  • 0796630ffa
    Merge pull request #197 from Doy-lee/BlockchainPopBlocksCommand jcktm 2018-09-11 18:07:55 +1000
  • b73aa8ee1c check_tx_inputs: ensure v3 tx does not appear before hf 9 jcktm 2018-09-10 20:46:19 +1000
  • eb52a7de97
    Merge pull request #220 from Doy-lee/ConstructMinerTXV3BlockUntilHardfork9 jcktm 2018-09-10 17:04:02 +1000
  • c5c9734e1e Don't construct a V3 miner tx until hardfork 9 doy-lee 2018-09-10 15:19:59 +1000
  • 7f590e7261
    README update scheduled software upgrade table Gingeropolous 2018-09-09 23:31:49 -0400
  • ff8f3418c0 Merge branch 'dev' jcktm 2018-09-09 02:19:32 +1000
  • 5cf56092b5 quorum_cop: remove block processing for any time before the hard fork jcktm 2018-09-09 01:59:02 +1000
  • ad3089fcc7
    Abstract TCP Server2 fixes from Monero (#217) (#218) Doyle 2018-09-08 23:45:11 +1000
  • e1722f5745 Merge branch 'dev' jcktm 2018-09-08 02:58:50 +1000
  • 99c9f73584 epee: adaptive connection timeout system moneromooo-monero 2018-06-07 12:43:10 +0100
  • 8b491071a0
    gen_multisig: use default daemon address moneromooo-monero 2018-09-07 13:29:48 +0000
  • 897a1b59d4 Merge branch 'dev' jcktm 2018-09-07 18:44:33 +1000
  • b41e1a04a7 bump major version number jcktm 2018-09-07 18:41:50 +1000
  • 25292b3e86 Version 0.4.0 Release Candidate (#216) Doyle 2018-09-07 15:14:28 +1000
  • 39435985e8 Update to version 0.4.0 release candidate (#215) Doyle 2018-09-07 15:11:47 +1000
  • 8c0d590f1f
    Don't ban peers for a bad vote, just drop their connection (#213) Doyle 2018-09-06 17:12:55 +1000
  • 73fece75ea
    Update testnet, remove testnet forks, remove checkpoints, update blockheight estimate (#212) Doyle 2018-09-06 12:26:09 +1000
  • 54d91548de Merge branch 'dev' into LokiMergeUpstream Doyle T 2018-09-05 12:07:29 +1000
  • 0494e64587
    Add temp hardfork rule in testnet for deregister lifetimes (#210) Doyle 2018-09-05 12:02:24 +1000
  • 3d14589578 fix build with GCC 8.1.0 (#211) Maxim Shishmarev 2018-09-05 12:02:11 +1000
  • 5245927afc
    Merge 54bf7c5110 into fad88e18a9 Thomas Vaughan 2018-09-05 00:03:09 +0000
  • 463a3b1c78
    Merge 6b4f08cc6d into fad88e18a9 iDunk5400 2018-09-04 23:13:16 +0000
  • 6b4f08cc6d
    Windows: tell cmake it's not crosscompiling in MSYS2 iDunk5400 2018-09-05 00:34:08 +0200
  • 72567883e0
    Merge pull request #209 from Doy-lee/ServiceNodeV0_3_7Beta jcktm 2018-09-04 15:01:43 +0200
  • ab7b7b64e5
    Merge pull request #208 from Doy-lee/ServiceNodesFilterRelayableDeregistersTX jcktm 2018-09-04 15:00:57 +0200
  • e4362474f9
    Merge 8eee41109b into 91c7d68b2d pavoltravnik 2018-09-04 12:10:29 +0000
  • 8eee41109b
    Update License to exclude government use pavoltravnik 2018-09-04 14:10:10 +0200
  • c67709c29e Bump version to 0.3.7-beta Doyle T 2018-09-04 20:53:53 +1000
  • 1528b88d65 Filter relayable deregisters w/ check_tx_inputs instead of blockchain callbacks Doyle T 2018-09-04 19:40:04 +1000
  • 3273e02670 Add pop blocks command which is helpful for "unstucking" your chain Doyle T 2018-08-27 20:14:00 +1000
  • 7a39586536
    Log db exception, fix relation operators for vote/deregister lifetime (#207) Doyle 2018-09-04 19:17:17 +1000
  • a0e8229928
    Service nodes restore only 1 rollback bug (#206) Doyle 2018-09-04 18:27:13 +1000