Git-Mirrors/monero
1
0
Fork 0
mirror of https://github.com/monero-project/monero.git synced 2024-12-28 20:06:11 -05:00
Code Issues Packages Projects Releases Wiki Activity
6,893 Commits 9 Branches 69 Tags 295 MiB
68e9744d44
Commit Graph

6893 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
xiphon
68e9744d44 simplewallet: perform trivial error checks before password prompt 2018-10-10 20:01:04 +00:00
Riccardo Spagni
77e1ebff26
Merge pull request #4543 
bf60e98a fix version changes on master (Riccardo Spagni)
 2018-10-09 23:03:01 +02:00
Riccardo Spagni
bf60e98abc
fix version changes on master 2018-10-09 22:36:44 +02:00
Riccardo Spagni
c23b6f8f56
Merge pull request #4540 
8833aec0 wallet2: fix cold signing using non padded bulletproofs (moneromooo-monero)
 2018-10-09 16:43:01 +02:00
Riccardo Spagni
9349f9ece7
Merge pull request #4517 
02c2b43a Utils: Add Dockerfile for android 64-bit build (Gregory Lemercier)
 2018-10-09 16:42:43 +02:00
Riccardo Spagni
0c135c9420
Merge pull request #4535 
c716a331 device: increase ledger timeout to 2 minutes (selsta)
 2018-10-09 16:42:30 +02:00
Riccardo Spagni
18318e0dbc
Merge pull request #4538 
bd7b800f device_io_hid: fix DEFAULT_* type (too short) and init time (moneromooo-monero)
 2018-10-09 16:42:16 +02:00
moneromooo-monero
8833aec083
wallet2: fix cold signing using non padded bulletproofs 
This code was deciding which bulletproof configuration to use
based on ptx which weren't created yet.
 2018-10-09 14:32:38 +00:00
Gregory Lemercier
02c2b43a72 Utils: Add Dockerfile for android 64-bit build 2018-10-09 15:58:18 +02:00
moneromooo-monero
bd7b800f0a
device_io_hid: fix DEFAULT_* type (too short) and init time 2018-10-09 08:18:50 +00:00
selsta
c716a331f3
device: increase ledger timeout to 2 minutes 2018-10-09 02:17:40 +02:00
Riccardo Spagni
31155115d2
Merge pull request #4532 
8f22e808 device: destroy device objects on exit (moneromooo-monero)
 2018-10-08 22:30:50 +02:00
Riccardo Spagni
d6dbb6601b
Merge pull request #4530 
77471e23 blockchain_blackball: fix stray ! (moneromooo-monero)
 2018-10-08 22:05:29 +02:00
Riccardo Spagni
6a7cd09685
Merge pull request #4529 
c95a1408 CMakeLists.txt: Fix typo (erciccione)
 2018-10-08 22:05:15 +02:00
Riccardo Spagni
91c6725b88
Merge pull request #4527 
c5a97315 Remove last traces of libpcsc-lite (moneromooo-monero)
 2018-10-08 22:04:45 +02:00
Riccardo Spagni
68f5f20c5d
Merge pull request #4519 
17701864 Depends: build hidapi with -fPIC (iDunk5400)
 2018-10-08 22:02:11 +02:00
Riccardo Spagni
ac5674524a
Revert "Merge pull request #4472" 
This reverts commit 79d46c4d55, reversing
changes made to c9fc61dbb5.
 2018-10-08 21:39:54 +02:00
moneromooo-monero
8f22e80865
device: destroy device objects on exit 2018-10-08 19:22:31 +00:00
moneromooo-monero
77471e23bd
blockchain_blackball: fix stray ! 2018-10-08 17:37:31 +00:00
erciccione
c95a14088c
CMakeLists.txt: Fix typo 2018-10-08 18:33:16 +01:00
moneromooo-monero
c5a97315ee
Remove last traces of libpcsc-lite 2018-10-08 14:22:10 +00:00
Riccardo Spagni
3f2bfe87f7
Merge pull request #4514 
85e58cb2 blockchain_blackball: fix stats double counting (moneromooo-monero)
 2018-10-08 13:02:33 +02:00
iDunk5400
17701864c4
Depends: build hidapi with -fPIC 2018-10-08 12:50:04 +02:00
moneromooo-monero
85e58cb24a
blockchain_blackball: fix stats double counting 2018-10-08 08:55:56 +00:00
Riccardo Spagni
e19652df51
Merge pull request #4036 
9acf42d3 Multisig M/N functionality core tests added (naughtyfox)
9f3963e8 Arbitrary M/N multisig schemes: * support in wallet2 * support in monero-wallet-cli * support in monero-wallet-rpc * support in wallet api * support in monero-gen-trusted-multisig * unit tests for multisig wallets creation (naughtyfox)
 2018-10-07 19:57:26 +02:00
