Commit graph

848 commits

Author SHA1 Message Date
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
luigi1111
1ef1a140b7
Merge pull request #439
a81a071 fix osx build (Jaqueeee)
2017-01-30 16:05:43 -06:00
Jaquee
a81a071d2d
fix osx build 2017-01-29 19:31:04 +01:00
xmr-eric
4fb4bde34b Moved Payment Description into placeholder 2017-01-23 13:58:31 -05:00
Riccardo Spagni
cf95742433
Merge pull request #428
8df270c add version.js to .gitignore (MoroccanMalinois)
2017-01-23 08:05:38 -05:00
Riccardo Spagni
d4a40499ac
Merge pull request #427
1d7a1f6 save qrcode to file (MoroccanMalinois)
2017-01-23 08:05:22 -05:00
Riccardo Spagni
ecd6c7a0ae
Merge pull request #425
ef1d7f9 send custom commands to daemon + status button requires #1618 (Jaquee)
2e925b5 Update submodule + fix epee link (Jaquee)
39f9d5a pin submodule to monero head (Jaquee)
2017-01-23 08:04:19 -05:00
Riccardo Spagni
4cc838f1ff
Merge pull request #424
8482481 pin submodule to monero head (Jaquee)
61f4db6 Update submodule + fix epee link (Jaquee)
2017-01-23 08:03:40 -05:00
MoroccanMalinois
8df270cc4b add version.js to .gitignore 2017-01-23 04:57:09 +00:00
MoroccanMalinois
1d7a1f6d53 save qrcode to file 2017-01-23 04:15:49 +00:00
Jaquee
ef1d7f92f7
send custom commands to daemon
+ status button
requires #1618
2017-01-22 23:16:46 +01:00
Jaquee
2e925b530b Update submodule + fix epee link 2017-01-22 23:13:59 +01:00
Jaquee
39f9d5a116 pin submodule to monero head 2017-01-22 23:13:58 +01:00
Jaquee
8482481478
pin submodule to monero head 2017-01-22 21:13:13 +01:00
Jaquee
61f4db61ec
Update submodule + fix epee link 2017-01-22 21:00:34 +01:00
Riccardo Spagni
6d73fba14c
Merge pull request #412
6a19330 Pull required monero PR's automatically (Jaquee)
2017-01-22 12:18:29 -05:00
Riccardo Spagni
955d13ef0a
Merge pull request #420
4eedef0 allow QT location to be set with an environment variable (pigeons)
2017-01-22 12:17:57 -05:00
Riccardo Spagni
2d907c02f0
Merge pull request #416
adaa8cb Wizard: fix recover bug (Jaquee)
2017-01-22 12:16:13 -05:00
Riccardo Spagni
160e5c480a
Merge pull request #413
fb8d9bd Settings: allow setting log categories (moneromooo.monero)
ea8bc5b LineEdit: forward editingFinished signal (moneromooo.monero)
d4b3834 Build against monero with new logging system (moneromooo.monero)
2017-01-22 12:15:55 -05:00
Riccardo Spagni
32a81517d6
Merge pull request #411
7f8d4ac exit script with appropriate status if these commands fail (pigeons)
2017-01-22 11:56:06 -05:00
Riccardo Spagni
e7b33347e7
Merge pull request #409
b538baa Added Dutch translation (keesieboy)
2017-01-22 11:55:46 -05:00
Riccardo Spagni
d8ac731dd2
Merge pull request #407
e0be6d4 Clearer results for Verify Payment tool (xmr-eric)
2017-01-22 11:55:19 -05:00
Riccardo Spagni
05e2472d93
Merge pull request #405
0c0de90 LeftPanel.qml: Advanced bullet color to #FFD781 (xmr-eric)
2017-01-22 11:54:57 -05:00
Riccardo Spagni
4f44407187
Merge pull request #404
fdf0652 PrivacyLevelSmall.qml: Medium mixin color- AAFFBB (xmr-eric)
5981e95 PrivacyLevel.qml: Medium mixin color #AAFFBB (xmr-eric)
2017-01-22 11:54:39 -05:00
Riccardo Spagni
2c69d3b726
Merge pull request #403
4a2266b TickDelegate.qml: Changed LOW to NORMAL (xmr-eric)
2017-01-22 11:54:15 -05:00
pigeons
4eedef048d allow QT location to be set with an environment variable
variable for libQt5XmlPatterns path

