monero-project/monero-gui
monero-project/monero-gui
1
0
Fork 0
mirror of https://github.com/monero-project/monero-gui.git synced 2024-12-29 06:59:48 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions
3420 commits 9 branches 53 tags 49 MiB
Commit graph

3420 commits

This branch
This branch
All branches
Author SHA1 Message Date
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
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
pigeons
7b94a47350 detect freebsd, build for armv7, configure general build for unknown platforms 2017-01-27 09:10:08 -08:00
Jaquee
bded77a22b
lineEdit: add textUpdated signal 2017-01-26 21:58:48 +01:00
Jaquee
de14886376
fix daemon console error 2017-01-26 21:58:41 +01:00
xmr-eric
9425b77030 Payment ID Placeholder: 64 characters only 2017-01-23 18:35:44 -05:00
xmr-eric
a52156627d Mining.qml: Simplified mining description 2017-01-23 14:48:05 -05:00
xmr-eric
ce87a1c4db Added AddressBook.qml placeholders 2017-01-23 14:25:30 -05:00
xmr-eric
4fb4bde34b Moved Payment Description into placeholder 2017-01-23 13:58:31 -05:00
xmr-eric
1acd4a7ac8 Simplified send-all button 2017-01-23 13:37:23 -05:00
xmr-eric
2d12a3cf3d Main.qml: Changed mixin to ring size 2017-01-23 13:20:15 -05:00
xmr-eric
16f5889a15 Transfer.qml: Changed mixin to ring size 2017-01-23 13:19:31 -05:00
Jaquee
c51a28f206
fix advanced hotkey + menu separators 2017-01-23 14:22:17 +01:00
David
58147a24cf Minor spelling corrections 
The biggest one was a missing word.
 2017-01-23 14:13:31 +01: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