Commit graph

1158 commits

Author SHA1 Message Date
Riccardo Spagni
fa4078f38c
Merge pull request #459
40540cb Save custom log categories to persistent settings (moneromooo.monero)
2017-02-08 12:43:29 +02:00
Riccardo Spagni
e145793d2f
Merge pull request #458
8a0163f don't show daemon popup when connected (Jaquee)
2017-02-08 12:43:04 +02:00
Riccardo Spagni
36cd7a625f
Merge pull request #456
fb743a0 main: mixin 4 is ring size 5, not 41... (moneromooo.monero)
2017-02-08 12:42:28 +02:00
Riccardo Spagni
3640bedeee
Merge pull request #454
168e354 replace nbsp with ascii equivalent (Jaquee)
2017-02-08 12:40:36 +02:00
Riccardo Spagni
2901a33698 Merge pull request #440
78302be IOS specific settings (Jaquee)
c6dc9a2 IOS build settings (Jaquee)
2017-02-08 12:39:11 +02:00
MoroccanMalinois
4bcfe63c57 build libepee if monerod skipped 2017-02-07 01:52:01 +00:00
Jaquee
02ab113762
clear payment fields after transfer 2017-02-05 20:26:58 +01:00
Jaquee
16be0ee344
wizard: field bg color 2017-02-05 20:24:16 +01:00
Jaquee
78302be193
IOS specific settings 2017-02-05 15:22:43 +01:00
Jaquee
c6dc9a20e7 IOS build settings 2017-02-05 15:22:03 +01:00
Jaquee
756a821f41 Wizard: clear restore from keys fields on wizard restart 2017-02-05 14:04:50 +01:00
Jaquee
8a0163f14a
don't show daemon popup when connected 2017-02-05 13:49:25 +01:00
moneromooo.monero
40540cb38a Save custom log categories to persistent settings 2017-02-05 12:38:43 +00:00
moneromooo.monero
fb743a0532 main: mixin 4 is ring size 5, not 41... 2017-02-04 20:20:06 +00:00
Jaquee
168e3544d0
replace nbsp with ascii equivalent 2017-02-04 19:00:20 +01:00
Riccardo Spagni
979acf774a
Merge pull request #453
b80d949 remove &nbsp from french translation (Jaquee)
2017-02-04 19:33:35 +02:00
Jaquee
b80d9498ef
remove &nbsp from french translation 2017-02-04 18:26:47 +01:00
Riccardo Spagni
6965b0af19
Merge pull request #451
8060307 wizard: fix focus (Jaquee)
2017-02-04 17:47:45 +02:00
Riccardo Spagni
99230e3ff1
Merge pull request #443
7ab3373 use gmake on bsd in build.sh (pigeons)
2017-02-04 17:47:27 +02:00
Riccardo Spagni
739d24efb4
Merge pull request #442
0b41fbc Don't close/reopen when changing daemon requires #1655 (Jaquee)
2586404 sync progress improvements (Jaquee)
eb909e1 async connectionStatus and init (Jaquee)
cb3281d WalletManager: fix possible race (Jaquee)
9dbbd4c WalletManager: check connection before isMining() (Jaquee)
2017-02-04 17:46:57 +02:00
Riccardo Spagni
f2a583fd49
Merge pull request #433
faeead2 Better placeholders (xmr-eric)
9425b77 Payment ID Placeholder: 64 characters only (xmr-eric)
ce87a1c Added AddressBook.qml placeholders (xmr-eric)
2017-02-04 17:44:47 +02:00
Riccardo Spagni
488e4e2b86
Merge pull request #430
4e2e262 Main.qml: Ringsize equals mixin +1 (xmr-eric)
f1327ac Ringsize equals mixin +1 (xmr-eric)
2d12a3c Main.qml: Changed mixin to ring size (xmr-eric)
16f5889 Transfer.qml: Changed mixin to ring size (xmr-eric)
2017-02-04 17:44:20 +02:00
Riccardo Spagni
7e8b6de186
Merge pull request #429
58147a2 Minor spelling corrections (David)
2017-02-04 17:43:42 +02:00
Riccardo Spagni
6c8e770a61
Merge pull request #426
93d2eb5 add qrcode scanner (MoroccanMalinois)
2017-02-04 17:43:03 +02:00
Riccardo Spagni
e16180c2a5
Merge pull request #417
c51a28f fix advanced hotkey + menu separators (Jaquee)
2017-02-04 17:42:28 +02:00
Jaquee
8060307c62
wizard: fix focus 2017-02-04 15:41:10 +01:00
pigeons
7ab3373335 use gmake on bsd in build.sh 2017-02-02 13:11:33 -08:00
Jaquee
0b41fbc858
Don't close/reopen when changing daemon
requires #1655
2017-01-31 11:17:56 +01:00
Jaquee
2586404339 sync progress improvements 2017-01-31 11:17:48 +01:00
Jaquee
eb909e1ae7 async connectionStatus and init 2017-01-31 10:39:03 +01:00
Jaquee
cb3281dee8 WalletManager: fix possible race 2017-01-31 10:39:00 +01:00
Jaquee
9dbbd4c9bc WalletManager: check connection before isMining() 2017-01-31 10:39:00 +01:00
MoroccanMalinois
93d2eb5e1a add qrcode scanner 2017-01-31 04:36:08 +00:00
xmr-eric
faeead242c Better placeholders 2017-01-30 18:45:16 -05:00
xmr-eric
4e2e262f6a Main.qml: Ringsize equals mixin +1 2017-01-30 18:28:56 -05:00
xmr-eric
f1327ace32 Ringsize equals mixin +1 2017-01-30 18:27:55 -05:00
luigi1111
43d5bd3e2d
Merge pull request #437
Restore wallet from keys (Jaqueeee)
2017-01-30 17:11:30 -06:00
luigi1111
be564921d8
Merge pull request 441
f4e01e5 Fix git username in build script (Jaqueeee)
2017-01-30 16:57:06 -06:00
luigi1111
ef9bf72b52
Merge pull request 438
7b94a47 detect freebsd, build for armv7, configure general build for unkown platforms (danrmiller)
2017-01-30 16:33:59 -06:00
luigi1111
e0e2b40682 Merge branch 'path' of https://github.com/danrmiller/monero-core into danrmiller-path 2017-01-30 16:33:49 -06:00
Jaquee
f4e01e5756
fix git username in build script 2017-01-30 23:33:04 +01:00
luigi1111
501560940b
Merge pull request #435
a521566 Shorter mining description for compact view (xmr-eric)
2017-01-30 16:23:17 -06:00
luigi1111
a80df427e7 Merge branch 'patch-4' of https://github.com/xmr-eric/monero-core into xmr-eric-patch-4 2017-01-30 16:23:05 -06:00
luigi1111
3cbad7350b
Merge pull request #431
1acd4a7 Simplified "OR ALL" button to "ALL" (xmr-eric)
2017-01-30 16:21:48 -06:00
luigi1111
58bcc3640c Merge branch 'patch-1' of https://github.com/xmr-eric/monero-core into xmr-eric-patch-1 2017-01-30 16:21:33 -06:00
Jaquee
04ff16ddb2 restore from keys: show error in popup 2017-01-30 23:20:47 +01:00
Jaquee
c5c2a40ef5 Wizard: restore from keys 2017-01-30 23:20:47 +01:00
Jaquee
b3232dc26f WalletManager: restore from keys 2017-01-30 23:20:43 +01:00
luigi1111
26be7fbd46
Merge pull request #432
4fb4bde Payment Description into placeholder (xmr-eric)
2017-01-30 16:19:47 -06:00
luigi1111
0e70e63e0a Merge branch 'patch-2' of https://github.com/xmr-eric/monero-core into xmr-eric-patch-2 2017-01-30 16:19:24 -06:00