Commit Graph

420 Commits

Author SHA1 Message Date
xiphon
13ca3eeb84 KeysFiles: QDirIterator is initially located before the first entry 2020-10-05 12:36:00 +00:00
luigi1111
40e108eb2b
Merge pull request #3026
4208b66 WizardModeSelection: optional 'Portable mode' feature support (xiphon)
2020-10-04 17:39:09 -05:00
luigi1111
adb04cef71
Merge pull request #3023
1aa98c3 MoneroSettings: portable mode, CWD relative 'monero-storage' dir (xiphon)
2020-10-04 17:37:21 -05:00
Alexander Blair
22386aa7e1
Merge pull request #3089
0fcaadae main: command line option for socks5 proxy (selsta)
2020-09-28 19:06:58 -07:00
xiphon
1aa98c3cfd MoneroSettings: portable mode, CWD relative 'monero-storage' dir 2020-09-28 13:50:01 +00:00
selsta
0fcaadae53
main: command line option for socks5 proxy 2020-09-28 01:57:47 +02:00
luigi1111
a32d39cc96
Merge pull request #3108
b12ec3b QR-Code-generator: remove from repo, use monero qrcodegen (selsta)
2020-09-25 18:27:48 -05:00
selsta
b12ec3b0f0
QR-Code-generator: remove from repo, use monero qrcodegen 2020-09-25 01:37:29 +02:00
selsta
87400e781e
cmake: add deploy target (mac / windows) 2020-09-24 04:28:53 +02:00
xiphon
4208b66baf WizardModeSelection: optional 'Portable mode' feature support 2020-09-22 15:08:18 +00:00
luigi1111
2e8bec15da
Merge pull request #3077
3aeaf99 oshelper: 'shlobj.h' include should be lower case (xiphon)
2020-09-12 15:54:56 -05:00
xiphon
3aeaf99057 oshelper: 'shlobj.h' include should be lower case 2020-09-10 10:45:28 +00:00
xiphon
c41e3d8e7a cmake: cross-compilation to Windows - find MinGW prefixed windres 2020-09-10 10:37:06 +00:00
luigi1111
1752fde08b
Merge pull request #3058
9255d64 cmake: copy monerod to mac bundle (selsta)
2020-09-07 15:05:18 -05:00
luigi1111
7e83173c77
Merge pull request #3053
1d2840f ipc: fix Qt deprecation warning with 5.15.1 beta (selsta)
2020-09-07 14:51:14 -05:00
luigi1111
5bc305679c
Merge pull request #3032
5ea99a7 Wallet: WalletManager: implement proxy support (xiphon)
2020-09-07 14:46:14 -05:00
luigi1111
2557bdb35f
Merge pull request #3030
43aeea8 Network: instantiable QML type, introduce proxyAddress property (xiphon)
2020-09-07 14:45:21 -05:00
luigi1111
79a87ca03b
Merge pull request #3029
380b955 Downloader: introduce proxyAddress property (xiphon)
2020-09-07 14:44:26 -05:00
selsta
9255d649d9
cmake: copy monerod to mac bundle 2020-08-29 00:42:30 +02:00
selsta
1d2840f8b5
ipc: fix Qt deprecation warning with 5.15.1 beta 2020-08-26 02:58:11 +02:00
luigi1111
e65159163d
Merge pull request #3038
6898d5d oshelper: always convert to canonical path in openContainingFolder (xiphon)
2020-08-14 14:16:19 -05:00
luigi1111
77b7a5244a
Merge pull request #3024
eb924a3 KeysFiles: relative file path support (xiphon)
2020-08-14 14:15:26 -05:00
xiphon
6898d5dd42 oshelper: always convert to canonical path in openContainingFolder 2020-08-06 18:58:15 +00:00
xiphon
5ea99a73e7 Wallet: WalletManager: implement proxy support 2020-07-30 21:37:09 +00:00
xiphon
43aeea8eb7 Network: instantiable QML type, introduce proxyAddress property
# Conflicts:
#	main.qml
2020-07-30 16:49:22 +00:00
luigi1111
9220937c4b
Merge pull request #3027
0db4c36 QrScanThread: fix Qt 5.15 compability (selsta)
2020-07-29 13:35:36 -05:00
luigi1111
6aaf294f0b
Merge pull request #3019
dcc040a WalletManager: instantiable QML type (xiphon)
2020-07-29 13:34:33 -05:00
luigi1111
721a0cbf91
Merge pull request #3018
352da92 QrCodeScanner: use parse_uri_to_object to parse scanned codes (xiphon)
2020-07-29 13:33:27 -05:00
xiphon
380b955bce Downloader: introduce proxyAddress property 2020-07-29 17:31:44 +00:00
selsta
0db4c36db0
QrScanThread: fix Qt 5.15 compability 2020-07-29 17:40:58 +02:00
xiphon
dcc040a119 WalletManager: instantiable QML type 2020-07-29 15:17:02 +00:00
luigi1111
63e32c4a83
Merge pull request #3017
99907e5 WalletManager: parse_uri_to_object extra parameters support (xiphon)
2020-07-29 09:53:31 -05:00
luigi1111
0d047035fb
Merge pull request #3007
13ee9b1 KeysFiles: fix WalletKeysFilesModel, should be instantiable QML type (xiphon)
2020-07-29 09:44:45 -05:00
luigi1111
b5aa659757
Merge pull request #3004
36262f0 version: use MONERO_VERSION_FULL const as monero core version (xiphon)
2020-07-29 09:42:24 -05:00
luigi1111
88d297d8cc
Merge pull request #3002
f78c95b cmake: build bundle on macOS (selsta)
2020-07-29 09:38:55 -05:00
xiphon
eb924a34d1 KeysFiles: relative file path support 2020-07-28 17:38:03 +00:00
xiphon
352da92229 QrCodeScanner: use parse_uri_to_object to parse scanned codes 2020-07-16 17:30:00 +00:00
xiphon
99907e539a WalletManager: parse_uri_to_object extra parameters support 2020-07-16 17:28:00 +00:00
xiphon
36262f029a version: use MONERO_VERSION_FULL const as monero core version 2020-07-15 03:45:03 +00:00
xiphon
13ee9b1f26 KeysFiles: fix WalletKeysFilesModel, should be instantiable QML type 2020-07-14 23:44:46 +00:00
luigi1111
c137a6ea36
Merge pull request #3010
2fd3974 WalletManager: displayAmount should be static (xiphon)
2020-07-14 15:51:01 -05:00
luigi1111
aaa1cb47c0
Merge pull request #3006
dec5dcf KeysFiles: don't use WalletManager in findWallets (xiphon)
2020-07-14 15:49:19 -05:00
xiphon
2fd3974194 WalletManager: displayAmount should be static 2020-07-14 17:10:25 +00:00
xiphon
dec5dcf25c KeysFiles: don't use WalletManager in findWallets 2020-07-14 01:39:46 +00:00
xiphon
c9d36b1302 cmake: translations deps handling, build translations as a library 2020-07-09 16:42:32 +00:00
xiphon
d931022963 cmake: implement MacOS 'release' build + CI support 2020-07-09 15:23:04 +00:00
selsta
f78c95b73b
cmake: build bundle on macOS 2020-07-09 08:12:36 +02:00
luigi1111
10a47d783e
Merge pull request #2977
f55bf48 cmake: fix git tag + commit detection and version.js generation (xiphon)
2020-07-08 13:51:19 -05:00
luigi1111
14cc1d096a
Merge pull request #2976
a00ed6a cmake: implement translations support (xiphon)
2020-07-08 13:50:18 -05:00
luigi1111
840421fd7b
Merge pull request #2974
7677103 docker: implement Docker Linux 'release-static' build (xiphon)
2020-07-08 13:49:07 -05:00