Commit graph

325 commits

Author SHA1 Message Date
Ivan Vershigora
e2b7034654 Merge branch 'master' into limpbrains-missing-loc 2020-12-24 21:23:27 +03:00
GLaDOS
79c9a3d778
Merge pull request #2354 from BlueWallet/deeplink-electrum-lndhub
ADD: ability to set electrum server or lndhub via deeplink or by scan…
2020-12-24 17:45:11 +00:00
Ivan Vershigora
1e89987e47 FIX: missing i18n 2020-12-21 21:27:49 +03:00
marcosrdz
3ac191d1b5 Merge branch 'master' into privacywidget 2020-12-19 15:29:32 -05:00
ncoelho
9aadc6789a ADD: Telegram and Discord links on about section 2020-12-19 20:26:53 +00:00
marcosrdz
bcebc514a6 Merge branch 'master' into privacywidget 2020-12-19 15:21:41 -05:00
marcosrdz
2e6e8960c5 Merge branch 'master' into scanread 2020-12-18 17:04:22 -05:00
marcosrdz
5d8f08b7a8 ADD: Privacy settings for iOS 14 widgets 2020-12-18 17:01:11 -05:00
Overtorment
85022029e3 FIX: contradiction in Vaul introduction text (closes #2327) 2020-12-16 14:30:57 +00:00
Overtorment
d26c824d80 ADD: ability to set electrum server or lndhub via deeplink or by scanning a QR from main screen 2020-12-16 13:39:34 +00:00
marcosrdz
4aed5b44a0 FIX: Update text 2020-12-14 18:00:35 -05:00
marcosrdz
5b8768866f FIX: Scan progress readability 2020-12-14 16:28:10 -05:00
marcosrdz
1e4922e4d8 REF: Use formatString 2020-12-13 12:12:18 -05:00
marcosrdz
c66017c500 Merge branch 'master' into confirmationslabel 2020-12-13 12:07:33 -05:00
marcosrdz
4bf87aeb98 FIX: Confirmations locale 2020-12-13 05:07:11 -05:00
marcosrdz
e792f3bf5f FIX: broadcast wasn't dark mode friendly 2020-12-12 20:51:39 -05:00
MC Saeid
ca17e03c03
Merge branch 'master' into patch-1 2020-12-13 00:53:53 +03:30
Marcos Rodriguez Vélez
19df35f8cf
* ADD: Dark mode support and Clear button for Is it my address 2020-12-12 18:49:52 +00:00
GLaDOS
5c958dc00b
Merge pull request #2333 from BlueWallet/editkeys
REF: Manage Keys screen
2020-12-12 18:31:29 +00:00
Ivan Vershigora
291d625465 ADD: CoinControl multiselect 2020-12-12 21:00:12 +03:00
ncoelho
a079a11f30 REF: Manage Keys screen
add view instead of share. Fixes the title
2020-12-11 23:20:04 +01:00
MC Saeid
d4a56b95c6
REF: Update en.json (Final) 2020-12-12 01:09:04 +03:30
marcosrdz
ba907b6ceb Merge branch 'master' into scanlndhook 2020-12-11 16:18:10 -05:00
Overtorment
be0c44669c
FIX: some cases of lnurl-withdraw 2020-12-11 20:27:59 +00:00
marcosrdz
b3d480326f ADD: Manage Keys button 2020-12-11 20:13:36 +00:00
marcosrdz
4a12705098 Merge branch 'master' into scanlndhook 2020-12-10 22:39:44 -05:00
MC Saeid
69cf650f75
REF: Updating en.json
Since there were multiple merges, many of the changes were undone, including punctuation marks, capitalization, etc. But this is everything—nearly perfect.
2020-12-10 22:49:27 +03:30
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