Git-Mirrors/monero
1
0
Fork 0
mirror of https://github.com/monero-project/monero.git synced 2024-12-29 15:06:11 -05:00
Code Issues Packages Projects Releases Wiki Activity
9,477 Commits 9 Branches 69 Tags 295 MiB
99684e3ec3
Commit Graph

9477 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
jebes
dfed3d39b6 Merge remote-tracking branch 'upstream/master' 2014-09-11 10:20:55 -04:00
jebes
9d6f9335d1 HOW DO I GIT? 2014-09-11 10:20:17 -04:00
jebes
a70bf86037 Documented varint 2014-09-11 10:14:05 -04:00
Riccardo Spagni
8779a6da39 Merge pull request #128 from fluffypony/master 
fixed UPNP_LIBRARIES scope
 2014-09-11 13:30:24 +02:00
fluffypony
b35c1e2491 fixed UPNP_LIBRARIES scope 2014-09-11 13:28:49 +02:00
Riccardo Spagni
6a70de32bf Merge pull request #127 from fluffypony/master 
FreeBSD compatibility and default log level changes
 2014-09-11 12:00:30 +02:00
fluffypony
a40d5c1847 cpu affinity fixes in performance tests for FreeBSD 2014-09-11 11:42:59 +02:00
fluffypony
afc61dda45 gtest patches for FreeBSD 2014-09-11 10:02:24 +02:00
fluffypony
3217ed39ae fixed upnp libs in tests cmake 2014-09-11 08:28:28 +02:00
fluffypony
d21cf293e1 added license to CMake 2014-09-11 08:25:07 +02:00
fluffypony
36c7ea9f77 more CMake tweaks to allow detection on OS X 2014-09-11 08:22:49 +02:00
fluffypony
8d8b47e69f more dynamic miniupnp fixes 2014-09-10 20:01:30 +02:00
fluffypony
59c0423eae miniupnpc includes fixed 2014-09-10 18:22:20 +02:00
fluffypony
7d01dad8f4 use external miniupnpc if available 2014-09-10 18:14:57 +02:00
fluffypony
81490d2aea miniupnpc changes for freebsd 2014-09-10 14:19:42 +02:00
fluffypony
ccb2ab2b7b mmap on FreeBSD doesn't have MAP_HUGETLB 2014-09-10 14:01:39 +02:00
fluffypony
110f110181 Include sys/time.h on BSD 2014-09-10 13:58:43 +02:00
fluffypony
a8d043b6dd replace ftime with gettimeofday on FreeBSD because lcompat is stupid 2014-09-10 13:55:39 +02:00
fluffypony
0e343ecfdf make FreeBSD use -lcompat till we can fix ftime() 2014-09-10 13:25:34 +02:00
jebes
c085e9294f commented util.h 2014-09-09 20:18:23 -04:00
fluffypony
266c639f4f more FreeBSD fixes 2014-09-09 14:49:13 +02:00
fluffypony
e1d31e0a8b malloc.h reference fixed for FreeBSD 2014-09-09 14:07:57 +02:00
fluffypony
5a65991480 exclude local miniupnpc for FreeBSD, install from ports instead 2014-09-09 14:03:42 +02:00
fluffypony
6afbdd9754 FreeBSD alloca.h reference fixed 2014-09-09 12:37:19 +02:00
fluffypony
4ba680f294 a few more error messages moved to log level 1 2014-09-09 12:28:16 +02:00
fluffypony
cf5a8b1d6c moved non-critical warnings and errors to log level 1 2014-09-09 11:32:00 +02:00
Riccardo Spagni
bf972c40fc Merge pull request #123 from fluffypony/master 
build number increase after release
 2014-09-07 08:38:54 +02:00
fluffypony
4290c78160 build number increase after release 2014-09-07 08:33:41 +02:00
Riccardo Spagni
3c2b74215b Merge pull request #121 from fluffypony/master 
Fix tree_hash, patch for bad block 202612
 2014-09-06 21:57:37 +02:00
iamsmooth
0a9f2f5236 fix checkpoints 2014-09-06 21:56:39 +02:00
iamsmooth
07680e553f bug fix to checkpoint-on-restore; still fails on 612 2014-09-06 21:56:34 +02:00
iamsmooth
480cf9668f checkpoints on restore; currently fails on 212 checkpoint 2014-09-06 21:56:29 +02:00
rfree2monero
2ef0aee81d Fix tree-hash cnt n^2. Asserts, comment. Squash2 2014-09-06 21:56:24 +02:00
Thomas Winget
c05489938f override for get_block_longhash for block 202612 2014-09-06 21:56:18 +02:00
Thomas Winget
9a16bb9936 added double-check for 202612 block id 
if a new block has the same block id as 202612 but the wrong blobdata,
this will tell the caller that the block id is actually null_hash rather
than the 202612 block id.
 2014-09-06 21:56:12 +02:00
Thomas Winget
115f9523fa hex_to_pod needs the destination as an arg, as opposed to it returning the pod 2014-09-06 21:56:06 +02:00
Thomas Winget
a544603a7b Override for block hashing for block 202612 
Since we need to fix tree_hash, but doing so would invalidate the block
id for block 202612, this fix should check to see if we're trying to get
the block id for 202612 (if its blob hash matches) and return the "old"
block id, for backwards compatibility.
 2014-09-06 21:54:58 +02:00
Riccardo Spagni
1d6372cccf Merge pull request #112 from fluffypony/master 
fixed OS X malloc.h reference
 2014-09-02 12:20:15 +02:00
fluffypony
f8025cada9 fixed OS X malloc.h reference 2014-09-02 12:08:27 +02:00
Riccardo Spagni
0c9e3ea913 Merge pull request #109 from fluffypony/master 
readme -> markdown
 2014-08-30 08:59:54 +02:00
fluffypony
8e122401c9 readme -> markdown 2014-08-30 08:58:01 +02:00
fluffypony
6f04cdbd07 bumped build number 2014-08-25 18:54:48 +02:00
Riccardo Spagni
1b8a68f6c1 Merge pull request #104 from fluffypony/master 
Fees temporarily bumped to 0.1 XMR per tx to prevent spam attack
 2014-08-23 23:12:39 +02:00
fluffypony
1829966fea quick additional patch 2014-08-23 22:43:13 +02:00
fluffypony
db69298b95 quick fee ramp to prevent spam attack 2014-08-23 22:21:18 +02:00
Riccardo Spagni
43c013a57f Merge pull request #86 from jakoblind/seed 
Query view key and seed
 2014-08-05 09:43:39 +02:00
Jakob Lind
67b91ea769 added view_key to wallet RPC command query_key 2014-08-05 08:57:08 +02:00
Jakob Lind
da523f30fc added viewkey command to CLI 2014-08-05 08:53:30 +02:00
Jakob Lind
0c3255ead8 query_key command in wallet rpc. 
only support mnemonic as key_type currently
 2014-08-05 08:17:23 +02:00
Jakob Lind
2ba77629ad refactoring. get seed code in wallet2 2014-08-03 16:58:21 +02:00