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
6,729 Commits 9 Branches 69 Tags 295 MiB
c05f98d4c3
Commit Graph

6729 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
moneromooo-monero
c05f98d4c3
README: remove overlooked conflict 2018-09-22 19:07:48 +00:00
Riccardo Spagni
fb47963e09
Merge pull request #4404 
f3cd51a1 cryptonote tweak v2.2 (Lee Clagett)
 2018-09-22 20:32:40 +02:00
Lee Clagett
f3cd51a12b cryptonote tweak v2.2 2018-09-22 03:47:50 +00:00
Riccardo Spagni
7aa5112280
Merge pull request #4411 
e03402b0 wallet_rpc_server: fix build for windows (moneromooo-monero)
 2018-09-21 20:51:39 +02:00
moneromooo-monero
e03402b0c7
wallet_rpc_server: fix build for windows 
Thanks iDunk for building patches on windows
 2018-09-21 18:50:05 +00:00
Riccardo Spagni
b65e236fda
Merge pull request #4405 
8db2d8d4 simplewallet: fix --generate-from-json setting wrong wallet filename (moneromooo-monero)
 2018-09-21 20:46:54 +02:00
Riccardo Spagni
de5631c6be
Merge pull request #4402 
a2505c2f gpg_keys: bump my key validity for two more years (moneromooo-monero)
 2018-09-21 20:46:41 +02:00
Riccardo Spagni
85110b42ab
Merge pull request #4401 
66901901 README: harmonize command formatting inside README.md (Andrea)
8cd98408 disable AES on s390x architecture (Tuan M. Hoang)
4ed30bab wallet: implement coin splitting for sweep_* 'outputs' option (whythat)
24f52396 wallet: add 'outputs' option for sweep_* commands (whythat)
52e19d69 README: Compile boost with cxxflags=-fPIC cflags=-fPIC (Italocoin Project)
0c77523d README: fill in libsodium package name for Arch (phloatingman)
 2018-09-21 20:46:22 +02:00
Riccardo Spagni
fd74815f65
Merge pull request #4399 
f77ce675 rpc: allow pruning of json encoded txs (cryptochangements34)
 2018-09-21 20:46:00 +02:00
Riccardo Spagni
93f473e9f8
Merge pull request #4397 
a4065bf2 Fixes Dockerfile build problem #4396 (OPSXCQ)
 2018-09-21 20:45:48 +02:00
Riccardo Spagni
aa1d321e5f
Merge pull request #4395 
9bf0105e Fixed Keccak implementation on big-endian platforms (Alexandro Sanchez)
 2018-09-21 20:45:23 +02:00
Riccardo Spagni
63eeb9df80
Merge pull request #4394 
b7660149 node_rpc_proxy: return a non empty error string on connection failure (moneromooo-monero)
 2018-09-21 20:44:48 +02:00
Riccardo Spagni
37a306370d
Merge pull request #4388 
05edc969 simplewallet: remove obsolete transfer_original command (moneromooo-monero)
 2018-09-21 20:44:19 +02:00
Riccardo Spagni
bc208be63d
Merge pull request #4385 
6dbbc690 unit_tests: sanity check on transaction weight (moneromooo-monero)
 2018-09-21 20:44:00 +02:00
Riccardo Spagni
14ab2e4db1
Merge pull request #4384 
27af46c9 tests: update test wallet keys file for encrypted keys (moneromooo-monero)
 2018-09-21 20:43:32 +02:00
Riccardo Spagni
85d731c66d
Merge pull request #4382 
ff72200d update readme fork table (Gingeropolous)
 2018-09-21 20:43:16 +02:00
Riccardo Spagni
4a652d6b52
Merge pull request #4379 
607301bf rct: avoid repeated unnecessary conversions when accummulating (moneromooo-monero)
 2018-09-21 20:42:41 +02:00
Riccardo Spagni
0645dcdbdb
Merge pull request #4378 
ac934663 rpc: add a "is an update available" flag in get_info (moneromooo-monero)
 2018-09-21 20:41:53 +02:00
Riccardo Spagni
b88bbf59c3
Merge pull request #4377 
4d52ec0c mlog: do not display http errors by default (moneromooo-monero)
 2018-09-21 20:41:17 +02:00
Riccardo Spagni
dc9a69d980
Merge pull request #4376 
2ace509a simplewallet: print reason why refresh+password is needed (moneromooo-monero)
 2018-09-21 20:40:46 +02:00
Riccardo Spagni
629db71593
Merge pull request #4373 
4f81cd3a rpc: add cumulative difficulty in block header data (moneromooo-monero)
 2018-09-21 20:40:23 +02:00
Riccardo Spagni
a059bcd74e
Merge pull request #4371 
55c7cd14 Adding expect<T> - a value-or-error implementation (Lee Clagett)
 2018-09-21 20:31:47 +02:00
Riccardo Spagni
d6893aedf6
Merge pull request #4369 
b2bb9312 blockchain: simplify output distribution code (moneromooo-monero)
befdcbf4 db_lmdb: do not use base for cumulative distribution (moneromooo-monero)
 2018-09-21 20:31:21 +02:00
Riccardo Spagni
90d1a00c10
Merge pull request #4266 
bce474be query backing device (m2049r)
 2018-09-21 20:31:04 +02:00
Riccardo Spagni
bb3ff2bb36
Merge pull request #4209 
26a42fe5 Added features to epee::span<T> :   - Support for classes   - Added `remove_prefix` function   - Added `to_mut_span` and `as_mut_byte_span` (Lee Clagett)
 2018-09-21 20:30:36 +02:00
