Git-Mirrors/monero
1
0
Fork 0
mirror of https://github.com/monero-project/monero.git synced 2024-10-01 11:49:47 -04:00
Code Issues Packages Projects Releases Wiki Activity
8,213 Commits 9 Branches 69 Tags 295 MiB
375fde9454
Commit Graph

8213 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
moneromooo-monero
375fde9454
hardfork: fix off by one updating fork index after popping 2019-04-20 00:05:35 +00:00
Riccardo Spagni
ef1f1c5314
Merge pull request #5465 
3e50a9e8 functional_tests: detect requests python module (moneromooo-monero)
 2019-04-18 22:14:44 +02:00
Riccardo Spagni
71c6b24893
Merge pull request #5464 
0f52fe4c Windows: work around a boost 1.70 and cmake SNAFU (iDunk5400)
b414b69f Windows: fix a build error in MSYS2 with boost 1.70.0 (iDunk5400)
 2019-04-18 22:04:11 +02:00
Riccardo Spagni
2267f110b2
Merge pull request #5463 
fbbe75d7 device/trezor: button request callback fix (Dusan Klinec)
 2019-04-18 22:03:30 +02:00
Riccardo Spagni
108544deb2
Merge pull request #5461 
5d0dcc18 add translations for it, fr, ja, sv from Pootle and refresh template .ts file (Monero-Pootle)
 2019-04-18 22:02:54 +02:00
Riccardo Spagni
9b10072f7b
Merge pull request #5462 
b672d4d6 epee: use boost/timer/timer.hpp, boost/timer.hpp is deprecated (moneromooo-monero)
 2019-04-18 22:02:14 +02:00
Riccardo Spagni
950f79dc03
Merge pull request #5389 
588e6700 simplewallet: fix output representation offset (moneromooo-monero)
35e0a968 wallet2: "output lineup" fake out selection (moneromooo-monero)
 2019-04-18 22:01:51 +02:00
Riccardo Spagni
2e342d8df6
Merge pull request #5458 
84047cb7 wallet_rpc_server: add unlocked field to incoming_transfers output (moneromooo-monero)
 2019-04-18 22:01:22 +02:00
Riccardo Spagni
b8f1709684
Merge pull request #5456 
58eade68 simplewallet: add the change amount to the prompt when locking (moneromooo-monero)
 2019-04-18 22:01:03 +02:00
Riccardo Spagni
55807141f2
Merge pull request #5453 
71102267 wallet_rpc_server: set suggested_confirmations_threshold for pool txes (moneromooo-monero)
 2019-04-18 21:59:01 +02:00
moneromooo-monero
3e50a9e8fc
functional_tests: detect requests python module 2019-04-18 19:33:01 +00:00
iDunk5400
0f52fe4c9c
Windows: work around a boost 1.70 and cmake SNAFU 
Boost got upgraded to 1.70.0 in MSYS2. As a result, cmake (v3.13.4 as of this commit) can not configure boost properly, and cmake configuration fails as a result. This is a workaround as per https://gitlab.kitware.com/cmake/cmake/issues/18865
 2019-04-18 19:41:14 +02:00
Dusan Klinec
fbbe75d75f
device/trezor: button request callback fix 2019-04-18 18:04:54 +02:00
moneromooo-monero
588e670089
simplewallet: fix output representation offset 2019-04-18 15:14:41 +00:00
moneromooo-monero
35e0a968bd
wallet2: "output lineup" fake out selection 
Based on python code by sarang:
https://github.com/SarangNoether/skunkworks/blob/outputs/outputs/simulate.py
 2019-04-18 15:14:38 +00:00
moneromooo-monero
b672d4d6e5
epee: use boost/timer/timer.hpp, boost/timer.hpp is deprecated 2019-04-18 15:12:34 +00:00
iDunk5400
b414b69f5c
Windows: fix a build error in MSYS2 with boost 1.70.0 2019-04-18 17:00:13 +02:00
Monero-Pootle
5d0dcc1805
add translations for it, fr, ja, sv from Pootle and refresh template .ts file 2019-04-18 14:39:03 +00:00
moneromooo-monero
84047cb729
wallet_rpc_server: add unlocked field to incoming_transfers output 2019-04-17 15:30:49 +00:00
moneromooo-monero
58eade689c
simplewallet: add the change amount to the prompt when locking 2019-04-17 11:05:18 +00:00
Riccardo Spagni
7973fb6a69
Merge pull request #5415 
299052bc Remove unneeded SFINAE on check_tx/block verification in core_tests (Doyle)
 2019-04-17 08:28:16 +02:00
Riccardo Spagni
e9464eb5e3
Merge pull request #5413 
5fafb90e testdb: add override keyword where missing (stoffu)
 2019-04-17 08:27:36 +02:00
Riccardo Spagni
4609b36608
Merge pull request #5455 
e3dea478 unit_tests: undo is_blocked implementation factoring (moneromooo-monero)
 2019-04-17 08:27:24 +02:00
Riccardo Spagni
a8a445922f
Merge pull request #5454 
b0a34668 daemon: fix absolute/relative log file test for windows (moneromooo-monero)
 2019-04-17 08:27:12 +02:00
stoffu
5fafb90e91
testdb: add override keyword where missing 
and delete obsolete BlockchainBDB::get_tx_output_indices along the way
 2019-04-17 10:26:25 +09:00