QTXML_DIR is same relative path on some systems, use that as default

use utils.sh for platform default paths

fix dumb copypasta
2017-01-19 11:14:55 -08:00
Jaquee
adaa8cb806
Wizard: fix recover bug 2017-01-17 22:38:38 +01:00
Jaquee
6a19330e55
Pull required monero PR's automatically 2017-01-17 21:11:31 +01:00
moneromooo.monero
fb8d9bd5dc Settings: allow setting log categories
requires #1589
2017-01-16 23:14:05 +00:00
moneromooo.monero
ea8bc5b56d LineEdit: forward editingFinished signal 2017-01-16 21:56:15 +00:00
moneromooo.monero
d4b3834bce Build against monero with new logging system
Oh, and screw you, cmake.
2017-01-16 20:57:00 +00:00
pigeons
7f8d4ac3d2 exit script with appropriate status if these commands fail 2017-01-16 09:37:12 -08:00
Riccardo Spagni
de63e93024
Merge pull request #410
977f512 check if version.h exists (Jaquee)
7f9cc73 Build libwallet if new version exists (Jaquee)
e08871a Update monero submodule to 16b8b66 (Jaquee)
2017-01-16 10:13:47 -05:00
Jaquee
977f5125e6
check if version.h exists 2017-01-16 14:17:30 +01:00
Jaquee
7f9cc73485
Build libwallet if new version exists 2017-01-16 14:14:12 +01:00
Jaquee
e08871a77e
Update monero submodule to 16b8b66 2017-01-16 12:34:34 +01:00
Riccardo Spagni
98c3d6897d
Merge pull request #402
20d3c30 Simpler text on Miner page (xmr-eric)
2017-01-15 15:00:57 -05:00
Riccardo Spagni
98ca4f1a70
Merge pull request #398
ae5c21e export/import key images when cold signing (Jaquee)
24ccd27 Add rescan spent button (Jaquee)
15c79df GUI cold signing (Jaquee)
fd98395 view only wallets (Jaquee)
8f56e98 save wallet name in appwindow (Jaquee)
842e4df adjust button size dynamically (Jaquee)
2017-01-15 14:58:47 -05:00
keesieboy
b538baa8d8 Added Dutch translation 2017-01-15 18:32:49 +01:00
Jaquee
ae5c21ef17
export/import key images when cold signing 2017-01-15 12:32:45 +01:00
Jaquee
24ccd27d79
Add rescan spent button 2017-01-15 12:32:39 +01:00
Jaquee
15c79df378
GUI cold signing 2017-01-15 12:32:31 +01:00
Jaquee
fd983955b4
view only wallets
wizard: fix dots on pw page

wizard: fix focus on pw field

viewOnly: added success message
2017-01-15 12:32:25 +01:00
Jaquee
8f56e98397
save wallet name in appwindow 2017-01-15 12:32:14 +01:00
Jaquee
842e4df223
adjust button size dynamically 2017-01-15 12:32:06 +01:00
xmr-eric
e0be6d45c5 Clearer results for Verify Payment tool 2017-01-14 22:52:04 -05:00
xmr-eric
0c0de906c2 LeftPanel.qml: Advanced bullet color to #FFD781 2017-01-14 17:01:47 -05:00
xmr-eric
fdf0652e37 PrivacyLevelSmall.qml: Medium mixin color- AAFFBB 2017-01-14 16:36:50 -05:00
xmr-eric
5981e9537b PrivacyLevel.qml: Medium mixin color #AAFFBB 2017-01-14 16:36:03 -05:00
xmr-eric
4a2266b295 TickDelegate.qml: Changed LOW to NORMAL 2017-01-14 13:31:25 -05:00