Commit Graph

132 Commits (qr-code-scan)
 

Author SHA1 Message Date
mrdeveloper 5ea7959ab2 Merge remote-tracking branch 'tobtoht/qr-code-scan' into qr-code-scan
4 years ago
tobtoht 48fa938dba Dockerfile: zbar static compile
4 years ago
tobtoht b7ddeb5b81 Use zbar
4 years ago
mrdeveloper 3cb5c2b692 remove qzxing as dep
4 years ago
mrdeveloper 43ae5de534 Added QrCodeScanDialog
4 years ago
mrdeveloper cd1e93784a Prepare usage for QRCode reader
4 years ago
mrdeveloper 442aced06f Added external lib for QRCode decode and QTMultimedia for Camera
4 years ago
dsc 485fb89941 Merge pull request 'Include QtMultimedia for buildbots' (#108) from dsc/feather:include-qtmultimedia into master
4 years ago
mrdeveloper 8b9e68e2ad remove qzxing as dep
4 years ago
dsc df280cdd91 Merge pull request 'Write proper .exe on Windows' (#109) from dsc/feather:write-exe-windows into master
4 years ago
dsc 9b96ece2f9 Merge pull request 'XMRig: Donate level 1' (#110) from dsc/feather:xmrig-donate-level into master
4 years ago
dsc a44087b750
XMRig: Donate level 1
4 years ago
dsc 70cbf59ce8
Write proper .exe on Windows
4 years ago
dsc 4aeaf2660f
Include QtMultimedia for buildbots
4 years ago
mrdeveloper fe3fc77890 Added QrCodeScanDialog
4 years ago
mrdeveloper c8fbdc5c3a Merge branch 'master' into qr-code-scan
4 years ago
dsc fa6ee35fb0 Merge pull request 'Mainwindow: fix tab order and stylization' (#104) from tobtoht/feather:tabs_order into master
4 years ago
tobtoht b1160280fe Mainwindow: fix tab order and stylization
4 years ago
tobtoht 7441d6cb4a Merge pull request 'XMRig: fix stop on windows' (#102) from tobtoht/feather:xmrrig_stop_windows into master
4 years ago
mrdeveloper d6acac9674 Merge branch 'master' into qr-code-scan
4 years ago
mrdeveloper 23000c6e60 Merge pull request 'PasswordDialog: Show wallet name' (#103) from mrdeveloper/feather:password-dialog-show-wallet-name into master
4 years ago
mrdeveloper 75edc6e5bb Merge branch 'master' into password-dialog-show-wallet-name
4 years ago
mrdeveloper 06f649cbb7 Merge pull request 'Contacts: import via csv file' (#100) from mrdeveloper/feather:contacts-import-csv into master
4 years ago
mrdeveloper f0a79fa58a Prepare usage for QRCode reader
4 years ago
mrdeveloper 8969a96ce4 Added external lib for QRCode decode and QTMultimedia for Camera
4 years ago
tobtoht ff78b5a6c2 XMRig: fix stop on windows
4 years ago
mrdeveloper 47d965c6cd Make format csv import as same as export
4 years ago
mrdeveloper d6c26d4159 PasswordDialog: Show wallet name
4 years ago
mrdeveloper 78516f4546 Contacts: import via csv file
4 years ago
dsc 49f072eea4 Merge pull request 'TransactionInfoDialog: add tx key' (#96) from tobtoht/feather:tx_key into master
4 years ago
tobtoht 302c258e6b TransactionInfoDialog: add tx key
4 years ago
dsc 70f1846de6 Merge pull request 'Update for v0.17.1.1' (#92) from tobtoht/feather:v0.17.1.1 into master
4 years ago
tobtoht ae2815c1c6 Update for v0.17.1.1
4 years ago
dsc 24993bc0b2 Merge pull request 'Offline transaction signing' (#88) from tobtoht/feather:offline_tx_signing into master
4 years ago
tobtoht 216b2e0c5e Offline transaction signing
4 years ago
dsc 44a2fc30dc Merge pull request 'Cmake: Refactor executable embeds, embed XMRig, allow solo mining' (#89) from dsc/feather:refactor-feather-execs into master
4 years ago
dsc aee60f33b7
- Embed XMRig executable (baked into buildbot image)
4 years ago
dsc 5d8700370b Merge pull request 'Xmrig: add support for TLS. Tor default off. Save username/password in wallet cache.' (#85) from dsc/feather:xmrig-tab-2 into master
4 years ago
dsc 1ef29207d5
Xmrig: add support for TLS. Tor default off. Save username/password in wallet cache.
4 years ago
tobtoht 497567e61f Merge pull request 'Bugfix: fix wallet closing issues by partially reverting #63' (#84) from tobtoht/feather:duplicate_wizard into master
4 years ago
tobtoht 15c51e2e2b Bugfix: fix wallet closing issues by partially reverting #63
4 years ago
tobtoht c5a055eb70 Merge pull request 'Prices: add support for NZD' (#82) from tobtoht/feather:nzd into master
4 years ago
tobtoht 1b9cc7c679 Prices: add support for NZD
4 years ago
tobtoht 0f0b033fe4 Merge pull request 'Fix indefinite hang when closing wallet via File -> Quit' (#80) from tobtoht/feather:close_without_indefinite_hang into master
4 years ago
tobtoht 3feda6d6c7 Fix indefinite hang when closing wallet via File -> Quit
4 years ago
dsc 103965ef40 Merge pull request 'Drone: fix AppImage builds' (#77) from dsc/feather:drone_appimage-fix into master
4 years ago
tobtoht 3ee5e003a7 Drone: fix AppImage builds
4 years ago
dsc 96ac717ede Merge pull request 'XMRig - Simple mining GUI to download/run XMRig' (#76) from dsc/feather:xmrig-tab into master
4 years ago
dsc d0260ce018 XMRig tab - Simple mining GUI to download and run XMRig releases.
4 years ago
tobtoht 61a135e1c2 Merge pull request 'Send: show fiat conversion when XMR is selected' (#75) from tobtoht/feather:send_fiat into master
4 years ago