mirrors/BlueWallet
1
0
Fork 0
mirror of https://github.com/BlueWallet/BlueWallet.git synced 2025-02-25 16:04:17 +01:00
Code Issues Projects Releases Packages Wiki Activity
3579 commits 173 branches 164 tags 591 MiB
Commit graph

3579 commits

This branch
This branch
All branches
Author SHA1 Message Date
Overtorment
fc025b8004 Merge branch 'patch-3' of https://github.com/mcsaeid/BlueWallet into mcsaeid-patch-3 2020-12-10 15:24:45 +00:00
GLaDOS
d5fe454a8f
Merge pull request #2303 from BlueWallet/limpbrains-loc-cleanup 
REF: remove old and untranslated values from loc files
 2020-12-10 14:48:40 +00:00
Ivan Vershigora
a53953d5ad REF: remove old and untranslated values from loc files 2020-12-10 09:03:47 +03:00
marcosrdz
4e2b34825f Merge branch 'pr/2307' into pr/2288 2020-12-09 18:32:56 -05:00
marcosrdz
90b29ef545 Merge branch 'master' into pr/2288 2020-12-09 18:32:02 -05:00
marcosrdz
56d668f3a1 Merge branch 'pr/2307' into pr/2290 2020-12-09 16:41:33 -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
marcosrdz
d53db68f6c FIX: Was unable to use PSBT Multisig on macOS 2020-12-09 16:34:48 -05:00
marcosrdz
94206a13eb FIX: Was unable to import key on macOS 2020-12-09 16:20:50 -05:00
MC Saeid
487d1dac90
REF: Updating bluewallet.spec 
I made sure the bluewallet.spec.js is compliant with the changes in punctuation marks made in previous PRs.
 2020-12-10 00:17:46 +03:30
GLaDOS
6cefa0f107
Merge pull request #2304 from BlueWallet/translations_loc-en-json--master_fa_IR 
Translate '/loc/en.json' in 'fa_IR'
 2020-12-09 20:41:31 +00: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
marcosrdz
6228397cc9 Update addMultisigStep2.js 2020-12-09 13:12:57 -05:00
transifex-integration[bot]
904234cc22
Translate /loc/en.json in fa_IR 
review completed for the source file '/loc/en.json'
on the 'fa_IR' language.
 2020-12-09 18:11:16 +00:00
marcosrdz
93a4e1ed86 Merge branch 'master' into Modal-on-multisig-seed-#2176- 2020-12-09 13:11:10 -05:00
MC Saeid
7cb9315cb8 REF: Removing Extra Spaces 
No spaces precede or follow slashes.
 2020-12-09 18:09:56 +00:00
ncoelho
25a136c660 Remove dead code 2020-12-09 18:37:29 +01:00
marcosrdz
a3e7bee618 Merge branch 'master' into helpms 2020-12-09 10:08:13 -05:00
marcosrdz
38c002ffc3 OPS: Lint 2020-12-09 10:08:02 -05:00
ncoelho
5407db84ed fix lint 2020-12-09 16:00:07 +01:00
ncoelho
748eba754f Images and styles 2020-12-09 15:55:23 +01:00
GLaDOS
88cc7235d5
Merge pull request #2299 from BlueWallet/dependabot/npm_and_yarn/react-native-webview-11.0.0 
Build(deps): Bump react-native-webview from 10.10.0 to 11.0.0
 2020-12-09 12:38:29 +00:00
ncoelho
9a7f07decb debug 2020-12-09 13:13:20 +01:00
marcosrdz
54a6b48a86 FIX: Clipboard modal was not using color scheme 2020-12-09 11:51:38 +00:00
dependabot[bot]
80d21d75dc
Build(deps): Bump react-native-webview from 10.10.0 to 11.0.0 
Bumps [react-native-webview](https://github.com/react-native-community/react-native-webview) from 10.10.0 to 11.0.0.
- [Release notes](https://github.com/react-native-community/react-native-webview/releases)
- [Changelog](https://github.com/react-native-webview/react-native-webview/blob/master/.releaserc)
- [Commits](https://github.com/react-native-community/react-native-webview/compare/v10.10.0...v11.0.0)

Signed-off-by: dependabot[bot] <support@github.com>
 2020-12-09 11:43:16 +00:00
marcosrdz
c09c66957e REL: ver bump & release notes 2020-12-09 11:42:22 +00:00
GLaDOS
aaf73ee5ee
Merge pull request #2287 from BlueWallet/fix-ms-import-qr 
FIX: scan multisig cosigner in formats: plain Zpub, wallet descriptor
 2020-12-09 00:02:25 +00:00
marcosrdz
9068dda54d Merge branch 'master' into scanlndhook 2020-12-08 18:26:56 -05:00
ncoelho
c2ff15d53b ADD: Help button on Vaults 2020-12-08 23:01:05 +01:00
GLaDOS
dc0a01d13e
Merge pull request #2292 from BlueWallet/translations_loc-en-json--master_fa_IR 
Translate '/loc/en.json' in 'fa_IR'
 2020-12-08 21:19:41 +00:00
GLaDOS
6f035ffc7e
Merge pull request #2293 from BlueWallet/translations_loc-en-json--master_sl_SI 
Translate '/loc/en.json' in 'sl_SI'
 2020-12-08 20:47:45 +00: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
transifex-integration[bot]
e3f98b1ddd
Translate /loc/en.json in sl_SI 
review completed for the source file '/loc/en.json'
on the 'sl_SI' language.
 2020-12-08 17:10:56 +00:00
transifex-integration[bot]
767bc4bd25
Translate /loc/en.json in fa_IR 
review completed for the source file '/loc/en.json'
on the 'fa_IR' language.
 2020-12-08 16:46:52 +00:00
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
GLaDOS
0473fbfe4c
Merge pull request #2284 from BlueWallet/fix-tx-disappear 
FIX: txs disappear and re-fetch if opened wallet too fast
 2020-12-08 16:01:44 +00:00
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
fe9945d4ad Merge branch 'master' into scanlndhook 2020-12-08 10:27:22 -05:00
Ziya-Sadr
985264609c Update broadcast.js 2020-12-08 15:26:52 +00:00
Overtorment
a9aa213b21 FIX: scan multisig cosigner in formats: plain Zpub, wallet descriptor 2020-12-08 14:58:16 +00:00
Overtorment
e38f0c41f9 FIX: txs disappear and re-fetch if opened wallet too fast 2020-12-08 13:00:09 +00:00
GLaDOS
cee135a183
Merge pull request #2282 from BlueWallet/updateui 
ADD: Update UI if wallets context changes
 2020-12-07 22:50:04 +00:00
Overtorment
cc02439421 ADD: multisig for everyone 2020-12-07 22:25:00 +00:00
marcosrdz
4be2d041a8 Merge branch 'master' into scanlndhook 2020-12-07 16:52:43 -05:00