Commit graph

248 commits

Author SHA1 Message Date
Overtorment
8327f0b0bf resolved conflict 2020-12-10 16:35:36 +00:00
MC Saeid
19c32991bf REF: Correcting two “Input” instances
“Insert Transaction Hex”
“Insert Derivation Path”
2020-12-10 16:21:57 +00:00
marcosrdz
90b29ef545 Merge branch 'master' into pr/2288 2020-12-09 18:32:02 -05:00
marcosrdz
7a77dbeacf Merge branch 'master' into pr/2290 2020-12-09 16:41:06 -05:00
marcosrdz
b59bd706cf Merge branch 'master' into pr/2290 2020-12-09 16:37:31 -05:00
Marcos Rodriguez Vélez
f4d1a76dc8
Merge pull request #2289 from mcsaeid/patch-4
Capitalization – Part One
2020-12-09 16:35:32 -05:00
GLaDOS
102bd73dd9
Merge pull request #2300 from BlueWallet/helpms
ADD: Multisig Vaults Help Section
2020-12-09 18:35:15 +00:00
Marcos Rodriguez Vélez
4c0f6875d6
Merge branch 'master' into patch-5 2020-12-09 13:18:29 -05:00
Marcos Rodriguez Vélez
6a29138ba3
Merge branch 'master' into patch-4 2020-12-09 13:17:42 -05:00
MC Saeid
7cb9315cb8 REF: Removing Extra Spaces
No spaces precede or follow slashes.
2020-12-09 18:09:56 +00:00
marcosrdz
a3e7bee618 Merge branch 'master' into helpms 2020-12-09 10:08:13 -05:00
ncoelho
748eba754f Images and styles 2020-12-09 15:55:23 +01:00
ncoelho
9a7f07decb debug 2020-12-09 13:13:20 +01:00
ncoelho
c2ff15d53b ADD: Help button on Vaults 2020-12-08 23:01:05 +01:00
MC Saeid
ffc1b436ed
Update en.json 2020-12-08 22:40:35 +03:30
MC Saeid
9747e4d6ca
Fixing json 2020-12-08 22:36:14 +03:30
MC Saeid
4228b3b70f
Capitalization – Part Two
For more information on capitalization, please refer to “Capitalization – Part One.”
2020-12-08 19:49:21 +03:30
MC Saeid
dd4a0d3216
Capitalization – Part One
Please note that these changes are not specific to one English style guide. These are what all style guides agree upon. Most of these words or phrases are titles. Let me know which one does not make sense for you, and I will provide links that you can read and make an informed decision. The rest will be changed in part two.
2020-12-08 19:33:54 +03:30
MC Saeid
b5843edee0
REF: Correcting Punctuation Marks
Periods, commas, dashes (hyphens and em dashes).

Notable Issues
1. No comma is required after “please.”
2. A period is required to end a sentence. A full sentence must have a full stop at the end.
3. Incorrect use of the exclamation mark. Here is a quick read: grammarly.com/blog/exclamation-mark.
4. When a sentence is followed by a dependent phrase, such as the one below, an em dash (—) is recommended instead of a comma:
Example: This is your transaction's hex—signed and ready to be broadcasted to the network. (A dependent phrases such as “signed and ready to be broadcasted to the network” cannot stand on its own as a full sentence because it is not.)
5. Extra space between the last word of the sentence and period, namely: “…has been saved in your Downloads folder .” The extra space must be omitted.

