Commit graph

834 commits

Author SHA1 Message Date
selsta
b38a93a412
Receive: fix subaddress alignment 2018-12-20 00:06:23 +01:00
xiphon
d2d4c21cde SettingsLog: fix TextArea layout, border, scrollbar 2018-12-19 08:06:52 +03:00
mmbyday
84a60424ef mining: add visual icon/indicator that mining is enabled, visible on all the screens 2018-12-18 19:07:26 -08:00
mmbyday
09201b17fb Clear text fields up switching wallets 2018-12-18 11:07:58 -08:00
mmbyday
d10ce1744c SettingsInfo: use MoneroComponents.StandardButton 💄 2018-12-18 10:31:25 -08:00
luigi1111
7c0a557e62
Merge pull request #1839
481ef1f mining: display max cpu thread count and warn about impact (mmbyday)
2018-12-18 09:52:57 -06:00
luigi1111
4c3f84a695
Merge pull request #1835
515bb16 fix various QML warnings (xiphon)
2018-12-18 09:52:02 -06:00
luigi1111
b8f531382d
Merge pull request #1823
fc26bd1 Transfer: transaction priority persists over page changes and reset to automatic after successful send (mmbyday)
2018-12-18 09:36:30 -06:00
luigi1111
f463d2c511
Merge pull request #1817
9c09294 settings-wallet: use StandardButton instead of custom buttons (xiphon)
2018-12-18 09:34:04 -06:00
luigi1111
5b3adeeb73
Merge pull request #1815
d70f714 settings-node: use StandardButton instead of custom buttons (xiphon)
2018-12-18 09:32:15 -06:00
mmbyday
481ef1f895 mining: display max cpu thread count and warn about impact 2018-12-17 21:17:28 -08:00
mmbyday
a8a518d728 Keys: add clipboard warning 💬 2018-12-17 13:12:12 -08:00
xiphon
515bb16418 fix various QML warnings 2018-12-17 09:10:11 +00:00
mmbyday
fc26bd175e Transfer: transaction priority persists over page changes and reset to automatic after successful send 2018-12-13 19:53:50 -08:00
xiphon
9c09294d95 settings-wallet: use StandardButton instead of custom buttons 2018-12-13 19:10:20 +00:00
xiphon
d70f714f35 settings-node: use StandardButton instead of custom buttons 2018-12-13 18:45:21 +00:00
mmbyday
564f256f81 settingsLog: fix layout glitch when loaded first time 🐛 2018-12-13 10:19:46 -08:00
dsc
db51dd0c39
Toggle hiding balance via Settings->Layout->Hide balance 2018-12-12 09:33:24 +01:00
luigi1111
f8cd4c86d9
Merge pull request #1794
e650818 TextField.onEditingFinished() is not available in Qt versions lower than 5.9. Replace with onEditingFinished() (xmrdsc)
b466f9f string.startsWith() is not available in Qt versions lower than 5.8. Replace with string.indexOf() (xmrdsc)
2018-12-11 13:59:03 -06:00
dsc
b466f9fe96
string.startsWith() is not available in Qt versions lower than 5.8. Replace with string.indexOf() 2018-12-09 17:44:01 +01:00
luigi1111
c67077e428
Merge pull request #1785
950ac55 receive: enable advanced option checkbox2 to persist (mmbyday)
2018-12-07 19:01:46 -06:00
luigi1111
cda7dcb484
Merge pull request #1780
493623e settings: fix Binding loop detected for property preferredHeight (mmbyday)
2018-12-07 18:59:09 -06:00
luigi1111
54f9b7413f
Merge pull request #1778
56bd606 addressbook: improve readability by truncating long text and allowing wrapmode on address/description/paymentid fields (mmbyday)
2018-12-07 18:57:26 -06:00
mmbyday
950ac55281 receive: enable advanced option checkbox2 to persist 2018-12-06 14:56:23 -05:00
mmbyday
493623e929 settings: fix Binding loop detected for property preferredHeight 2018-12-04 15:17:51 -05:00
luigi1111
b27632e131
Merge pull request #1771
6c60b37 Fix Receive.qml:388: Error: Insufficient arguments (mmbyday)
2018-12-04 13:32:15 -06:00
mmbyday
56bd6065e5 addressbook: improve readability by truncating long text and allowing wrapmode on address/description/paymentid fields 2018-12-04 14:16:03 -05:00
luigi1111
9f6b4334a1
Merge pull request #1764
0a3c806 fix clipping of text in search box (mmbyday)
2018-12-03 01:07:28 -06:00
luigi1111
72808de1ad
Merge pull request #1768
02134c4 transfer: paste Payment URL to fill the payment form fields (xiphon)
2018-12-01 14:03:51 -06:00
luigi1111
6182d85f7e
Merge pull request #1767
01209b1 SettingsNode: make TextArea readOnly (mmbyday)
2018-12-01 14:01:46 -06:00
luigi1111
41326d0a8d
Merge pull request #1766
7a9c6f4 sign: fix label layout consistency (mmbyday)
2018-12-01 14:00:37 -06:00
luigi1111
dcddaad2be
Merge pull request #1762
b9c7d8d keys: dynamic panel height and qrcode is no longer clipped (mmbyday)
2018-12-01 12:59:34 -06:00
luigi1111
f5c428b546
Merge pull request #1759
33e04a3 keys: bug fixes and aligned with wallet definition URI scheme (mmbyday)
2018-12-01 12:58:16 -06:00
luigi1111
401aafab48
Merge pull request #1756
eb311b9 receive: qrcode fixes (mmbyday)
2018-12-01 12:49:11 -06:00
mmbyday
6c60b37e63 Fix Receive.qml:388: Error: Insufficient arguments 2018-12-01 20:13:31 +02:00
mmbyday
7a9c6f4de4 sign: fix label layout consistency 2018-11-30 06:12:19 +02:00
xiphon
02134c4fc6 transfer: paste Payment URL to fill the payment form fields 2018-11-30 03:51:03 +00:00
mmbyday
01209b11b9 SettingsNode: make TextArea readOnly 2018-11-30 04:34:14 +02:00
stoffu
c840e2b664
Allow adjusting number of rounds for the key derivation function 2018-11-30 11:22:32 +09:00
mmbyday
b9c7d8d7b1 keys: dynamic panel height and qrcode is no longer clipped 2018-11-30 01:42:44 +02:00
mmbyday
33e04a3190 keys: bug fixes and aligned with wallet definition URI scheme 2018-11-28 17:17:15 -08:00
mmbyday
0a3c80688b fix clipping of text in search box 2018-11-28 16:41:34 -08:00
mmbyday
eb311b9aca receive: qrcode fixes 2018-11-28 14:03:05 -08:00
luigi1111
45781ab4a1
Merge pull request #1750
2c44d97 transfer: fix amount validation regexp (xiphon)
2018-11-25 18:37:41 -06:00
luigi1111
777cea24c8
Merge pull request #1749
a79d76f transfer: prepend '0' to amount starting with '.' (xiphon)
2018-11-25 18:36:15 -06:00
luigi1111
0b73229f6c
Merge pull request #1706
12a3d68 receive: fix Amount and QR-Code layout (xiphon)
3b36dc9 receive: add Payment URL (xiphon)
2018-11-25 18:33:47 -06:00
xiphon
2c44d979c6 transfer: fix amount validation regexp 2018-11-24 14:06:59 +00:00
xiphon
a79d76ff3f transfer: prepend '0' to amount starting with '.' 2018-11-24 00:39:17 +00:00
xiphon
1c61de082a settings: fix Remote Node 'Connect' button 2018-11-11 03:02:42 +03:00
xiphon
42a9e2fe35 settings-node: change element id 'btnStopNode' to 'btnStartStopNode' 2018-11-06 22:19:07 +03:00
xiphon
808ecf57ac settings-node: implement correct 'Start/Stop daemon' button logic 2018-11-06 22:18:56 +03:00
luigi1111
19082461e8
Merge pull request #1664
6dcd2b7 fix strings not marked as translatable (erciccione)
d32dabf syn and add unpicked strings in language files (erciccione)
2018-11-06 11:25:07 -06:00
luigi1111
8ed48b667e
Merge pull request #1709
15ac299 settings: don't call parseFloat, isFinite to parse height (xiphon)
2018-10-31 11:47:14 -05:00
xiphon
15ac299fef settings: don't call parseFloat, isFinite to parse height 2018-10-29 19:01:46 +00:00
xiphon
3b36dc997c receive: add Payment URL 2018-10-27 12:42:25 +00:00
xiphon
12a3d687c6 receive: fix Amount and QR-Code layout 2018-10-27 12:27:18 +00:00
Leza89
85a3682ac6 Correction of View-Only Wallet description (see Issue #1610)
* changed

<location filename="../pages/settings/SettingsWallet.qml" line="185"/>
        <source>Creates a new wallet that can only view transactions, cannot initialize transactions.</source>

to

"Creates a new wallet that can only view and initiate transactions, but requires a spendable wallet to sign transactions before sending"

in /pages/settings/SettingsWallet.qml (Thanks for the guidance, Erciccione)

* Updated all translations and added "unfinished" tag where necessary

* Updated german translation
2018-10-25 21:26:20 +02:00
erciccione
6dcd2b76fa
fix strings not marked as translatable 2018-10-24 19:27:48 +01:00
moneromooo-monero
9a09e6189b Rename "blackball" for clarity
Apparently some people seem to think it's a censorship list...
2018-10-18 20:51:03 +01:00
luigi1111
2e2e7be4d0
Merge pull request #1667
cd024be tracking: query blockchain height only once during update (xiphon)
cf8f36b tracking: don't fetch redundant txes (xiphon)
2018-10-16 16:31:47 -05:00
xiphon
cf8f36ba76 tracking: don't fetch redundant txes 2018-10-16 18:37:48 +00:00
xiphon
cd024bed8b tracking: query blockchain height only once during update 2018-10-16 18:32:38 +00:00
Guillaume LE VAILLANT
79452bc9ac Add border to generated QR codes 2018-10-14 13:55:59 +02:00
luigi1111
e7c73164a6
Merge pull request #1605
e21f890 Replacing the optional ring size slider in favor of static ring size 11 (skftn)
2018-10-11 14:45:45 -05:00
Sander Ferdinand
ca29d7e1be Qt 5.7 does not support string.startsWith(); use string.indexOf() instead 2018-10-10 20:15:44 +02:00
Sander Ferdinand
e21f8903ee Replacing the optional ring size slider in favor of static ring size 11 2018-10-10 20:04:00 +02:00
moneromooo-monero
59a63e7725 Fix blackball section to conform to format change 2018-09-30 12:02:56 +01:00
Sander Ferdinand
ccb1f36083 Changed regex to support amount lines starting with a period, but block the transaction creation wizard 2018-09-04 11:45:20 +02:00
luigi1111
3483b8dbec
Merge pull request #1511
Settings overhaul (27 commits by skftn)
2018-08-14 16:15:31 -05:00
Sander Ferdinand
034f83bfb3 Fixes a SettingsLog layout bug 2018-08-06 09:57:13 +02:00
Sander Ferdinand
0a3d75d197 Fixes a particular hard to track bug where ColumnLayout considers MouseArea as part of its height/width after the parent StackView changed state a few times 2018-08-05 23:55:38 +02:00
Sander Ferdinand
39f2b99c7b Settings alignment and size adjustments 2018-08-05 23:45:25 +02:00
Sander Ferdinand
0fed21d6de Added component WarningBox and added a warning to remote node page 2018-08-05 23:45:20 +02:00
Sander Ferdinand
a9fa808dd1 Included copyright headers 2018-08-05 23:32:31 +02:00
Sander Ferdinand
5e3a8958f3 Disable layout options when in mobile mode 2018-08-05 23:32:31 +02:00
Sander Ferdinand
d5e27ff07d Copy to clipboard functionality for the Info page 2018-08-05 23:32:26 +02:00
Sander Ferdinand
8eee948f07 Replace SettingsInfo wallet name with wallet path 2018-08-05 20:56:39 +02:00
Sander Ferdinand
3d7090bdba Fixes a layout bug for SettingsLog.qml 2018-08-05 20:56:39 +02:00
Sander Ferdinand
eef3f8a3ac Lighten up the grey colors a bit 2018-08-05 20:56:32 +02:00
Sander Ferdinand
666203bd0e Fixes the wallet creation height dialog 2018-08-05 13:13:59 +02:00
Sander Ferdinand
46ee2e9cc8 Include version.js 2018-08-05 12:55:24 +02:00
luigi1111
06bbda0c99
Merge pull request #1467
abccad8 Keys: allow keys to be copied separately (stoffu)
2018-08-02 13:58:49 -05:00
Sander Ferdinand
9872689abe Fixes some javascript errors 2018-07-18 18:28:00 +02:00
Sander Ferdinand
6be5e5731e Added settings page: Info 2018-07-18 18:23:53 +02:00
Sander Ferdinand
eb457019dd Move function to show the seed page to Utils.js 2018-07-18 16:51:56 +02:00
Sander Ferdinand
b7dbb83294 Added settings page: Log 2018-07-18 16:16:48 +02:00
Sander Ferdinand
28bd9a72d2 Added settings page: Wallet 2018-07-18 16:16:48 +02:00
Sander Ferdinand
9019fa8baa Added settings page: Node 2018-07-18 16:16:48 +02:00
Sander Ferdinand
1257eb642a Added settings page: Layout 2018-07-18 16:16:48 +02:00
Sander Ferdinand
140b7634ff Added settings navbar componenent 2018-07-18 16:16:48 +02:00
Sander Ferdinand
48da5a3dba Reworked page 'Settings', added a stackview 2018-07-18 16:16:48 +02:00
Sander Ferdinand
4f4d969416 Extra properties for components LineEditMulti and RemoteNodeEdit 2018-07-18 16:16:46 +02:00
Sander Ferdinand
15c5269e35 Moving settings QML files under pages/settings/ 2018-07-18 13:37:59 +02:00
luigi1111
1107daab98
Merge pull request #1415
da93fc4 export/import key images (cryptochangements34)
2018-07-17 18:14:28 -05:00
luigi1111
527b48278a
Merge pull request #1451
b5253f0 use radio buttons for export qr code (cryptochangements34)
2018-07-17 16:57:04 -05:00
luigi1111
2633419c8e
Merge pull request #1454
f258ae4 don't check local daemon status on settings page, update on onWalletConnectionStatusChanged (pazos)
2018-07-17 16:54:17 -05:00
luigi1111
ceda53d8d2
Merge pull request #1510
33c195d Change 'Default' fee level to 'Automatic' (cryptochangements34)
2018-07-17 16:32:26 -05:00
cryptochangements34
33c195d01d
Change "Default" fee level to "Automatic" 2018-07-16 09:55:40 -05:00
erciccione
53c3151a23
mark some strings as translatable 2018-06-26 14:52:47 +03:00
Martín Fdez
f258ae4b60 don't check local daemon status on settings page, update on onWalletConnectionStatusChanged 2018-06-20 22:26:45 +02:00
stoffu
abccad8771
Keys: allow keys to be copied separately 2018-06-19 12:58:30 +09:00
cryptochangements34
b5253f03db
use radio buttons for export qr code 2018-06-06 17:01:30 -04:00
luigi1111
fec309b907
Merge pull request #1424
275c3df Fixed wrong argument for retrieving mixins
2018-05-22 12:25:03 -05:00
widdy
f4e58f1aad
fix restoreHeightEdit is not defined. 2018-05-22 18:22:29 +08:00
luigi1111
5b725a4f20
Merge pull request #1393
d003b25 use regex for value input
2018-05-21 23:10:29 -05:00
einsteinsfool
275c3df302 Fixed wrong argument for retrieving mixins 2018-05-22 00:44:38 +02:00
cryptochangements34
da93fc4a86 export/import key images 2018-05-14 17:43:52 -04:00
erciccione
290339a22d
missing <p> 2018-05-13 17:11:25 +02:00
erciccione
63478b1c48
fix typos in Receive.qml and SharedRingDB.qml 2018-05-13 17:08:36 +02:00
cryptochangements34
d003b255b9 use regex for value input 2018-05-11 18:56:04 -04:00
luigi1111
4954491273
Merge pull request #1375
adb47ad minng warning label when daemon not syncd
2018-05-11 16:59:06 -05:00
luigi1111
4c2640d4b3
Merge pull request #1358
341ac18 log qt/qml to easylogging, add --log-file cmdline option
92582a9 delete unused WalletManager functions
c9daab7 don't use cmdline arguments as daemon arguments
7283fe4 use qWarning/qCritical on QrCodeScanner info/errors
15155f2 print logs on console
2018-05-11 16:57:43 -05:00
pazos
6729ae7380 don't translate log categories 2018-05-08 19:12:29 +02:00
pazos
341ac18f1a log qt/qml to easylogging, add --log-file cmdline option 2018-05-08 18:13:29 +02:00
cryptochangements34
adb47adf9b minng warning label when daemon not syncd 2018-05-07 21:27:22 -04:00
luigi1111
b56074bef1
Merge pull request #1366
6147d81 Fix use of persistentSettings.testnet to nettype
2018-05-07 15:51:53 -05:00
luigi1111
ff3987ccab
Merge pull request #1362
fe53cdd Brighter backgrounds
7418a10 Improve contrast - brighten up borders
48b9aa4 Brigther left panel
26aabd2 Bottom left panel needs to have a transparent background
2018-05-07 15:50:45 -05:00
Sander Ferdinand
229fba2de9 Introduced 'show advanced options' checkbox 2018-05-03 12:35:53 +02:00
Sander Ferdinand
dc1d5e9e0a Check the 'to receive amount' with the transaction tracker 2018-05-03 12:35:53 +02:00
Sander Ferdinand
5487383068 Variable address truncation (for mobile) 2018-05-03 12:35:53 +02:00
Sander Ferdinand
0e49e4ad37 Reimplemented create/edit/copy (sub)address icons and buttons 2018-05-03 12:35:53 +02:00
Sander Ferdinand
6ff273fd32 First iteration of the subaddress table restyle 2018-05-03 12:35:34 +02:00
Sander Ferdinand
44ad8a3be1 Redesigned the tracking section 2018-05-03 12:35:34 +02:00
Sander Ferdinand
5a1952f7ac Reordered QR/Tracking sections on the receive page 2018-05-03 12:35:34 +02:00
Doyle T
6147d81cc5 Fix use of persistentSettings.testnet to nettype 2018-05-02 11:29:47 +10:00
luigi1111
7cea134352
Merge pull request #1346
610682c Added component RadioButton; changed 'settings->daemon mode' checkboxes to use them
c409441 Radio buttons for the welcome wizard
2018-04-30 23:15:06 -05:00
Sander Ferdinand
7418a10d28 Improve contrast - brighten up borders 2018-04-30 00:52:48 +02:00
Sander Ferdinand
ec640dcd1b Cursor pointer on link hover 2018-04-28 18:14:13 +02:00
Sander Ferdinand
610682c2be Added component RadioButton; changed 'settings->daemon mode' checkboxes to use them 2018-04-28 15:21:46 +02:00
Sander Ferdinand
199aedf60a Dialog(s) for changing restore height 2018-04-28 15:17:36 +02:00
Sander Ferdinand
170ddf1f6f Removes 'Daemon log path:' from the debug info 2018-04-28 03:28:05 +02:00
Sander Ferdinand
b8466739f9 Reformat Settings->Debug Info 2018-04-28 03:28:05 +02:00
luigi1111
19ac2aeb19
Merge pull request #1347
3635b2f Change input address placeholder from '4...' to '4.. / 8..'
2018-04-27 15:38:45 -05:00
luigi1111
37bceb7897
Merge pull request #1344
c13b4cb Redesigned shared ringdb panel
b75eedd Fixes CTRL-A hotkey
1e8f8bf Reformat help tooltips
2018-04-27 15:37:31 -05:00
Sander Ferdinand
7fe9d71eb3 Added daemonConsole component to main.qml 2018-04-25 16:32:12 +02:00
Sander Ferdinand
1e8f8bf3cd Reformat help tooltips 2018-04-25 14:54:04 +02:00
Sander Ferdinand
3635b2f001 Change input address placeholder from '4...' to '4.. / 8..' 2018-04-25 14:25:02 +02:00
luigi1111
60cefb3820
Merge pull request #1353
eed5005 Settings: do not invoke status command when using remote node
2018-04-24 21:45:57 -05:00
luigi1111
1956f5896d
Merge pull request #1286
cd4418d Receive: make tracking optional
a9331a7 Set daemon address to WalletManager (requires #3576)
2018-04-24 21:40:46 -05:00
luigi1111
631560c95a
Merge pull request #1336
25e5b35 dynamic panel height for the settings page
2018-04-24 21:35:52 -05:00
stoffu
eed500560d
Settings: do not invoke status command when using remote node 2018-04-24 18:41:46 +09:00
luigi1111
5a5d92e6f6
Merge pull request #1323
b38729f fix openalias resolve
2018-04-22 20:04:15 -05:00
Sander Ferdinand
c13b4cb7bd Redesigned shared ringdb panel 2018-04-22 20:07:31 +02:00
cryptochangements34
b38729fc0e fix openalias resolve 2018-04-21 21:48:31 -04:00
Sander Ferdinand
25e5b3528e dynamic panel height for the settings page 2018-04-20 22:42:32 +02:00
luigi1111
72541b6d51
Merge pull request #1329
9c44252 fix black checkmark on sharedringdb page
2018-04-19 11:39:22 -05:00
luigi1111
d72e9873d1
Merge pull request #1320
f04a9e0 single colour privacy level
2018-04-19 11:37:02 -05:00
luigi1111
9b8badc00c
Merge pull request #1306
67e9109 Implement 'rightIcon' and 'rightIconInactive' image properties for componenent StandardButton
2018-04-19 11:33:11 -05:00
luigi1111
7251254d8f
Merge pull request #1287
6ba65d4 Settings: use checkbox instead of button for daemon mode switching
2018-04-19 11:31:47 -05:00
qubenix
9c4425295b
fix black checkmark on sharedringdb page
+ changed `checkedBlackIcon.png` to `checkedIcon-black.png` in pages/SharedRingDB.qml
2018-04-18 14:28:19 -06:00
cryptochangements34
f04a9e07e1 single colour privacy level 2018-04-15 09:45:30 -04:00
Sander Ferdinand
67e9109c14 Implement 'rightIcon' and 'rightIconInactive' image properties for componenent StandardButton 2018-04-10 22:36:39 +02:00
luigi1111
b4353a31ac
Merge pull request #1239
4e6a421 Add Qt Runtime version to settings page
2018-04-08 17:54:20 -05:00
luigi1111
8db58b42af
Merge pull request #1270
6ca0713 Fixes blockchain size warnings
2018-04-08 17:39:03 -05:00
stoffu
6ba65d4caa
Settings: use checkbox instead of button for daemon mode switching 2018-04-07 14:32:47 +09:00
stoffu
cd4418dc45
Receive: make tracking optional 2018-04-07 14:09:28 +09:00
Sander Ferdinand
6ca0713739 Fixes blockchain size warnings 2018-04-05 09:21:43 +02:00
Sander Ferdinand
0e92a8f723 Fixes transparent dropdown 2018-04-05 08:20:36 +02:00
dEBRUYNE-1
199ed44aae
Bring QTQuick.Controls version down to 2.0 2018-04-02 11:40:42 +02:00
Martín Fdez
4e6a4213ff Add Qt Runtime version to settings page 2018-04-01 22:10:30 +02:00
luigi1111
4fc34f6886
Merge pull request #1230
afd624d Key reuse warning
2018-03-31 14:35:34 -05:00
Sander Ferdinand
afd624d0c0 Key reuse warning 2018-03-31 21:34:04 +02:00
Sander Ferdinand
86746a1563 Number comparison should be float 2018-03-31 16:25:11 +02:00
Sander Ferdinand
90818efe5e Disable send button when there is an insufficient unlocked balance 2018-03-31 03:16:35 +02:00
Sander Ferdinand
011e301324 Turn the SharedRing page black 2018-03-29 23:04:05 +01:00
Sander Ferdinand
0b7966f625 Fixes transaction confirmation dialog and also makes sure you will not be able to transfer funds when the daemon is not up (to date) 2018-03-29 23:04:04 +01:00
Sander Ferdinand
3c24044736 Cleanup after rebase 2018-03-29 23:04:04 +01:00
Sander Ferdinand
06bda869e0 font.bold for amount/address/paymentid on the transfer page 2018-03-29 23:04:04 +01:00
Sander Ferdinand
c001e31241 Fixes runtime QML warning 2018-03-29 23:04:04 +01:00
Sander Ferdinand
84e6461248 Change 'money' to 'monero' 2018-03-29 23:04:04 +01:00
Sander Ferdinand
60f64a30ad Implement node bootstrap on the Settings page 2018-03-29 23:04:04 +01:00
Sander Ferdinand
625b92318f Restyled warning box (not connected to daemon) 2018-03-29 23:04:03 +01:00
Sander Ferdinand
916c7acbb7 Design polish work 2018-03-29 23:04:03 +01:00
Sander Ferdinand
6e794e3c50 Redoing the Sign/Verify page 2018-03-29 23:04:03 +01:00
Sander Ferdinand
5213daad77 Dynamic subaddr table height, dont show history table when there is none 2018-03-29 23:04:03 +01:00
Sander Ferdinand
57c0477fc6 Design polish work 2018-03-29 23:04:03 +01:00
Sander Ferdinand
70983136bc Generate proof from history view and made javascript file with tx related functions 2018-03-29 23:04:03 +01:00
Sander Ferdinand
499419a23c Redesigned txkey/sign pages 2018-03-29 23:04:03 +01:00
Sander Ferdinand
57a9508849 Receive page; modified subaddress table 2018-03-29 23:04:03 +01:00
Sander Ferdinand
4977049425 Fixes some fonts, introduces a new checkbox and fixes 0 amount history entries 2018-03-29 23:04:03 +01:00
Sander Ferdinand
a128581ae5 Restyled addressbook panel 2018-03-29 23:04:02 +01:00
Sander Ferdinand
6677a185f8 Some font adjustments 2018-03-29 23:04:02 +01:00
Sander Ferdinand
a9b6a70d15 Cleanup after rebase 2018-03-29 23:04:02 +01:00
Sander Ferdinand
cf2791a246 New history page, including the mobile version. 2018-03-29 23:04:02 +01:00
Sander Ferdinand
4f3bf839f7 Hover effects for titlebar buttons 2018-03-29 23:04:02 +01:00
Sander Ferdinand
129562594d Removing unnecessary label 2018-03-29 23:04:02 +01:00
Sander Ferdinand
f262ce5209 Finishing up on the settings page for now and modified some QML components 2018-03-29 23:04:02 +01:00
Sander Ferdinand
be9cb8931c StandardButton - removed unused properties and some layout changes to settings page 2018-03-29 23:04:02 +01:00
Sander Ferdinand
0477af1b0d Settings - dropdown for log level 2018-03-29 23:04:02 +01:00
Sander Ferdinand
0b9e89691d Remove debugging leftovers from transfer page 2018-03-29 23:04:02 +01:00
Sander Ferdinand
d654ec1647 Settings page WIP 2018-03-29 23:04:02 +01:00
Sander Ferdinand
e5357c8a0b Receive page development 2018-03-29 23:04:02 +01:00
cryptochangements34
de3fd183d8 Re-style AddressBookTable 2018-03-29 23:04:02 +01:00
Sander Ferdinand
f48cd1b82b Checkbox/Standard button development 2018-03-29 23:04:01 +01:00
Sander Ferdinand
948669edbc Move default divider/button colors to Style.qml 2018-03-29 23:04:01 +01:00
Sander Ferdinand
868fbe2f2d Move default font color to Style.qml 2018-03-29 23:04:01 +01:00
Sander Ferdinand
af9e4e86f0 Replacing checkbox, using default values from component 2018-03-29 23:04:01 +01:00
Sander Ferdinand
5028491ab3 Added new checkbox checked icon 2018-03-29 23:04:01 +01:00
Sander Ferdinand
8c44c4c842 Adressbook QML development 2018-03-29 23:04:01 +01:00
Sander Ferdinand
df21e36f5b Removing copy button for addressLine, fixing margins for advanced options 2018-03-29 23:04:01 +01:00
Sander Ferdinand
01f7b6cbfb Transfer page QML development 2018-03-29 23:04:01 +01:00
Sander Ferdinand
6d21b9919d InlineButton development 2018-03-29 23:04:01 +01:00
Sander Ferdinand
e62fab767a Added inlineButton for lineEdit and worked on network status progress bar + text 2018-03-29 23:04:00 +01:00
Sander Ferdinand
f15d6f5197 Added some styles, changed some margins, testing with the new LineEdit 2018-03-29 23:04:00 +01:00
moneromooo-monero
22a1114501 Add segregation key reuse mitigation options 2018-03-26 20:57:33 +01:00
moneromooo-monero
65ea07af61 Add a shared ringdb management page - rings and blackballed outputs 2018-03-26 20:57:33 +01:00
stoffu
c8f0cf3543
Stagenet 2018-03-14 23:26:25 +09:00
luigi1111
f12d47386f
Merge pull request #1176
c0ffe5b Transfer: min ring size is now 7, from 5
2018-03-13 17:41:03 -04:00
luigi1111
0096765676
Merge pull request #1171
17c3602 Settings: fix visibility of bootstrap daemon setting
2018-03-13 17:31:12 -04:00
luigi1111
39db876fee
Merge pull request #1082
4c9e2c1 [Issue 1080] Fixed undefined variable for password rewrite when changing wallet initial block height
2018-03-13 16:27:27 -04:00
luigi1111
689123fa95
Merge pull request #1015
da32161 Use wallet2_api isAddressLocal utils method for isDaemonLocal check
2018-03-13 16:14:08 -04:00
moneromooo-monero
c0ffe5b96a Transfer: min ring size is now 7, from 5 2018-03-12 10:16:41 +00:00
stoffu
17c36025a0
Settings: fix visibility of bootstrap daemon setting 2018-03-07 08:33:51 +09:00
luigi1111
4479026649
Merge pull request #1149
22de9db Fix a few uses of undefined data on startup and exit
2018-03-06 12:26:03 -05:00
luigi1111
2deff0611d
Merge pull request #1091
89ec822 removed persistentSettings.startLocalNode as it's synonym for !persistentSettings.useRemoteNode
af882e8 rectified visual switch between local node & remote node
fd1f4bf Bootstrap daemon (requires #3165)
2018-03-06 12:24:20 -05:00
moneromooo.monero
22de9db4e1 Fix a few uses of undefined data on startup and exit 2018-03-03 23:26:20 +00:00
stoffu
5db9185409
startsWith is unsupported for Qt < 5.8, use indexOf instead 2018-02-20 12:10:19 +09:00
stoffu
fd1f4bf628
Bootstrap daemon (requires #3165) 2018-01-30 07:45:11 +09:00
stoffu
af882e87f5
rectified visual switch between local node & remote node 2018-01-30 07:45:08 +09:00
stoffu
89ec822ba5
removed persistentSettings.startLocalNode as it's synonym for !persistentSettings.useRemoteNode 2018-01-30 07:45:03 +09:00
stoffu
b9757fe837
Transfer: automatically use low priority if no backlog is present (requires #3123) 2018-01-27 11:00:10 +09:00
luigi1111
629f460eb6
Merge pull request #1065
fdd528b Update copyright for 2018
2018-01-26 14:33:47 -05:00
Neozaru
4c9e2c1f1a [Issue 1080] Fixed undefined variable for password rewrite when changing wallet initial block height 2018-01-17 11:56:53 +01:00
kenshi84
a6a7b56d73
ditch payment ID from the Receive page 2018-01-13 14:37:14 +09:00
kenshi84
cee0474e37
Subaddresses minimal version: supports default account only 2018-01-13 14:37:07 +09:00
luigi1111
3b069ec049
Merge pull request #1021
c320878 put wallet name in debug info
2018-01-11 17:02:24 -05:00
luigi1111
d52486dfab
Merge pull request #889
cec206e Refactor wallet password dialog

cf488f4 Allow password to be changed
2018-01-11 11:03:05 -05:00
xmr-eric
fdd528b99e Update copyright for 2018 2018-01-08 12:51:26 -05:00
luigi1111
4189900e86
Merge pull request #981
c1ac91d Refresh base translations before making any changes.

7ba6eac Cleanup html/css in text to be translated.

934f538 Regenerated en translation file from clean ver
2018-01-06 17:17:19 -05:00
stoffu
cf488f4406
Allow password to be changed 2018-01-05 16:11:32 +09:00
User
c3208785cf
put wallet name in debug info 2017-12-21 15:40:47 -05:00
luigi1111
64ce0e62e2
Merge pull request #1018
4617a09 show only valid qr codes with valid payment ids
2017-12-19 11:35:43 -06:00
luigi1111
93565d996c
Merge pull request #1014
b73bcdf Receive page: QR code bug fix for invalid payment ids
2017-12-17 12:37:06 -06:00
luigi1111
f9447fa4a1
Merge pull request #989
bdffc7d Transfer: remove pre-v5 priority list (followup for #824)
2017-12-17 12:28:57 -06:00
Tim L
b73bcdf4b9 Receive page: QR code bug fix for invalid payment ids 2017-12-13 09:25:37 -05:00
User
4617a09af9
show only valid qr codes with valid payment ids
fix broken amount field

remove unnecessary braces

remove bad pid string and whitespace changes

remove payment id check in qr generation
2017-12-13 05:03:01 -05:00
stoffu
bdffc7d12b
Transfer: remove pre-v5 priority list (followup for #824) 2017-12-12 09:46:37 +09:00
Tim L
da3216156d Use wallet2_api isAddressLocal utils method for isDaemonLocal check 2017-12-11 16:44:01 -05:00
Jonathan Cross
7ba6eac43a
Cleanup html/css in text to be translated. 2017-12-01 15:38:57 +01:00
stoffu
5cda1f5ac1
Spend proof 2017-11-30 08:36:28 +09:00
stoffu
d8f3a52378
Bugfix with tx proof + update 2017-11-26 11:46:41 +09:00
stoffu
d79fe0f457
Tx proof 2017-11-20 14:34:48 +09:00
fungible-crypto
11f3e6f8e7
Update Settings.qml
[LOW priority] [UX misspelling]
Updated misspelling and added period.
2017-11-12 15:01:19 -06:00
Jaquee
15ea9ec748 trim daemon address 2017-11-03 16:57:12 +01:00
Jaquee
4775a5b74d mobile layout tweaks 2017-11-03 16:57:12 +01:00
Jaquee
2170f6a46d Improve copy text handling 2017-11-03 16:57:12 +01:00
Jaquee
72d220462a AddressBook mobile redesign 2017-11-03 16:57:12 +01:00
Jaquee
58030c67c8 Transfer - mobile redesign 2017-11-03 16:57:11 +01:00
Jaquee
aded122465 Sign page - redesign 2017-11-03 16:57:11 +01:00
Jaquee
d834fb419c Receive page mobile layout fix 2017-11-03 16:57:11 +01:00
Jaquee
c1c6d9ee6d History: use mobile layout 2017-11-03 16:57:11 +01:00
Jaquee
b6f268d3a5 remote node settings and use-while-local-is-syncing 2017-11-03 16:57:11 +01:00
Jaquee
4dc0d36b98 pages mobile scaling 2017-11-03 16:57:11 +01:00
Jaquee
603c1e7ee9 Add Keys page 2017-11-03 16:57:10 +01:00
Jaquee
d8ebafaec0 show correct height after switching wallets
requires #2724
2017-10-24 19:13:28 +02:00
Jaquee
8f73bac95c add option to change wallet creation height and rescan wallet cache 2017-10-23 18:16:27 -05:00
Jaquee
aac7fc613a make privay level slider smoother 2017-10-22 22:18:55 +02:00
Riccardo Spagni
56868c06b5
Merge pull request #851
86e9f38 Only prompt for daemon auto start when daemon address is local (Jaquee)
2017-09-04 17:17:52 +02:00
Riccardo Spagni
3df70ff98c
Merge pull request #849
fc576a8 Fix collapsing of transaction filter (MaxXor)
2017-09-04 17:17:36 +02:00
Riccardo Spagni
6d09555cd4
Merge pull request #845
3d0a571 Fix verifySignatureLine positioning (MaxXor)
2017-09-04 17:16:24 +02:00
Riccardo Spagni
4d9d10013b
Merge pull request #844
7c366dd Fix mining status positioning (MaxXor)
2017-09-04 17:16:13 +02:00
Jaquee
86e9f3811b Only prompt for daemon auto start when daemon address is local 2017-09-04 13:42:46 +02:00
MaxXor
fc576a8680 Fix collapsing of transaction filter 2017-09-03 14:44:28 +02:00
MaxXor
3d0a571cc7 Fix verifySignatureLine positioning 2017-08-31 14:07:55 +02:00
MaxXor
7c366ddf04 Fix mining status positioning 2017-08-31 14:04:11 +02:00
Jaquee
f7c883a6c3 Settings: add wallet creation height and log file paths 2017-08-24 12:09:00 +02:00
Jaquee
3adb29bc16 Remove unnecessary synchronous call to useForkRules 2017-08-19 16:52:22 +02:00
Riccardo Spagni
0eaebb01c4
Merge pull request #779
e43b719 Removing unused tipText strings which clutter up translations. (Jonathan Cross)
2017-07-03 11:55:05 +02:00
Jonathan Cross
e43b719b19
Removing unused tipText strings which clutter up translations. 2017-06-21 20:33:57 +02:00
Guillaume LE VAILLANT
92c0e00b12 Add missing strings for ListElement property workaround 2017-06-21 11:55:58 +02:00
Riccardo Spagni
ecaa1a8e23
Merge pull request #709
62e1dc4 Setttings: blockchain folder location (Jaquee)
9037eed DaemonManager: support dataDir parameter + validator (Jaquee)
2017-06-04 12:17:58 +02:00
Jaquee
62e1dc490f Setttings: blockchain folder location 2017-06-02 23:49:16 +02:00
Jaquee
443eb47824 UX: move 'rescan spent' to settings and rename to 'Rescan wallet balance' 2017-06-02 23:37:48 +02:00
Riccardo Spagni
affbb454fa
Merge pull request #737
41b2c28 Fallback to english seed lang if not set (Jaquee)
127790e set correct seed lang when recovering from keys (Jaquee)
2017-05-30 21:49:51 +02:00
Jaquee
41b2c282bd Fallback to english seed lang if not set 2017-05-23 14:03:23 +02:00
Jaquee
5ec575b376 Do not output seed in log 2017-05-09 13:08:40 +02:00
Jaquee
2e53c524a1 ios build settings 2017-05-05 12:03:03 +02:00
Riccardo Spagni
f5450f9205
Merge pull request #706
f00a181 Disable rescan cache btn until we know if it's needed (Jaquee)
98b0406 Settings: Rescan wallet cache button (Jaquee)
2017-05-05 11:50:43 +02:00
Riccardo Spagni
27e37f153f
Merge pull request #703
45106e5 Enable smart mining (Jaquee)
2017-05-05 11:48:20 +02:00
Riccardo Spagni
58f24efd39
Merge pull request #702
f31b27d add wallet view/spend keys to seed dialog requires #2012 (Jaquee)
2017-05-05 11:48:03 +02:00
Jaquee
f00a181843 Disable rescan cache btn until we know if it's needed 2017-05-03 15:57:41 +02:00
Jaquee
98b040670c Settings: Rescan wallet cache button 2017-05-03 14:37:33 +02:00
Jaquee
f31b27d3fd add wallet view/spend keys to seed dialog
requires #2012
2017-05-03 11:14:57 +02:00
Jaquee
45106e5150 Enable smart mining 2017-05-02 19:14:32 +02:00
Riccardo Spagni
feabe6713c
Merge pull request #678
949d852 Better titles for priority settings (xmr-eric)
cbc9dd0 Refactor fee copy (xmr-eric)
2017-04-24 11:28:51 +02:00
xmr-eric
949d85288d Better titles for priority settings 2017-04-19 18:14:04 -04:00
xmr-eric
cbc9dd07c8 Refactor fee copy
Don't round up High fee to x42
2017-04-15 00:34:43 -04:00
xmr-eric
06b12d167b Capitalize "Create tx file" button 2017-03-28 19:15:55 -04:00
Riccardo Spagni
b3877868a3
Merge pull request #597
9c4c34d Use new fee multipliers after v5 fork requires #1915 (Jaquee)
f05f0b7 add WalletManager::useForkRules() (Jaquee)
2017-03-25 17:39:07 +02:00
Jaquee
9c4c34d502 Use new fee multipliers after v5 fork
requires #1915
2017-03-24 10:12:14 +01:00
xmr-eric
6fbba9f88c Settlings.qml: Change "Save" button to "Connect" 2017-03-23 13:30:36 -04:00
xmr-eric
174d6ad019 Receive.qml Amount placeholder 2017-03-19 18:55:33 -04:00
Riccardo Spagni
2542b14534
Merge pull request #571
064c980 Small button improvements (xmr-eric)
2017-03-19 23:51:06 +02:00
Riccardo Spagni
42fb1ed51d
Merge pull request #570
5f2e5b0 Better Integrated address placeholder (xmr-eric)
2017-03-19 23:50:43 +02:00
Riccardo Spagni
23a3b1265a
Merge pull request #569
10b00f8 Edit: Removed bold (xmr-eric)
7ab5511 Better copy for mining page (xmr-eric)
2017-03-19 23:50:23 +02:00
xmr-eric
10b00f8778 Edit: Removed bold 2017-03-19 12:13:00 -04:00
xmr-eric
064c9805f6 Small button improvements 2017-03-18 22:57:48 -04:00
xmr-eric
5f2e5b041c Better Integrated address placeholder 2017-03-18 21:15:42 -04:00
xmr-eric
7ab5511de3 Better copy for mining page 2017-03-18 19:32:25 -04:00
Michael Campagnaro
51074a8fe6 Add a clear payment ID button 2017-03-18 18:28:29 -04:00
Michael Campagnaro
43a33e717d Don't set a default payment ID on receive page 2017-03-18 18:01:00 -04:00
Riccardo Spagni
aeea9ad324
Merge pull request #562
53d7962 Improve text wrap on mining page (Michael Campagnaro)
2017-03-18 11:48:47 +02:00
Michael Campagnaro
53d7962eaa Improve text wrap on mining page 2017-03-17 17:55:30 -04:00
Roy Jacobs
2b24c91bc5 Add missing, fix and improve translations 2017-03-14 15:14:02 +01:00
Riccardo Spagni
b0d0974561
Merge pull request #550
c45cc3d enabled translations in some places (kenshi84)
6364530 updated Japanese translation (kenshi84)
2017-03-11 20:31:02 +01:00
Jaquee
3c8a552522 fix addressbook button width 2017-03-11 15:38:01 +01:00
Jaquee
6a666ead39 fix dynamic width on send btn 2017-03-11 15:36:27 +01:00
Jaquee
1918c5e24a fix dynamic button width 2017-03-11 15:36:25 +01:00
kenshi84
c45cc3de41
enabled translations in some places 2017-03-11 14:09:09 +09:00
Riccardo Spagni
b757cc28b8
Merge pull request #548
4c2f78a Fix translations in dropdown menu (Jaquee)
2017-03-10 14:32:08 +00:00
Jaquee
4c2f78a78b
Fix translations in dropdown menu 2017-03-09 16:46:03 +01:00
Roy Jacobs
a2f01ea541 Added missing Receive/Settings/Sign/Transfer translations 2017-03-09 01:28:24 +01:00
Roy Jacobs
1a1a7a991b Added missing AddressBook translations 2017-03-08 23:35:19 +01:00
Roy Jacobs
c30586ccc8 Fixed missing translation 2017-03-08 21:12:17 +01:00
Riccardo Spagni
a6f3510ee4
Merge pull request #535
03eaaa4 mining: disable mining status check for remote nodes (Jaquee)
2017-03-07 11:02:13 +00:00
Jaquee
03eaaa46e0 mining: disable mining status check for remote nodes 2017-03-03 22:01:57 +01:00
Jaquee
4fe6b1fd0b recieve page: change payment id description to 16 hex 2017-03-03 18:18:55 +01:00
Jaquee
223f09dc94 preparations for background mining
requires #1827
2017-03-03 15:44:01 +01:00
Riccardo Spagni
988e299290
Merge pull request #498
4e29c14 transfer: increased top margin (Jaquee)
30f87a1 Transfer: hide advanced options (Jaquee)
2017-03-03 16:36:34 +02:00
Riccardo Spagni
cc86720936
Merge pull request #528
5d6e0f5 Trim daemon address (Jaquee)
2017-03-03 16:30:38 +02:00
Jaquee
4e29c1474e transfer: increased top margin 2017-03-03 15:23:23 +01:00
Jaquee
30f87a1019 Transfer: hide advanced options 2017-03-03 15:23:22 +01:00
Riccardo Spagni
573b284017
Merge pull request #508
677432f Better styling for Miner (xmr-eric)
2017-03-03 16:20:25 +02:00
Riccardo Spagni
f11ec2d0bd
Merge pull request #504
44bcb3d Update PrivacyLevelSmall.qml (xmr-eric)
e8875e0 PrivacyLevelSmall.qml: mixed case for Wizard (xmr-eric)
d354d4a Sign Verify: keep text mixed case (xmr-eric)
d1202e4 TxKey.qml: Keep text mixed case (xmr-eric)
08d5730 History.qml: Keep text mixed case (xmr-eric)
92a5781 Addressbook.qml: Keep text mixed case (xmr-eric)
9ac8e26 TickDelegate.qml: Keep text mixed case (xmr-eric)
0b017ff Transfer.qml: Keep buttons mixed case (xmr-eric)
2017-03-03 16:18:31 +02:00
Riccardo Spagni
5b1588b077
Merge pull request #494
00aa231 Daemon rpc login support requires #1803 (Jaquee)
2017-03-03 16:14:33 +02:00
Jaquee
5d6e0f5851
Trim daemon address 2017-03-03 12:40:50 +01:00
xmr-eric
677432f634 Better styling for Miner 2017-02-27 20:43:29 -05:00
xmr-eric
d354d4aa54 Sign Verify: keep text mixed case 2017-02-27 17:12:13 -05:00
xmr-eric
d1202e44eb TxKey.qml: Keep text mixed case 2017-02-27 17:09:23 -05:00
xmr-eric
08d5730fbe History.qml: Keep text mixed case 2017-02-27 17:08:07 -05:00
xmr-eric
92a5781b6a Addressbook.qml: Keep text mixed case 2017-02-27 17:06:05 -05:00
xmr-eric
0b017ff954 Transfer.qml: Keep buttons mixed case 2017-02-27 17:02:33 -05:00
Jaquee
00aa23162c
Daemon rpc login support
requires #1803
2017-02-25 22:18:52 +01:00
Jaquee
2ed59f41ed Daemon manager improvements 2017-02-25 14:57:39 +01:00
Riccardo Spagni
2ca2376d45
Merge pull request #486
faacd3d start daemon automatically and detached (Jaquee)
2017-02-24 16:04:13 +02:00
Jaquee
faacd3d6a1
start daemon automatically and detached 2017-02-23 19:52:06 +01:00
xmr-eric
3ed4dee00e Transfer.qml: Make ringsize one word 2017-02-22 14:19:50 -05:00
Jaquee
08ceb5eba0
settings: replace seed box with popup
requires #1709
2017-02-11 19:30:09 +01:00
Riccardo Spagni
1869e81883
Merge pull request #460
02ab113 clear payment fields after transfer (Jaquee)
756a821 Wizard: clear restore from keys fields on wizard restart (Jaquee)
2017-02-08 12:43:48 +02:00
Jaquee
02ab113762
clear payment fields after transfer 2017-02-05 20:26:58 +01:00
moneromooo.monero
40540cb38a Save custom log categories to persistent settings 2017-02-05 12:38:43 +00:00
Riccardo Spagni
739d24efb4
Merge pull request #442
0b41fbc Don't close/reopen when changing daemon requires #1655 (Jaquee)
2586404 sync progress improvements (Jaquee)
eb909e1 async connectionStatus and init (Jaquee)
cb3281d WalletManager: fix possible race (Jaquee)
9dbbd4c WalletManager: check connection before isMining() (Jaquee)
2017-02-04 17:46:57 +02:00
Riccardo Spagni
f2a583fd49
Merge pull request #433
faeead2 Better placeholders (xmr-eric)
9425b77 Payment ID Placeholder: 64 characters only (xmr-eric)
ce87a1c Added AddressBook.qml placeholders (xmr-eric)
2017-02-04 17:44:47 +02:00
Riccardo Spagni
488e4e2b86
Merge pull request #430
4e2e262 Main.qml: Ringsize equals mixin +1 (xmr-eric)
f1327ac Ringsize equals mixin +1 (xmr-eric)
2d12a3c Main.qml: Changed mixin to ring size (xmr-eric)
16f5889 Transfer.qml: Changed mixin to ring size (xmr-eric)
2017-02-04 17:44:20 +02:00
Jaquee
0b41fbc858
Don't close/reopen when changing daemon
requires #1655
2017-01-31 11:17:56 +01:00
Jaquee
2586404339 sync progress improvements 2017-01-31 11:17:48 +01:00
MoroccanMalinois
93d2eb5e1a add qrcode scanner 2017-01-31 04:36:08 +00:00
xmr-eric
faeead242c Better placeholders 2017-01-30 18:45:16 -05:00
xmr-eric
f1327ace32 Ringsize equals mixin +1 2017-01-30 18:27:55 -05: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