Commit graph

220 commits

Author SHA1 Message Date
dsc
df280cdd91 Merge pull request 'Write proper .exe on Windows' (#109) from dsc/feather:write-exe-windows into master
Reviewed-on: https://git.wownero.com/feather/feather/pulls/109
Reviewed-by: tobtoht <tobtoht@noreply.gitgud.wownero.nl>
2020-10-21 16:11:11 +00:00
dsc
9b96ece2f9 Merge pull request 'XMRig: Donate level 1' (#110) from dsc/feather:xmrig-donate-level into master
Reviewed-on: https://git.wownero.com/feather/feather/pulls/110
Reviewed-by: tobtoht <tobtoht@noreply.gitgud.wownero.nl>
2020-10-21 16:10:58 +00:00
dsc
a44087b750
XMRig: Donate level 1
Signed-off-by: dsc <dsc@xmr.pm>
2020-10-21 18:06:31 +02:00
dsc
70cbf59ce8
Write proper .exe on Windows
Signed-off-by: dsc <dsc@xmr.pm>
2020-10-21 17:56:39 +02:00
dsc
4aeaf2660f
Include QtMultimedia for buildbots
Signed-off-by: dsc <dsc@xmr.pm>
2020-10-21 17:46:51 +02:00
tobtoht
9b7849c5be Coins: numerical sort for amount column 2020-10-21 16:57:06 +02:00
tobtoht
51a0f86652 Move cdiv to globals.h 2020-10-21 16:57:03 +02:00
dsc
fa6ee35fb0 Merge pull request 'Mainwindow: fix tab order and stylization' (#104) from tobtoht/feather:tabs_order into master
Reviewed-on: https://git.wownero.com/feather/feather/pulls/104
Reviewed-by: dsc <dsc@noreply.gitgud.wownero.nl>
2020-10-21 12:25:46 +00:00
tobtoht
b1160280fe Mainwindow: fix tab order and stylization 2020-10-21 13:27:39 +02:00
tobtoht
7441d6cb4a Merge pull request 'XMRig: fix stop on windows' (#102) from tobtoht/feather:xmrrig_stop_windows into master
Reviewed-on: https://git.wownero.com/feather/feather/pulls/102
2020-10-21 10:37:32 +00:00
mrdeveloper
23000c6e60 Merge pull request 'PasswordDialog: Show wallet name' (#103) from mrdeveloper/feather:password-dialog-show-wallet-name into master
Reviewed-on: https://git.wownero.com/feather/feather/pulls/103
Reviewed-by: tobtoht <tobtoht@noreply.gitgud.wownero.nl>
2020-10-21 10:26:33 +00:00
mrdeveloper
75edc6e5bb Merge branch 'master' into password-dialog-show-wallet-name 2020-10-21 12:21:10 +02:00
mrdeveloper
06f649cbb7 Merge pull request 'Contacts: import via csv file' (#100) from mrdeveloper/feather:contacts-import-csv into master
Reviewed-on: https://git.wownero.com/feather/feather/pulls/100
Reviewed-by: tobtoht <tobtoht@noreply.gitgud.wownero.nl>
2020-10-21 10:19:43 +00:00
tobtoht
ff78b5a6c2 XMRig: fix stop on windows 2020-10-21 12:11:10 +02:00
mrdeveloper
47d965c6cd Make format csv import as same as export 2020-10-21 10:10:48 +02:00
mrdeveloper
d6c26d4159 PasswordDialog: Show wallet name 2020-10-21 08:45:25 +02:00
mrdeveloper
78516f4546 Contacts: import via csv file 2020-10-21 08:25:02 +02:00
dsc
49f072eea4 Merge pull request 'TransactionInfoDialog: add tx key' (#96) from tobtoht/feather:tx_key into master
Reviewed-on: https://git.wownero.com/feather/feather/pulls/96
Reviewed-by: dsc <dsc@noreply.gitgud.wownero.nl>
2020-10-20 13:19:59 +00:00
tobtoht
302c258e6b TransactionInfoDialog: add tx key 2020-10-20 01:11:15 +02:00
dsc
70f1846de6 Merge pull request 'Update for v0.17.1.1' (#92) from tobtoht/feather:v0.17.1.1 into master
Reviewed-on: https://git.wownero.com/feather/feather/pulls/92
Reviewed-by: dsc <dsc@noreply.gitgud.wownero.nl>
2020-10-19 00:51:10 +00:00
tobtoht
ae2815c1c6 Update for v0.17.1.1 2020-10-19 02:20:02 +02:00
dsc
24993bc0b2 Merge pull request 'Offline transaction signing' (#88) from tobtoht/feather:offline_tx_signing into master
Reviewed-on: https://git.wownero.com/feather/feather/pulls/88
Reviewed-by: dsc <dsc@noreply.gitgud.wownero.nl>
2020-10-19 00:09:36 +00:00
tobtoht
216b2e0c5e Offline transaction signing 2020-10-19 01:39:23 +02:00
dsc
44a2fc30dc Merge pull request 'Cmake: Refactor executable embeds, embed XMRig, allow solo mining' (#89) from dsc/feather:refactor-feather-execs into master
Reviewed-on: https://git.wownero.com/feather/feather/pulls/89
2020-10-18 20:47:53 +00:00
dsc
aee60f33b7
- Embed XMRig executable (baked into buildbot image)
- Refactored CMake related to Tor/XMRig
- Move executables to `src/assets/exec`
- Embedding executables require passing definition to CMake, e.g:
  - `-DTOR=/path/to/tor`
  - `-DXMRIG=/path/to/xmrig`
- Allow solo mining for XMRig
- Redesign XMRig settings screen
2020-10-18 22:01:14 +02:00
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
Reviewed-on: https://git.wownero.com/feather/feather/pulls/85
2020-10-16 20:59:14 +00:00
dsc
1ef29207d5
Xmrig: add support for TLS. Tor default off. Save username/password in wallet cache.
Signed-off-by: dsc <dsc@xmr.pm>
2020-10-16 21:13:14 +02:00
tobtoht
497567e61f Merge pull request 'Bugfix: fix wallet closing issues by partially reverting #63' (#84) from tobtoht/feather:duplicate_wizard into master
Reviewed-on: https://git.wownero.com/feather/feather/pulls/84
2020-10-16 15:39:45 +00:00
tobtoht
15c51e2e2b Bugfix: fix wallet closing issues by partially reverting #63 2020-10-16 17:17:31 +02:00
tobtoht
c5a055eb70 Merge pull request 'Prices: add support for NZD' (#82) from tobtoht/feather:nzd into master
Reviewed-on: https://git.wownero.com/feather/feather/pulls/82
2020-10-16 13:15:12 +00:00
tobtoht
1b9cc7c679 Prices: add support for NZD 2020-10-16 15:14:13 +02:00
tobtoht
0f0b033fe4 Merge pull request 'Fix indefinite hang when closing wallet via File -> Quit' (#80) from tobtoht/feather:close_without_indefinite_hang into master
Reviewed-on: https://git.wownero.com/feather/feather/pulls/80
2020-10-16 03:17:54 +00:00
tobtoht
3feda6d6c7 Fix indefinite hang when closing wallet via File -> Quit 2020-10-16 05:15:46 +02:00
dsc
103965ef40 Merge pull request 'Drone: fix AppImage builds' (#77) from dsc/feather:drone_appimage-fix into master
Reviewed-on: https://git.wownero.com/feather/feather/pulls/77
2020-10-15 23:49:39 +00:00
tobtoht
3ee5e003a7 Drone: fix AppImage builds 2020-10-16 01:49:03 +02:00
dsc
96ac717ede Merge pull request 'XMRig - Simple mining GUI to download/run XMRig' (#76) from dsc/feather:xmrig-tab into master
Reviewed-on: https://git.wownero.com/feather/feather/pulls/76
2020-10-15 21:58:25 +00:00
dsc
d0260ce018 XMRig tab - Simple mining GUI to download and run XMRig releases. 2020-10-15 23:29:15 +02:00
tobtoht
61a135e1c2 Merge pull request 'Send: show fiat conversion when XMR is selected' (#75) from tobtoht/feather:send_fiat into master
Reviewed-on: https://git.wownero.com/feather/feather/pulls/75
2020-10-15 02:20:44 +00:00
tobtoht
98db512164 Send: show fiat conversion when XMR is selected 2020-10-15 04:17:57 +02:00
tobtoht
a325883b62 Merge pull request 'Tails: fix slow wallet open' (#72) from tobtoht/feather:tails_fix_slow_open into master
Reviewed-on: https://git.wownero.com/feather/feather/pulls/72
2020-10-15 01:25:31 +00:00
tobtoht
5c7c13d76a Tails: fix slow wallet open 2020-10-15 02:19:13 +02:00
tobtoht
06cee3f03e Merge pull request 'DebugInfoDialog: Add Tails version' (#69) from tobtoht/feather:tails_version into master
Reviewed-on: https://git.wownero.com/feather/feather/pulls/69
2020-10-15 00:00:35 +00:00
tobtoht
ec0d88cf1b DebugInfoDialog: Add Tails version 2020-10-15 01:37:42 +02:00
tobtoht
eca37f934c Merge pull request 'Fix wallet update regression' (#68) from tobtoht/feather:no_update into master
Reviewed-on: https://git.wownero.com/feather/feather/pulls/68
2020-10-14 22:40:56 +00:00
tobtoht
18cf749ad9 Fix wallet update regression
Would cause subaddresses and history to update more often than necessary.
2020-10-15 00:39:30 +02:00
tobtoht
1febbc869f Merge pull request 'Export/Import KeyImages/Outputs' (#66) from tobtoht/feather:keyimages into master
Reviewed-on: https://git.wownero.com/feather/feather/pulls/66
2020-10-14 20:13:26 +00:00
tobtoht
ea49097ab3 Merge pull request 'Close wallet on exit' (#67) from tobtoht/feather:close_on_exit into master
Reviewed-on: https://git.wownero.com/feather/feather/pulls/67
2020-10-14 18:45:22 +00:00
tobtoht
1dcc69db39 Close wallet on exit 2020-10-14 20:44:26 +02:00
tobtoht
fc3ac2eb33 Export/Import KeyImages/Outputs 2020-10-14 20:18:25 +02:00
dsc
0289aba113 Merge pull request 'AboutDialog: minor layout fix' (#62) from tobtoht/feather:about_fix into master
Reviewed-on: https://git.wownero.com/feather/feather/pulls/62
2020-10-14 15:00:55 +00:00