moneromooo-monero
8db2d8d416
simplewallet: fix --generate-from-json setting wrong wallet filename 2018-09-19 20:22:46 +00:00
m2049r
bce474be7d
query backing device 2018-09-19 18:25:38 +02:00
moneromooo-monero
a2505c2fcc
gpg_keys: bump my key validity for two more years 2018-09-19 07:50:49 +00:00
Riccardo Spagni
bad2c7cf31
Merge pull request #4391 
e9bce045 Fix missing std::runtime_error def in difficulty.cpp (Howard Chu)
 2018-09-18 18:00:18 +02:00
Riccardo Spagni
2371a814cf
Merge pull request #4387 
6e6ffc06 wallet2_api: bring up to latest wallet api (moneromooo-monero)
 2018-09-18 17:59:44 +02:00
Riccardo Spagni
68dcf73de2
Merge pull request #4366 
67a56a9f rctTypes: fix incorrect serialization (stoffu)
 2018-09-18 17:59:20 +02:00
Riccardo Spagni
535bd0eb7e
Merge pull request #4361 
26971d46 WalletAPI: 'hasMultisigPartialKeyImages' function added (naughtyfox)
 2018-09-18 17:58:53 +02:00
Riccardo Spagni
08f0c60ffc
Merge pull request #4360 
7a76354c wallet2: import_multisig forward refresh exception (naughtyfox)
 2018-09-18 17:58:14 +02:00
Riccardo Spagni
df98bc50a6
Merge pull request #4357 
8501b8df crypto_ops_builder: link to EdDSA/Ed25519 draft RFC (moneromooo-monero)
 2018-09-18 17:57:45 +02:00
Riccardo Spagni
f9d97f3fec
Merge pull request #4356 
89202ce4 Docker android: add libsodium (MoroccanMalinois)
e774f249 Docker android: use common prefix (MoroccanMalinois)
 2018-09-18 17:57:17 +02:00
Riccardo Spagni
9d0565615c
Merge pull request #4354 
03c07b16 rpc: return "already mining" in start_mining if already mining (moneromooo-monero)
 2018-09-18 17:56:51 +02:00
Riccardo Spagni
7781675f22
Merge pull request #4349 
7418aa60 README: bump cmake requirement to 3.5, as required by miniupnpc (moneromooo-monero)
 2018-09-18 17:55:51 +02:00
Riccardo Spagni
0ff0850545
Merge pull request #4344 
cd647612 rpc: don't include start time if restricted (moneromooo-monero)
 2018-09-18 17:54:25 +02:00
Riccardo Spagni
7ab49f96ad
Merge pull request #4341 
e6117282 daemon: request no PoW hashes we don't need when asking for blocks (moneromooo-monero)
 2018-09-18 17:39:56 +02:00
Riccardo Spagni
22a6591a70
Merge pull request #4325 
4e1e9a60 blockchain: add mainnet v8 height targetting 18 october (moneromooo-monero)
 2018-09-18 17:39:16 +02:00
Riccardo Spagni
4a1744e93e
Merge pull request #4322 
9a66d9f4 Docker: Updated dependencies cmake 3.12.1 and boost 1.68 (HomDx)
 2018-09-18 17:37:50 +02:00
Riccardo Spagni
3cfa45cc7d
Merge pull request #4317 
76f95f05 rpc: allow to pass RPC login via RPC_LOGIN env var (Dusan Klinec)
 2018-09-18 17:36:43 +02:00
Riccardo Spagni
e468d541b4
Merge pull request #4311 
f0bc684c mnemonics: fix outrageous compile time with CLANG in release (moneromooo-monero)
 2018-09-18 17:36:13 +02:00
Riccardo Spagni
580497d5f9
Merge pull request #4306 
56b50faa wallet: use wipeable_string in more places where a secret is used (moneromooo-monero)
07ec748c wipeable_string: add hex_to_pod function (moneromooo-monero)
 2018-09-18 17:32:11 +02:00
Riccardo Spagni
b174527f1d
Merge pull request #4302 
ba8dd347 api/wallet: properly disable key encryption (stoffu)
 2018-09-18 17:31:35 +02:00
Riccardo Spagni
b4a9ebad6c
Merge pull request #4299 
f9b22a7b hw_device: support for multiple devices added [for review] (Dusan Klinec)
 2018-09-18 17:29:26 +02:00
Riccardo Spagni
728a947646
Merge pull request #4273 
c336d0f2 add daemonizer to rpc wallet (jcktm)
 2018-09-18 16:40:04 +02:00
Riccardo Spagni
9c40bc62fc
Merge pull request #3430 
42397359 Fixup 32bit arm build (TheCharlatan)
a06d2581 Fix Windows build (TheCharlatan)
ecaf5b3f Add libsodium to the packages, the arm build was complaining about it. (TheCharlatan)
cbbf4d24 Adapt translations to upstream changes (TheCharlatan)
db571546 Updated pcsc url (TheCharlatan)
f0ba19fd Add lrelease to the depends (TheCharlatan)
cfb30462 Add Miniupnp submodule (TheCharlatan)
5f7da005 Unbound is now a submodule. Adapt depends for this. (TheCharlatan)
d6b9bdd3 Update readmes to reflect the usage of depends (TheCharlatan)
56b6e41e Add support for apple and arm building (TheCharlatan)
29311fd1 Disable stack unwinding for mingw32 depends build. (TheCharlatan)
8db3d573 Modify depends for monero's dependencies (TheCharlatan)
0806a23a Initial depends addition (TheCharlatan)
 2018-09-18 16:33:21 +02:00
Andrea
669019010e
README: harmonize command formatting inside README.md 
rebased by moneromooo
 2018-09-18 11:02:10 +00:00
Tuan M. Hoang
8cd9840859
disable AES on s390x architecture 
rebased by moneromooo
 2018-09-18 11:02:06 +00:00