xiphon
a113670905
History: don't show empty paymentId in tx details
2019-12-13 10:42:47 +00:00
xiphon
ba24fd79bb
SettingsInfo: open containing folder on wallet log path click
2019-12-12 00:10:22 +00:00
selsta
b940ad72be
InputDialog: pre-populate input text
2019-12-09 17:38:09 +01:00
luigi1111
1cee81b996
Merge pull request #2404
...
8dd2a20e04db92d06ae80c83c74d1723d0452182ef97a9ac92d2391791aff7c
2019-12-09 07:52:41 -06:00
luigi1111
f03ea0461c
Merge pull request #2560
...
6ce9a3c
2019-12-05 09:35:52 -06:00
xiphon
6ce9a3cba0
History: fix translations
2019-12-05 15:18:15 +00:00
luigi1111
8cd32987d4
Revert "Merge pull request #2526 "
...
This reverts commit 457b1dee497cca39ad48
2019-12-05 09:03:56 -06:00
luigi1111
648b775a25
Merge pull request #2559
...
e81a589
2019-12-05 08:53:47 -06:00
luigi1111
0e65d89172
Merge pull request #2555
...
676b8d6
2019-12-05 08:50:15 -06:00
luigi1111
3d7ded209a
Merge pull request #2540
...
983a3ba
2019-12-05 08:47:54 -06:00
xiphon
e81a589a8d
Transfer: improve amount sanitization
2019-12-05 10:13:29 +00:00
xiphon
676b8d6921
History: add date, amount, integrated addr (incoming) to tx details
2019-12-04 21:07:10 +00:00
luigi1111
63d4ba6df8
Merge pull request #2551
...
646d339
2019-12-03 22:32:58 -06:00
luigi1111
6e7b4ff9f9
Merge pull request #2542
...
32f7666
2019-12-03 22:31:20 -06:00
luigi1111
457b1dee49
Merge pull request #2526
...
20a5814
2019-12-03 22:26:00 -06:00
xiphon
646d3394d3
Wallet: persistent subaddress account selection
2019-12-03 12:39:34 +00:00
selsta
983a3ba7ad
Translation: fix untranslated strings
2019-12-02 00:09:43 +01:00
xiphon
32f7666912
DatePicker: don't propagate mouse events to underlying controls
2019-11-29 17:22:00 +00:00
selsta
20a58143b6
Transfer: add parenthesis to links
2019-11-28 12:25:33 +01:00
TheCharlatan
8dd2a20ff8
Migrate build system to cmake
...
The content in this commit is not split in order to preserve working
compilation. Once this is added to master, the old build script will no
longer work and all existing build toolings will require changes.
Monero's cmake directory's files need to be copied to this project's cmake
directory in order for the linking and function definitions to work correctly.
Monero-gui has its own version check and generate file in order to not
conflict with monero's destination version files.
Most of the source files that are currently in monero-gui's root
directory are now moved to subdirectories. This is done to preserve
compilation order properly and to give some content structure.
The original CMakeList file included all headers it found in
subdirectories. Make sure that they are set manually to evade linking
errors.
The current build script always checks out latest master of the monero
submodule. The submodule rules in the current CMakeLists.txt file do not
enforce. An override to compile master nevertheless can still be given
with `-D DEV_MODE`.
To enable the linux X11 xcb linking the libraries had to be hardcoded. There
does not seem to be good support for this in pkgconfig, or in
existing cmake checks.
2019-11-27 22:59:27 +01:00
selsta
c0fa4f5d27
SettingsLayout: pointing mouse cursor and selecting text
2019-11-27 18:49:18 +01:00
xiphon
f47335f89f
Wizard, AddressBook, SettingsNode: prevent undesired text selection
2019-11-27 12:33:30 +00:00
luigi1111
6c2c17ada1
Merge pull request #2489
...
0daf2aa
2019-11-25 12:57:28 -06:00
luigi1111
9f0f40af80
Merge pull request #2486
...
06ccded
2019-11-25 12:46:09 -06:00
xiphon
0daf2aacf5
CheckBox: use Font Awesome plus/minus icons, remove unused images
2019-11-25 06:37:21 +00:00
selsta
06ccded94e
Transfer: fix NaN fiat conversion
2019-11-25 00:57:59 +01:00
xiphon
a9a59fd314
main: ask whether to stop local node upon switching to remote node
2019-11-24 10:19:40 +00:00
luigi1111
cf0e5a811e
Merge pull request #2440
...
e9cdaf4
2019-11-13 09:08:16 -06:00
luigi1111
47bc0f2a3c
Merge pull request #2435
...
0e3f3c1
2019-11-13 09:03:51 -06:00
luigi1111
8bd820b909
Merge pull request #2429
...
74e12ce
2019-11-13 09:03:02 -06:00
luigi1111
f948d0e214
Merge pull request #2428
...
5fe6b48
2019-11-13 09:02:03 -06:00
luigi1111
3a7c9e6c8e
Merge pull request #2417
...
212c8dd
2019-11-13 09:00:44 -06:00
xiphon
e9cdaf4dbe
Transfer: convert and display entered amount in fiat currency
2019-11-13 08:10:49 +00:00
xiphon
0e3f3c13a1
SettingsWallet: refactor list items into separate component
2019-11-11 21:14:39 +00:00
xiphon
74e12ce71d
ContextMenu: implement 'paste' context menu for all text fields
2019-11-08 12:41:32 +00:00
xiphon
5fe6b48517
Settings: fix 'Light theme' checkbox
2019-11-04 21:47:38 +00:00
xiphon
5df14abed2
Merchant: fix leaving the page
2019-11-01 12:19:25 +00:00
peli-pro
212c8dd054
Warning added that balance reflects only incoming transactions for view-only wallets
2019-10-17 14:25:36 +02:00
luigi1111
fe3c06c36b
Merge pull request #2415
...
631a1c4#2412 ) (jtgrassie)
2019-10-14 17:59:13 -05:00
luigi1111
897d879dad
Merge pull request #2398
...
32257c8
2019-10-14 17:50:54 -05:00
Jethro Grassie
631a1c49c8
fix fee labels in transfer ( #2412 )
2019-10-13 13:07:52 -04:00
luigi1111
e6458b58ef
Merge pull request #2402
...
f72ed25
2019-10-08 15:21:35 -05:00
luigi1111
9207462676
Merge pull request #2401
...
947e265
2019-10-08 15:20:07 -05:00
xiphon
32257c8fab
DaemonManager: implement async sendCommand
2019-10-07 10:39:30 +00:00
xiphon
f72ed257ce
Transfer: forbid long Payment IDs
2019-09-28 02:01:20 +00:00
xiphon
947e265a1a
Transfer: warn on long Payment ID filled into description field
2019-09-28 01:46:22 +00:00
xiphon
77ff362b58
SettingsNode: 'auto' special case for Bootstrap Address edit
2019-09-27 15:50:38 +00:00
selsta
2ca76ff13c
LeftPanel: new balance card
2019-09-21 01:23:09 +02:00
luigi1111
31501316c9
Merge pull request #2377
...
8dab075
2019-09-14 12:43:36 -05:00
selsta
6df9e584b3
fontawesome: fix regular/solid font style
2019-09-10 13:14:10 +02:00
selsta
8dab0755d3
repo: remove isMobile leftovers
2019-09-06 00:11:12 +02:00
luigi1111
0abaae073d
Merge pull request #2372
...
cb9cb6e
2019-09-04 09:48:58 -05:00
xiphon
cb9cb6eb09
FontAwesome: bump to 5.10.2
2019-09-03 18:43:12 +00:00
selsta
a83910d7de
SettingsNode: make input read only
2019-09-01 02:38:03 +02:00
luigi1111
346e942e93
Merge pull request #2360
...
29580de
2019-08-27 14:58:33 -05:00
luigi1111
9a58e88ec6
Merge pull request #2351
...
b616e1c
2019-08-27 14:53:29 -05:00
xiphon
29580de2c7
History: fix tx key 'click to reveal' handling
2019-08-26 04:05:35 +00:00
luigi1111
562c46660a
Merge pull request #2349
...
1ec22b3
2019-08-14 15:52:02 -05:00
selsta
b616e1c8f6
SettingsNode: change icons
2019-08-14 20:35:53 +02:00
xiphon
1ec22b3d0c
history: fix start/end of the day calculation, apply local timezone
2019-08-13 14:25:16 +00:00
selsta
18f7a6a694
Receive: fix warning
2019-08-07 14:19:56 +02:00
luigi1111
e01c2e903a
Merge pull request #2327
...
059a2d7
2019-08-06 15:04:39 -05:00
luigi1111
886be81af2
Merge pull request #2315
...
1e64ebe
2019-08-06 15:03:40 -05:00
luigi1111
5f8cb04fee
Merge pull request #2221
...
2d72f55
2019-08-06 15:01:48 -05:00
selsta
059a2d754e
SettingsNode: make button text more consistent
2019-07-27 18:08:24 +02:00
selsta
1e64ebe17a
QML: warning fixes
2019-07-24 05:24:37 +02:00
selsta
afe2b14430
QML: fix more warnings
2019-07-22 23:11:38 +02:00
luigi1111
a65222d057
Merge pull request #2302
...
7e40a81
2019-07-22 13:35:24 -05:00
luigi1111
25e56ee8fb
Merge pull request #2307
...
f20ab12
2019-07-22 13:29:31 -05:00
selsta
f20ab12cf3
QML: fix various warnings
2019-07-21 23:23:03 +02:00
selsta
e6642c4338
Account/Receive: update table on new entry
2019-07-21 21:17:18 +02:00
selsta
7e40a810eb
Account: fix theme switch label color
2019-07-20 02:54:16 +02:00
dsc
0b61328971
Detect tails, support data persistence
...
Co-authored-by: Thotbot <thotbot@protonmail.com>
Co-authored-by: Selsta <selsta@sent.at>
2019-07-16 18:33:44 +02:00
luigi1111
3a9f0e1100
Merge pull request #2240
...
35a0f25
2019-07-15 18:38:32 -05:00
Dusan Klinec
2d72f55e57
device: show address on device display
2019-07-15 17:54:50 +02:00
selsta
35a0f25b57
PasswordDialog: merge components and bug fixes
...
This commit merges PasswordDialog, PassphraseDialog and
NewPasswordDialog. Also the following bugs were fixed:
- Wizard pages still being active when opening a wallet
from wizard.
- Capslock detection was buggy when copy pasting password, I
replaced it with native implementations for each platform.
- isAlpha could throw errors when using special characters.
2019-07-15 00:05:10 +02:00
luigi1111
702b654f09
Merge pull request #2263
...
14619b9
2019-07-12 20:39:27 -05:00
luigi1111
b3402b3d4e
Merge pull request #2251
...
5f5f210
2019-07-12 20:36:52 -05:00
luigi1111
5b411b471e
Merge pull request #2250
...
84865cd
2019-07-12 20:35:29 -05:00
luigi1111
79dcb92d18
Merge pull request #2247
...
ab9e31e
2019-07-12 20:34:10 -05:00
luigi1111
8bbc2e87bc
Merge pull request #2246
...
c34a2b4
2019-07-12 20:33:22 -05:00
selsta
14619b9437
History: don't reset date filtering when switching page
2019-07-04 15:17:41 +02:00
selsta
5f5f2103c0
History: dynamic number of tx rows
2019-07-03 15:24:39 +02:00
selsta
84865cdead
History: allow to search for tx_note
2019-07-03 13:54:01 +02:00
selsta
c34a2b43fc
QML: fix warnings
2019-07-02 15:10:40 +02:00
xiphon
ab9e31e7cc
WalletManager: async close with splash screen
2019-07-02 11:11:38 +00:00
luigi1111
3c3848633e
Merge pull request #1960
...
63ee61b
2019-06-25 14:00:47 -05:00
luigi1111
f6a797fcb5
Merge pull request #2220
...
8d49ad96d03d63
2019-06-21 14:39:20 -05:00
luigi1111
3bb69fd645
Merge pull request #2200
...
c69f0ad
2019-06-21 14:36:20 -05:00
luigi1111
a4648d9738
Merge pull request #2194
...
7aff9e6
2019-06-21 14:33:40 -05:00
luigi1111
edb849fa81
Merge pull request #2170
...
a3c620f
2019-06-21 14:27:26 -05:00
Dusan Klinec
6d03d63c88
get_tx_key, get_tx_proof, tx_spend_proof async
2019-06-20 14:57:10 +02:00
Dusan Klinec
8d49ad9ba4
tx_key not displayed by default, click to reveal
2019-06-18 13:30:06 +02:00
erciccione
c69f0adac8
add missed translatable string in SettingsNode.qml
2019-06-06 15:04:54 +02:00
luigi1111
189f905785
Merge pull request #2182
...
73a3549
2019-06-05 22:33:57 -05:00
cryptochangements34
7aff9e6af0
remove Seed & Keys subtab in left panel
2019-06-03 17:32:38 -04:00
xiphon
73a3549e09
WalletManager: non-blocking mining status updates
2019-05-30 23:17:26 +00:00
mmbyday
ca9883b6c0
Fix restore height when using stagenet/testnet
2019-05-24 11:58:46 -07:00
mmbyday
a3c620f78d
restore height visibility enhancements
2019-05-15 00:37:53 -07:00
luigi1111
209679abef
Merge pull request #2164
...
96945c2
2019-05-10 13:22:15 -05:00
luigi1111
b77eca9db1
Merge pull request #2156
...
fbe1de1
2019-05-10 13:20:04 -05:00
selsta
96945c2c79
MiddlePanel: dynamic content height
2019-05-07 07:34:50 +02:00
dsc
d4be7634cb
Fiat API
...
Co-Authored-By: selsta <selsta@sent.at>
Co-Authored-By: Gene Peters <gene@telligent-data.com>
2019-05-06 04:36:23 +02:00
mmbyday
fbe1de1164
keys: ux improvements for hardware device wallet
2019-05-03 00:38:09 -07:00
selsta
c82bffeacc
SettingsLayout: fix order
2019-05-01 23:17:41 +02:00
selsta
83e434395b
Transfer: warn when sending to a known long PID service
2019-04-30 22:45:11 +02:00
luigi1111
5062886815
Merge pull request #2125
...
d37de31
2019-04-30 15:25:05 -05:00
luigi1111
6b54017f08
Merge pull request #2092
...
9b7adfc
2019-04-30 15:20:51 -05:00
dsc
18f2accc7f
IPC and custom protocol handler for monero://
2019-04-29 19:56:46 +02:00
luigi1111
cc5aab8c5f
Merge pull request #2119
...
4ab1816
2019-04-28 22:03:37 -05:00
luigi1111
dff0a07a8a
Merge pull request #2116
...
7ab8b4f
2019-04-28 21:58:45 -05:00
mmbyday
d37de31b35
sign: use radiobuttons to change modes
2019-04-27 21:47:25 -07:00
selsta
4ab1816e1a
Mining: fix newline
2019-04-27 23:47:44 +02:00
mmbyday
9b7adfc0a8
transfer: change description/pid checkbox
2019-04-26 02:03:50 -07:00
selsta
7ab8b4fac7
SettingsLayout: userInactivitySliderTimer is not defined
2019-04-25 23:41:55 +02:00
xmrdsc
99365fadf0
Dynamic height for the settings->wallet
2019-04-25 22:55:46 +02:00
luigi1111
7d9a698732
Merge pull request #2078
...
74dbe8b
2019-04-25 15:37:59 -05:00
selsta
74dbe8bfcb
Account/Receive: update design
2019-04-25 22:36:02 +02:00
luigi1111
edaa28cc23
Merge pull request #2086
...
4b9da83
2019-04-25 15:33:06 -05:00
luigi1111
6477e18040
Merge pull request #2083
...
b8d2d05
2019-04-25 15:30:43 -05:00
luigi1111
b0ba2379f4
Merge pull request #2069
...
62285b0
2019-04-25 15:27:19 -05:00
luigi1111
5887f87677
Merge pull request #2058
...
247f129
2019-04-25 15:26:19 -05:00
xmrdsc
4b9da8385b
Change settings navbar text: Layout -> Interface
2019-04-25 21:16:13 +02:00
xmrdsc
b8d2d05fce
Hide certain information from the transactions page if there are no transactions yet
2019-04-25 21:13:41 +02:00
dsc
62285b01dc
Remove scaleRatio
2019-04-25 21:09:23 +02:00
luigi1111
528aba8724
Merge pull request #2095
...
507441f
2019-04-25 13:08:00 -05:00
dsc
42f7afaefd
White theme
2019-04-24 05:37:35 +02:00
luigi1111
358e1d23fa
Merge pull request #2106
...
7b7996d
2019-04-23 15:34:24 -05:00
luigi1111
5d7102efd2
Merge pull request #2094
...
024abdb
2019-04-23 14:06:21 -05:00
luigi1111
4926ee790b
Merge pull request #2080
...
7f1fa6b
2019-04-23 14:01:44 -05:00
mmbyday
7b7996dc66
qrcodescanner: update icon with font awesome
2019-04-22 19:31:29 -07:00
selsta
507441f8b6
History: improve human readable time format
2019-04-19 14:20:26 +02:00
selsta
024abdb46f
Merchant: remove unintentional file and add emptryString
2019-04-19 13:35:15 +02:00
selsta
7f1fa6bbd6
Transfer: warn if description is a valid PID
2019-04-16 16:36:46 +02:00
selsta
15a5f76334
add missing TranslationManager.emptyString
2019-04-16 16:35:30 +02:00
mmbyday
63ee61b8c4
transfer: make simple mode more simple
2019-04-12 21:36:13 -07:00
dsc
7611e826aa
History redesign
2019-04-08 21:28:51 +02:00
selsta
1e6e928995
AddressBook: redesign
2019-04-08 20:40:35 +02:00
dsc
247f129a24
Use Slider.onMoved for inactivity slider, remove Timer
2019-04-08 04:13:29 +02:00
luigi1111
38788aab43
Merge pull request #2014
...
d6f8834
2019-03-21 16:13:46 -04:00
luigi1111
9f53353b07
Merge pull request #2011
...
3562ab1
2019-03-21 16:13:02 -04:00
luigi1111
3b791035bf
Merge pull request #1976
...
dc5028f
2019-03-21 16:11:08 -04:00
luigi1111
c47fed96b0
Merge pull request #1971
...
1ff1091
2019-03-21 16:10:15 -04:00
luigi1111
072d0dea24
Merge pull request #1965
...
01844ef
2019-03-21 16:09:13 -04:00
mmbyday
d6f88349b9
mining: fix layout issues
2019-03-12 16:32:11 -07:00
mmbyday
3562ab1444
settingsnode: fix trusted node flag
2019-03-11 22:51:12 -07:00
mmbyday
e729cd233c
settingslayout: fix change language button does not change language
2019-02-28 14:44:11 -08:00
selsta
c80bc12284
Receive: change account -> address in string
...
Also remove stray spaces.
2019-02-27 23:18:24 +01:00
selsta
dc5028f019
SettingsInfo: allow a date for restore height
2019-02-27 00:26:16 +01:00
selsta
87e93e1b08
Settings: fix create view only wallet button
2019-02-27 00:08:30 +01:00
luigi1111
42103432b7
Merge pull request #1970
...
891ea15
2019-02-25 14:42:06 -06:00
mmbyday
1ff1091ea4
transfer, merchant: placehodler text for amount
2019-02-25 12:17:54 -08:00
mmbyday
891ea158dc
SettingsWallet: hide creating a view wallet for viewOnly wallets
2019-02-25 11:22:30 -08:00
mmbyday
9b17235533
sign, receive: fix reference errors
2019-02-25 09:45:06 -08:00
mmbyday
01844efaa7
transfer: messaging for disabled send button
2019-02-25 08:15:08 -08:00
mmbyday
3ac8772546
addressbook: fix placeholder text for stagenet/testnet
2019-02-24 13:25:11 -08:00
dsc
3dc04b0df3
Replace language sidebar with a dedicated language screen
2019-02-24 06:31:01 +01:00
dsc
f329a71029
Wizard redesign
2019-02-22 03:05:27 +01:00
luigi1111
333f4aaf83
Merge pull request #1944
...
235a1ee
2019-02-21 14:16:33 -06:00
luigi1111
f2b4c468a2
Merge pull request #1943
...
3aff7dd
2019-02-21 14:15:39 -06:00
dsc
235a1ee4b0
Address input field indicative text based on nettype
2019-02-20 06:29:44 +01:00
xiphon
3aff7ddcef
Fix default daemon/remote node RPC port based on the network type
2019-02-17 14:40:03 +00:00
mmbyday
bd42200a29
settingsnode: enable trusted daemon option
2019-02-16 21:19:37 -08:00
luigi1111
0064e595c3
Merge pull request #1936
...
f91b38f02493be
2019-02-14 11:18:07 -06:00
xiphon
f91b38ff53
Revert "Bring back paymentID to tranfer page and force hide paymentId on a settings toggle (and reset fields on transfer page)"
...
This reverts commit 02493be6eb
2019-02-12 13:42:22 +03:00
mmbyday
d36904096d
openalias: usuability improvements on addressbook/transfer page
2019-02-06 22:19:56 -08:00
luigi1111
bb14eeb4fc
Merge pull request #1930
...
57ade04
2019-02-06 16:09:55 -06:00
luigi1111
9e0311fa3d
Merge pull request #1929
...
a3128c9
2019-02-06 16:08:45 -06:00
luigi1111
3caa1c6840
Merge pull request #1923
...
d76330d
2019-02-06 16:06:20 -06:00
luigi1111
64df6a027e
Merge pull request #1914
...
28332f5
2019-02-06 16:04:55 -06:00
mmbyday
57ade0406e
transfer: fix non-existent property cursorPosition
2019-02-01 17:43:40 -08:00
mmbyday
6fa805df62
qrscanner: update addressbook and transfer UI
2019-02-01 15:39:41 -08:00
dsc
a3128c9103
Cleanup advanced pages
2019-02-01 22:20:38 +01:00
mmbyday
d76330d32a
Merchant: fix checkbox
2019-02-01 00:37:09 -08:00
selsta
28332f54e6
Receive: update subaddress table design
2019-02-01 08:22:03 +01:00
luigi1111
c7f3deb5cc
Merge pull request #1922
...
8eb4f0d515d051
2019-02-01 01:11:18 -06:00
luigi1111
0ac4c8c07d
Merge pull request #1921
...
9b5b241
2019-02-01 01:09:58 -06:00
luigi1111
f8008002f6
Merge pull request #1920
...
da3eae2
2019-02-01 01:09:04 -06:00
luigi1111
666dee9bd8
Merge pull request #1916
...
02493be
2019-02-01 01:07:47 -06:00
luigi1111
225abb3144
Merge pull request #1913
...
15b7fe1
2019-02-01 01:06:31 -06:00
luigi1111
10d8fc01ea
Merge pull request #1905
...
bd809ab
2019-02-01 01:04:38 -06:00
luigi1111
73d6b2744e
Merge pull request #1872
...
4b78ef7
2019-02-01 01:00:55 -06:00
luigi1111
b78968b9d5
Merge pull request #1861
...
d5a69cb
2019-02-01 00:02:07 -06:00
dsc
515d051c6a
daemonFlags input: fillWidth and force wrap (multiline)
2019-01-30 15:13:30 +01:00
dsc
8eb4f0db2a
Force save daemon flags
2019-01-30 15:09:45 +01:00
dsc
da3eae20f0
Dynamic monerod --max-concurrency, max 6
2019-01-30 10:38:11 +01:00
xiphon
9b5b241163
History: omit redundant 'Cancel' button in confirmation dialog
2019-01-29 22:42:32 +03:00
dsc
02493be6eb
Bring back paymentID to tranfer page and force hide paymentId on a settings toggle (and reset fields on transfer page)
2019-01-28 14:17:06 +01:00
skftn
4b78ef71dc
Use MoneroComponents for keys page and make warningbox selectable
2019-01-24 09:07:19 +01:00
selsta
bd809abc52
add account support
...
Co-authored-by: kenshi84 <kenshi84@protonmail.ch>
2019-01-22 23:07:30 +01:00
selsta
15b7fe159f
layout: fix top margin on various pages
2019-01-22 15:10:53 +01:00
luigi1111
9689fff957
Merge pull request #1912
...
fd3280c
2019-01-21 15:04:28 -06:00
luigi1111
3577bef711
Merge pull request #1904
...
b758c79
2019-01-21 15:01:25 -06:00
luigi1111
2b3be5ef9a
Merge pull request #1894
...
38401262d18821aa8261584c509c
2019-01-21 14:56:27 -06:00
luigi1111
b44bcffd6f
Merge pull request #1891
...
fa64421
2019-01-21 14:55:03 -06:00
luigi1111
e68d922a0c
Merge pull request #1886
...
bea033b
2019-01-21 14:53:45 -06:00
luigi1111
a6824c6802
Merge pull request #1885
...
f2749fa
2019-01-21 14:52:40 -06:00
luigi1111
8a4596ee47
Merge pull request #1884
...
310679c
2019-01-21 14:51:43 -06:00
luigi1111
442320bc36
Merge pull request #1866
...
bb37234
2019-01-21 14:45:48 -06:00
luigi1111
2207fd5b29
Merge pull request #1865
...
3c0f269
2019-01-21 14:44:38 -06:00
