Mirrors
/
monero
mirror of https://github.com/monero-project/monero.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
3,501 Commits 9 Branches 69 Tags 229 MiB
Commit Graph

3501 Commits

Author SHA1 Message Date
Timothy D. Prime 32d7d04858 fixes #1688 protect make debug-test from gtest 
In simple terms, add_subdirectory() is replaced with ExternalProject_Add().

This change is inspired by https://crascit.com/2015/07/25/cmake-gtest/
with one difference, no download, using the source we already have.

Before this change, make debug-test must be preceded by make clean.
Otherwise, a subsequent build would be polluted by cmake options made
by tests/gtest/.

Also removed the changed compiler flags.  My test build did not have
the affected warnings.
 2017-02-08 12:38:41 -08:00
Riccardo Spagni 99ee3fd17e
Merge pull request #1679 
4efc926d Wallet API: Catch error from tools::is_local_address (Jaquee)
 2017-02-08 12:53:57 +02:00
Riccardo Spagni 8d1562077f
Merge pull request #1678 
c833a39a cmake set atomic for android (MoroccanMalinois)
 2017-02-08 12:53:19 +02:00
Riccardo Spagni d30b64f457
Merge pull request #1674 
92978b2c common: fix link error on at least one platform (no clue which one) (moneromooo-monero)
 2017-02-08 12:51:11 +02:00
Riccardo Spagni 30e38cd6a3
Merge pull request #1683 
bab1e9a3  bugfix: infinite recursion in get_account_address_from_str_or_url (kenshi84)
 2017-02-08 12:48:54 +02:00
kenshi84 bab1e9a397 bugfix: infinite recursion in get_account_address_from_str_or_url 2017-02-05 23:20:16 +09:00
Riccardo Spagni 3473af00ad
Merge pull request #1655 
b14d109b update wallet api tests (Jaquee)
0cc50bdd GUI: Improved refresh performance (Jaquee)
805625b5 wallet api: Remove initAsync() and don't start refresh automatically on init (Jaquee)
031b060a wallet2::init() - disconnect before init if connected Makes it possible for GUI to reinit with new daemon without closing and reopening wallet. (Jaquee)
 2017-02-05 13:42:41 +02:00
moneromooo-monero 92978b2c0f
common: fix link error on at least one platform (no clue which one) 
Bug and fix reported by tdprime
 2017-02-05 10:55:55 +00:00
Jaquee 4efc926d28
Wallet API: Catch error from tools::is_local_address 2017-02-05 11:08:05 +01:00
MoroccanMalinois c833a39a4d cmake set atomic for android 2017-02-05 04:33:33 +01:00
Jaquee b14d109bae
update wallet api tests 2017-02-04 23:25:10 +01:00
Jaquee 0cc50bdd11 GUI: Improved refresh performance 2017-02-04 23:25:05 +01:00
Jaquee 805625b541 wallet api: Remove initAsync() and don't start refresh automatically on init 2017-02-04 23:25:03 +01:00
Jaquee 031b060af0 wallet2::init() - disconnect before init if connected 
Makes it possible for GUI to reinit with new daemon without closing and reopening wallet.
 2017-02-04 23:10:20 +01:00
Riccardo Spagni e56bf442c3
Merge pull request #1669 
4f5b130d wallet_rpc_server: add address book RPC calls (moneromooo-monero)
 2017-02-04 17:28:53 +02:00
Riccardo Spagni 9547e79af5
Merge pull request #1670 
c3d7a198 mlog: probable fix for gmtime_r not being available on windows (moneromooo-monero)
 2017-02-04 17:28:23 +02:00
Riccardo Spagni 5da4650cba
Merge pull request #1671 
cd34fc65 Use easylogging++'s stack trace facility where possible (moneromooo-monero)
 2017-02-04 17:27:54 +02:00
Riccardo Spagni 602f31d187
Merge pull request #1672 
cbdfa757 mlog: fix default logging being not verbose enough (moneromooo-monero)
 2017-02-04 17:27:19 +02:00
Riccardo Spagni c3c281e699
Merge pull request #1666 
03ff3639 Fix missing parentheses (Miguel Herranz)
 2017-02-04 17:26:19 +02:00
Riccardo Spagni bcb7b0a9af
Merge pull request #1665 
34719071 simplewallet: cleanup (moneromooo-monero)
a9a9b64b simplewallet: fix build (unqualified type not in current scope) (moneromooo-monero)
 2017-02-04 17:21:11 +02:00
Riccardo Spagni eb21389953
Merge pull request #1664 
b5cb8861 core: fix integrated addresses breaking with auto zero change (moneromooo-monero)
 2017-02-04 17:20:02 +02:00
Riccardo Spagni 31cf4e7362
Merge pull request #1640 
f97526e6 simplewallet: option to always ask password for any crytical operations (kenshi84)
 2017-02-04 17:18:38 +02:00
moneromooo-monero cbdfa7576a
mlog: fix default logging being not verbose enough 2017-02-04 12:43:19 +00:00
moneromooo-monero cd34fc655d
Use easylogging++'s stack trace facility where possible 
This avoids using libunwind, which often causes trouble.
 2017-02-04 12:33:03 +00:00