Riccardo Spagni
890824dbc0
Merge pull request #4510 
21a624af Consolidate HID depends makefiles into single recipe (TheCharlatan)
 2018-10-07 19:51:09 +02:00
Riccardo Spagni
ad99a35d6b
Merge pull request #4511 
f9485a36 tests: update crypto tests data file after PRNG changes (moneromooo-monero)
 2018-10-07 19:50:45 +02:00
moneromooo-monero
f9485a36cf
tests: update crypto tests data file after PRNG changes 2018-10-07 17:44:02 +00:00
TheCharlatan
21a624af23 Consolidate HID depends makefiles into single recipe 
Make sure all required dependencies are linked statically, by only
providing the static libraries.
 2018-10-07 19:16:22 +02:00
Riccardo Spagni
533d31d050
Merge pull request #4509 
0656050f README: update MSYS2 dependencies for Ledger (Lafudoci)
 2018-10-07 18:59:06 +02:00
Riccardo Spagni
7189d699d1
Merge pull request #4508 
3d722db4 wallet-cli: Update French translation (Guillaume LE VAILLANT)
 2018-10-07 18:58:32 +02:00
Riccardo Spagni
9da6d2969b
Merge pull request #4506 
cbdd6b91 Linux: Fix building of static binaries with hw device support (iDunk5400)
 2018-10-07 18:58:00 +02:00
Riccardo Spagni
757704f0c7
Merge pull request #4505 
977df631 Fix some calls to the translation function (Guillaume LE VAILLANT)
 2018-10-07 18:57:26 +02:00
Riccardo Spagni
e67cb38e5a
Merge pull request #4501 
fb3593c2 Add check if submodules need to be updated (TheCharlatan)
 2018-10-07 18:57:10 +02:00
Lafudoci
0656050f76 README: update MSYS2 dependencies for Ledger 2018-10-07 10:15:30 +08:00
iDunk5400
cbdd6b910b
Linux: Fix building of static binaries with hw device support 
This should enable building static binaries on Linux systems where dependencies are already built with -fPIC, such as Ubuntu 18.04.
 2018-10-06 16:48:14 +02:00
Guillaume LE VAILLANT
3d722db487 wallet-cli: Update French translation 2018-10-06 16:23:52 +02:00
Guillaume LE VAILLANT
977df6315f Fix some calls to the translation function 
Some strings were not detected by lupdate because "tr() cannot be called without
context".
 2018-10-06 10:26:06 +02:00
TheCharlatan
fb3593c22e Add check if submodules need to be updated 
Adds CMake check that pulls from the different git remotes and checks if
there is any output.
 2018-10-05 23:54:49 +02:00
Riccardo Spagni
79d46c4d55
Merge pull request #4472 
02d3ef7b blocks: use auto-generated .c files instead of 'LD -r -b binary' (xiphon)
 2018-10-05 23:13:32 +02:00
Riccardo Spagni
c9fc61dbb5
Merge pull request #4495 
34a85e0c wallet2: disable height based segregation (moneromooo-monero)
 2018-10-05 23:13:15 +02:00
Riccardo Spagni
21960a5b5a
Merge pull request #4499 
c5928bde wallet2_api: fix build with C++14 (moneromooo-monero)
 2018-10-05 23:12:57 +02:00
Riccardo Spagni
445d9c86f2
Merge pull request #4390 
a0613532 secure_pwd_reader: Add proper Unicode handling [Ryo contribution] (fireice-uk)
579383c2 simplewallet: Add Unicode input_line [Ryo backport] (fireice-uk)
 2018-10-05 23:12:42 +02:00
Riccardo Spagni
1e0ccf53bb
Merge pull request #4492 
7f2ad1a7 functional_tests: fix linking on Windows (iDunk5400)
 2018-10-05 23:12:26 +02:00
Riccardo Spagni
6762897f70
Merge pull request #4487 
7c790f11 Fix rtxn usage in BlockchainLMDB::get_estimated_batch_size (Howard Chu)
 2018-10-05 23:12:11 +02:00
fireice-uk
a061353254 secure_pwd_reader: Add proper Unicode handling [Ryo contribution] 2018-10-04 19:31:59 +01:00
moneromooo-monero
c5928bdec6
wallet2_api: fix build with C++14 2018-10-04 13:42:01 +00:00
xiphon
02d3ef7bda blocks: use auto-generated .c files instead of 'LD -r -b binary' 2018-10-04 00:01:09 +00:00
moneromooo-monero
34a85e0cc3
wallet2: disable height based segregation 
It can still be enable via DNS if a key reusing fork pops up
 2018-10-03 20:44:48 +00:00
iDunk5400
7f2ad1a768
functional_tests: fix linking on Windows 2018-10-03 01:06:03 +02:00