aboutsummaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* daemon: print peers' top height in sync_infomoneromooo-monero2017-08-123-2/+8
* protocol: fix reorgs while syncingmoneromooo-monero2017-08-125-289/+48
* Merge pull request #2271Riccardo Spagni2017-08-091-0/+1
|\
| * connection_context: initialize statemoneromooo-monero2017-08-091-0/+1
|/
* Merge pull request #2269Riccardo Spagni2017-08-094-1/+26
|\
| * protocol: add checks for top block hard fork versionmoneromooo-monero2017-08-093-0/+22
| * epee: fixup KV_SERIALIZE_OPT to work in more casesmoneromooo-monero2017-08-091-1/+4
* | Merge pull request #2267Riccardo Spagni2017-08-092-1/+2
|\ \ | |/ |/|
| * net_node: fix m_in_timedsync initializationmoneromooo-monero2017-08-082-1/+2
|/
* Merge pull request #2247Riccardo Spagni2017-08-074-0/+10
|\
| * Wallet API: add tx unlock timeJaquee2017-08-034-0/+10
* | Merge pull request #2263Riccardo Spagni2017-08-071-1/+1
|\ \
| * | cmake: do not use GREATER_EQUAL, it's too newmoneromooo-monero2017-08-071-1/+1
* | | Merge pull request #2231Riccardo Spagni2017-08-0710-63/+67
|\ \ \
| * | | change mixin to ring size in user visible placesmoneromooo-monero2017-08-0710-63/+67
| |/ /
* | | Merge pull request #2262Riccardo Spagni2017-08-071-1/+1
|\ \ \ | |/ / |/| |
| * | core: fix invalid memory access creating txmoneromooo-monero2017-08-071-1/+1
* | | Merge pull request #2225Riccardo Spagni2017-08-073-1/+17
|\ \ \
| * | | blockchain: skip checking tx semantics in embedded block hash rangemoneromooo-monero2017-07-303-1/+17
| | |/ | |/|
* | | Merge pull request #2224Riccardo Spagni2017-08-071-156/+30
|\ \ \
| * | | cmake: Update detection of external miniupnpcErik de Castro Lopo2017-07-301-156/+30
| |/ /
* | | Merge pull request #2207Riccardo Spagni2017-08-075-288/+162
|\ \ \ | |_|/ |/| |
| * | blockchain_import: much faster when verifying with cryptonote::coremoneromooo-monero2017-08-073-287/+152
| * | core: new API to disable DNS checkpoint lookupsmoneromooo-monero2017-08-072-1/+10
* | | Merge pull request #2254Riccardo Spagni2017-08-074-0/+12
|\ \ \
| * | | walletAPI: add getRefreshFromBlockHeight()Jaquee2017-08-052-0/+7
| * | | wallet api: pause refresh while commiting txJaquee2017-08-051-0/+2
| * | | CMakeLists.txt - ios/xcode fixJaquee2017-08-051-0/+3
| | |/ | |/|
* | | Merge pull request #2259Riccardo Spagni2017-08-072-0/+2
|\ \ \ | |_|/ |/| |
| * | updates: add "misc_log_ex.h" for logsmoneromooo-monero2017-08-071-0/+1
| * | dns_utils: add <functional> for std::functionmoneromooo-monero2017-08-071-0/+1
|/ /
* | Merge pull request #2218Riccardo Spagni2017-08-072-3/+145
|\ \
| * | Fix handling of strings & simplify summation of spendkeysJollyMort2017-07-291-13/+7
| * | Add option to join multisig wallet pieces togetherJollyMort2017-07-292-3/+151
| |/
* | Merge pull request #2194Riccardo Spagni2017-08-071-0/+1
|\ \
| * | README: give credit where credit is duemoneromooo-monero2017-07-241-0/+1
| |/
* | Merge pull request #2189Riccardo Spagni2017-08-071-1/+1
|\ \
| * | mlog: fix crash accessing stale data when rotating logsmoneromooo-monero2017-07-221-1/+1
| |/
* | Merge pull request #2149Riccardo Spagni2017-08-0726-184/+1614
|\ \
| * | core: thread most of handle_incoming_txmoneromooo-monero2017-08-074-31/+114
| * | cryptonote_protocol: retry stale spans earlymoneromooo-monero2017-08-073-0/+25
| * | cryptonote_protocol: light cleanupmoneromooo-monero2017-08-072-26/+9
| * | cryptonote_protocol: avoid spurious SYNCHRONIZED OK messagesmoneromooo-monero2017-08-071-2/+12
| * | cryptonote_protocol_handler: sync speedupmoneromooo-monero2017-08-0722-132/+1461
| |/
* | Merge pull request #2138Riccardo Spagni2017-08-073-0/+173
|\ \
| * | Readme: add android docker build instructionMoroccanMalinois2017-07-131-0/+9
| * | Utils: Add dockerfile for android NDK buildMoroccanMalinois2017-07-132-0/+164
* | | Merge pull request #2126Riccardo Spagni2017-08-073-979/+3922
|\ \ \
| * | | italian translationerciccione2017-07-191-0/+2761
| * | | updates monero_fr.tserciccione2017-07-191-488/+581