moneromooo-monero c3d7a198bf
mlog: probable fix for gmtime_r not being available on windows 2017-02-04 11:48:58 +00:00
moneromooo-monero 4f5b130de9
wallet_rpc_server: add address book RPC calls 2017-02-04 11:40:49 +00:00
kenshi84 f97526e641 simplewallet: option to always ask password for any crytical operations 2017-02-03 09:38:12 +09:00
Miguel Herranz 03ff363982 Fix missing parentheses 2017-02-02 22:05:31 +01:00
moneromooo-monero 3471907160
simplewallet: cleanup 
Remove empty static function which was refactored, as well as
leftover exception testing code.
 2017-02-02 20:56:53 +00:00
moneromooo-monero a9a9b64b13
simplewallet: fix build (unqualified type not in current scope) 2017-02-02 20:56:31 +00:00
moneromooo-monero b5cb8861c7
core: fix integrated addresses breaking with auto zero change 
Zero change is sent to a random address, which confuses the code
which determines which key to use to encrypt the payment id.
Ignore zero amounts for this purpose, so the payment id gets
encrypted with the real destination's key.
 2017-02-02 20:53:12 +00:00
Riccardo Spagni b01990124e
Merge pull request #1663 
bbcc3a12 Add missing include (Miguel Herranz)
 2017-02-02 22:41:58 +02:00
Riccardo Spagni fcb299b4ae
Merge pull request #1641 
ca94d0a4 Separate data per P2P port (Miguel Herranz)
 2017-02-02 22:41:28 +02:00
Riccardo Spagni da9174c8ee
Merge pull request #1656 
edfd7f6e Workaround VL32 cursor refcounting miscount (Howard Chu)
 2017-02-02 21:39:03 +02:00
Riccardo Spagni f4fe39ca92
Merge pull request #1654 
084aef70 Added days uptime to the status message (NanoAkron)
 2017-02-02 21:38:15 +02:00
Riccardo Spagni 58c87786ae
Merge pull request #1652 
fba9332d Changed console output for transaction from L0 to L1 (NanoAkron)
 2017-02-02 21:36:56 +02:00
Riccardo Spagni 345396e056
Merge pull request #1651 
fc91e6a7 Fixed a deadlock issue with easylogger++ (NanoAkron)
 2017-02-02 21:36:07 +02:00
Riccardo Spagni 011c5a8a7c
Merge pull request #1647 
2bf029be wallet2: fix corner case failing to send a second output (moneromooo-monero)
 2017-02-02 21:35:31 +02:00
Riccardo Spagni 3aa008e4c6
Merge pull request #1646 
95f3e193 Update and use blockchain data files defines (Miguel Herranz)
 2017-02-02 21:34:31 +02:00
Riccardo Spagni 10b625079b
Merge pull request #1645 
9bd9906e Factor is_address_local code into a tools function (moneromooo-monero)
 2017-02-02 21:27:45 +02:00
Riccardo Spagni 614400e5af
Merge pull request #1643 
69d2ad39 wallet_rpc_server: fix logs going to the wrong file (moneromooo-monero)
 2017-02-02 21:26:56 +02:00
Riccardo Spagni c3eff820be
Merge pull request #1642 
3ae79a59 core: set missing verifivation_failed flag when rejecting a tx (moneromooo-monero)
ea6549e9 core_tests: decrease trace level from trace to debug (moneromooo-monero)
 2017-02-02 21:25:30 +02:00
Riccardo Spagni ab2b3480b2
Merge pull request #1639 
48aa9cf0 Add change_password for simplewallet (Ashley Perpetual)
 2017-02-02 21:22:30 +02:00
Riccardo Spagni 72aa788a0e
Merge pull request #1636 
cc1462e0 Add concurrency check to rpc mining to ensure not too many threads. number of cores times 4 or 257. (Ashley Perpetual)
 2017-02-02 21:12:13 +02:00
Miguel Herranz bbcc3a125f Add missing include 
Fails to build without it.
 2017-02-02 19:54:17 +01:00
Riccardo Spagni 5bb95fc613
Merge pull request #1634 
99f58437 Fix invalid + of std::string and int (Timothy D. Prime)
 2017-02-02 19:43:05 +02:00
Riccardo Spagni a6f61b8419
Merge pull request #1631 
58e82506 Blockfill - Sort tx pool correctly (Alexis Enston)
5f7a8741 Blockfill - Take TX fees into account properly (Alexis Enston)
4ecab0d8 Consider empty block when filling with TXs (Alexis Enston)
 2017-02-02 19:41:25 +02:00
Riccardo Spagni 5fb3f97a55
Merge pull request #1629 
c02e1cb9 Updates to epee HTTP client code   - http_simple_client now uses std::chrono for timeouts   - http_simple_client accepts timeouts per connect / invoke call   - shortened names of epee http invoke functions   - invoke command functions only take relative path, connection     is not automatically performed (Lee Clagett)
 2017-02-02 19:32:01 +02:00
Riccardo Spagni 10bf54bfc9
Merge pull request #1628 
66665003 Clear feedback to user when daemon has stopped successfully (NanoAkron)
 2017-02-02 18:44:41 +02:00
Riccardo Spagni ca2e2c2453 Merge pull request #1627 
55a8e982 moved get_account_address_from_str_or_url from libcommon to libcryptonote_core (kenshi84)
 2017-02-02 18:24:08 +02:00