There is a reason for each specific change that I made, thus making all of the necessary. I would be happy to provide sources if necessary.
2020-12-08 19:20:44 +03:30
marcosrdz
4be2d041a8 Merge branch 'master' into scanlndhook 2020-12-07 16:52:43 -05:00
Overtorment
57ec7c9813 ADD: is it my address check on wallet details screen (closes #829) 2020-12-07 18:05:35 +00:00
ncoelho
30a23c852d ADD: Help section and tips to Vaults 2020-12-07 17:48:56 +01:00
marcosrdz
fbb219fc74 REF: Scan invoice Hooks 2020-12-05 00:17:51 -05:00
Overtorment
476ba022a0 Revert "REF: navigation styles" 2020-12-04 13:40:13 +00:00
Ivan Vershigora
aa7add7752 REF: navigation styles 2020-12-04 12:50:23 +03:00
Overtorment
f1075515fa ADD: warning text on backup screen 2020-12-03 15:15:05 +00:00
marcosrdz
0cb3d15f00 REF: TX Details Hooks 2020-11-29 22:59:20 -05:00
marcosrdz
7781f0c05b WIP 2020-11-28 00:00:18 -05:00
marcosrdz
0b58cec973 Merge branch 'master' into viewinvoicehooks 2020-11-26 20:46:24 -05:00
GLaDOS
cf8216e065
Merge pull request #2206 from BlueWallet/add-ms-cosigner-xpub
ADD: when creating multisig, input cosigner as xpub
2020-11-26 07:11:00 +00:00
Overtorment
a26d9eacd0 ADD: when creating multisig, input cosigner as xpub 2020-11-25 17:18:03 +00:00
marcosrdz
6ce930d229 Merge branch 'master' into viewinvoicehooks 2020-11-25 09:46:05 -05:00
GLaDOS
cf2a670a66
Merge pull request #2182 from BlueWallet/plausablehook
REF: Plausible deniability uses Hooks
2020-11-25 14:37:33 +00:00
marcosrdz
07500682f9 Merge branch 'master' into viewinvoicehooks 2020-11-24 21:07:19 -05:00
GLaDOS
c2916f002c
Merge pull request #2196 from BlueWallet/permissionandroid
ADD: Show alert on Android if storage access is denied.
2020-11-24 16:18:25 +00:00
marcosrdz
19891a0853 REF: View LND Invoice Hooks 2020-11-23 22:54:58 -05:00
marcosrdz
bfa147c912 Merge branch 'master' into plausablehook 2020-11-23 21:29:25 -05:00
GLaDOS
293f824100
Merge pull request #2198 from BlueWallet/fix-1269
FIX: When wallet card has balance but no txs it displays 'pull to ref…
2020-11-23 23:17:09 +00:00
Overtorment
e9e9a2a3cf FIX: When wallet card has balance but no txs it displays 'pull to refresh' (closes #1269) 2020-11-23 16:25:17 +00:00
marcosrdz
a141a1b5ae Update en.json 2020-11-23 09:29:36 -05:00
marcosrdz
11acebed92 ADD: Show alert on Android if storage access is denied. 2020-11-23 08:55:32 -05:00
marcosrdz
4c886d2b8e Merge branch 'master' into limpbrains-cc 2020-11-22 21:48:02 -05:00
marcosrdz
30fe5bf4a1 Merge branch 'master' into plausablehook 2020-11-22 04:42:21 -05:00
GLaDOS
7e50e0ded2
Merge pull request #2167 from BlueWallet/customcurrency
ADD: Handle fiat rate from alternate sources
2020-11-22 09:39:20 +00:00
marcosrdz
9467f915ec Merge branch 'master' into plausablehook 2020-11-22 04:18:08 -05:00
marcosrdz
c0b525de8a REF: Plausible deniability uses Hooks 2020-11-22 03:04:04 -05:00
Marcos Rodriguez Vélez
3ad016afd3
Merge pull request #2169 from BlueWallet/limpbrains-clipboard-modal
FIX: translate message if Bitcoin address or LN invoice is in clipboard
2020-11-22 02:43:31 -05:00
Ivan Vershigora
c61ca124c4 sync up with master 2020-11-22 10:07:27 +03:00
marcosrdz
2a200dc686 WIP 2020-11-21 19:57:51 -05:00
marcosrdz
cb542ec18a WIP 2020-11-21 19:16:20 -05:00