Doyle
299052bca3 Remove unneeded SFINAE on check_tx/block verification in core_tests 2019-04-17 10:43:14 +10:00
moneromooo-monero
e3dea47859
unit_tests: undo is_blocked implementation factoring 
The is_host_blocked method is not on master yet
 2019-04-16 22:23:15 +00:00
moneromooo-monero
b0a346689b
daemon: fix absolute/relative log file test for windows 2019-04-16 22:15:36 +00:00
moneromooo-monero
7110226794
wallet_rpc_server: set suggested_confirmations_threshold for pool txes 2019-04-16 20:59:57 +00:00
Riccardo Spagni
37c4f1b365
Merge pull request #5430 
294e858d wallet_rpc_server: add set_log_level/set_log_categories (moneromooo-monero)
 2019-04-16 22:51:05 +02:00
moneromooo-monero
294e858d57
wallet_rpc_server: add set_log_level/set_log_categories 2019-04-16 20:50:15 +00:00
Riccardo Spagni
1b092f3a44
Merge pull request #5452 
c30d93fc rpc: add a pruned bool to the prune_blockchain call (moneromooo-monero)
 2019-04-16 22:48:50 +02:00
Riccardo Spagni
810dd0a5f6
Merge pull request #5450 
926e0472 simplewallet: add another warning about long payment ids (moneromooo-monero)
 2019-04-16 22:48:18 +02:00
Riccardo Spagni
ba1b6d36c4
Merge pull request #5447 
02c01c0b Add Brewfile to allow for an even easier management of dependencies (Florian)
 2019-04-16 22:47:56 +02:00
Riccardo Spagni
68d131615e
Merge pull request #5448 
d009f6dd rpc: fix get_block_hashes.bin from wallet on pruned blockchain (moneromooo-monero)
bb0ef5b1 blockchain: lock the blockchain while pruning (moneromooo-monero)
 2019-04-16 22:47:36 +02:00
Riccardo Spagni
c8ce4217cf
Merge pull request #5445 
b18f0b10 wallet: new --offline option (moneromooo-monero)
 2019-04-16 22:46:53 +02:00
Riccardo Spagni
f376cd5605
Merge pull request #5446 
7d79222f daemon: remove debug info (moneromooo-monero)
8fec0f98 functional_tests: add sweep_single test (moneromooo-monero)
9880d61b wallet_rpc_server: remove unused code (moneromooo-monero)
8a61b33d rpc: omit irrelevant fields for pool txes in gettransactions (moneromooo-monero)
56508524 rpc: add relayed in get_transaction output (moneromooo-monero)
82e510f1 rpc: set default log category in core_rpc_server.h (moneromooo-monero)
 2019-04-16 22:46:29 +02:00
Riccardo Spagni
e98cbfbdfe
Merge pull request #5444 
6643b047 Increment m_threads_active when mining thread starts (Doyle)
 2019-04-16 22:45:42 +02:00
Riccardo Spagni
c5f64bf170
Merge pull request #5443 
07dd5536 hardfork: remove "no hf version db" recreation check (moneromooo-monero)
 2019-04-16 22:45:23 +02:00
Riccardo Spagni
213fd5007d
Merge pull request #5442 
428249c5 easylogging++: minimal stdout logging format (moneromooo-monero)
 2019-04-16 22:45:02 +02:00
Riccardo Spagni
8af1a89e4c
Merge pull request #5441 
b3648232 daemon: fix ratio not being floating point (moneromooo-monero)
e1b097b9 core_rpc_server: remove dummy assigning int to bool (moneromooo-monero)
 2019-04-16 22:44:41 +02:00
Riccardo Spagni
1fc20ba48a
Merge pull request #5439 
f26e0b5d cryptonote_protocol: warn when the last connection goes (moneromooo-monero)
 2019-04-16 22:44:19 +02:00
Riccardo Spagni
ac8e2a7819
Merge pull request #5437 
acb68dba bulletproofs: cut down on keyV allocations (moneromooo-monero)
 2019-04-16 22:44:00 +02:00
Riccardo Spagni
e9527f5eed
Merge pull request #5436 
61d63900 net_helper: avoid unnecessary memcpy (moneromooo-monero)
 2019-04-16 22:43:15 +02:00
Riccardo Spagni
b0472c43a1
Merge pull request #5435 
5140c15e daemon: if a log file has a /, interpret it from the cwd (moneromooo-monero)
 2019-04-16 22:42:26 +02:00
Riccardo Spagni
1f01070a0c
Merge pull request #5434 
ccb996af rpc: new sanity check on relayed transactions (moneromooo-monero)
 2019-04-16 22:41:40 +02:00
Riccardo Spagni
c603044398
Merge pull request #5432 
c3cf930f abstract_tcp_server2: fix timeout on exit (moneromooo-monero)
 2019-04-16 22:41:18 +02:00
Riccardo Spagni
8deee24cbb
Merge pull request #5431 
34f8c237 simplewallet: fix warning about long payment id using the old option (moneromooo-monero)
 2019-04-16 22:40:34 +02:00
Riccardo Spagni
35b3d754e8
Merge pull request #5429 
bcb86ae6 wallet_rpc_server: fix inconsistent wallet caches on reload (moneromooo-monero)
 2019-04-16 22:39:37 +02:00
Riccardo Spagni
45e1f7c292
Merge pull request #5428 
f3425f8d rpc.getblocktemplate: set reserved_offset to zero when reserve_size==0 (stoffu)
 2019-04-16 22:39:18 +02:00