Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

prod <- dev - 5.2-rc1 #390

Merged
merged 79 commits into from
Oct 17, 2018
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
79 commits
Select commit Hold shift + click to select a range
58a94aa
Leanplum for BitAnalytics. buy_bitcoin_click is now being tracked.
brendoncoin Sep 12, 2018
615bf73
Updated BitAnalytics.
brendoncoin Sep 12, 2018
28ce4d3
Sending more events to Leanplum.
brendoncoin Sep 12, 2018
1beba23
Updated BitAnalytics.
brendoncoin Sep 12, 2018
ff01933
Getting Leanplum app ID and key from outside the repo.
brendoncoin Sep 13, 2018
8d8a542
Different Leanplum settings for dev and prod.
brendoncoin Sep 13, 2018
9d401e2
Posting buy_bitcoin_click event on last step before leaving app.
brendoncoin Sep 13, 2018
14eb2d2
Warning only if building in dev mode without Leanplum config.
brendoncoin Sep 13, 2018
39e57ec
Logging the Leanplum config to the console to make it easy to check t…
brendoncoin Sep 13, 2018
09900e4
Fix for start-android-emulator script.
brendoncoin Sep 13, 2018
33d4073
Updated BitAnalytics.
brendoncoin Sep 13, 2018
8881f2f
Build fixes.
brendoncoin Sep 13, 2018
1615db9
Wallet Settings button in Wallet Details
spasma Sep 13, 2018
5b581d3
Address types translatable
spasma Sep 13, 2018
829c8f9
buy.bitcoin.com service translatable
spasma Sep 13, 2018
e4568a7
"Enter Amount" translatable
spasma Sep 13, 2018
20ef3bf
BWS url preference view translatable
spasma Sep 13, 2018
8f03384
Address types in Settings > Wallet > Wallet Addresses translatable
spasma Sep 13, 2018
bc66cc1
Translations
spasma Sep 13, 2018
49962f0
"My [coin] Wallet" on new wallet creation
spasma Sep 13, 2018
f538ca2
Instructions for building.
brendoncoin Sep 14, 2018
321e358
Fixing mobile build.
brendoncoin Sep 14, 2018
aab2b9c
Icon for Android push notifications.
brendoncoin Sep 15, 2018
daf39c2
Merge remote-tracking branch 'origin/wallet/sprint/22' into wallet/ta…
spasma Sep 17, 2018
982a90b
regex change for latest release service. Support for other tags (like…
spasma Sep 18, 2018
276bce8
disable animation
spasma Sep 18, 2018
f8a65c4
Merge branch 'wallet/sprint/22' into wallet/task/497
spasma Sep 19, 2018
33df504
Hardware back button support
spasma Sep 19, 2018
8e1ffbb
Fix new format
Sep 21, 2018
d68870f
Bugfix for getting wallet history when cache is empty, while still en…
brendoncoin Sep 26, 2018
2d0e5c5
Started on unit tests for wallet history.
brendoncoin Sep 26, 2018
5825ff2
A few more test cases.
brendoncoin Sep 26, 2018
9cfc05d
Unit test cases to cover confirmations increasing, and insufficient o…
brendoncoin Sep 26, 2018
4692e0d
Unit test case for 2 items in cache and that being all of the transac…
brendoncoin Sep 26, 2018
2667444
Merge remote-tracking branch 'origin/wallet/sprint/22' into wallet/ta…
spasma Oct 2, 2018
5896dac
Merge branch 'wallet/sprint/21' into wallet/task/497
spasma Oct 2, 2018
fc5f6cf
Remove wallet preferences from App Settings and change the route to b…
spasma Oct 2, 2018
2cbf6ef
Removed some unused previous situation code.
spasma Oct 2, 2018
9b78272
remove unused goBack function
spasma Oct 2, 2018
3f359f0
openWalletSettings-function + refactor of addresses-route.. Removed u…
spasma Oct 2, 2018
3665ad6
Adding missing parts to Android build scripts.
brendoncoin Oct 3, 2018
8e9104f
Resource file for Android FCM icon.
brendoncoin Oct 3, 2018
6e344ea
Detecting when balance has updated.
brendoncoin Oct 4, 2018
dbe2766
Cleaning up, and the balance is no longer checked after the first cha…
brendoncoin Oct 4, 2018
b19704e
Text change Mining Pool + template.pot change
spasma Oct 4, 2018
81f4c05
Change UI after balance change
spasma Oct 4, 2018
107be32
Merge pull request #340 from Bitcoin-com/wallet/task/557
brendoncoin Oct 8, 2018
92fdfc3
Merge pull request #372 from Bitcoin-com/wallet/task/535
brendoncoin Oct 8, 2018
28da710
Merge pull request #341 from Bitcoin-com/wallet/task/560
brendoncoin Oct 8, 2018
555a539
Merge pull request #342 from Bitcoin-com/wallet/task/497
brendoncoin Oct 8, 2018
7228a34
Merge pull request #344 from Bitcoin-com/wallet/task/592
brendoncoin Oct 8, 2018
d5d2f80
Fixed bug when adding early txs to the end of an empty cache.
brendoncoin Oct 8, 2018
2201f7b
Solve conflicts
Oct 8, 2018
29da03f
Merge branch 'wallet/sprint/21' into wallet/sprint/22
Oct 8, 2018
99efe36
Solve on remaining conflict
Oct 8, 2018
f77a902
Merge branch 'wallet/sprint/22' into wallet/task/473
Oct 8, 2018
0ccebe4
Merge pull request #375 from Bitcoin-com/wallet/task/473
Oct 8, 2018
6db049e
Merge pull request #376 from Bitcoin-com/wallet/task/593
Oct 8, 2018
7a2fcdd
Merge branch 'wallet/dev' into wallet/sprint/22
Oct 8, 2018
393dda1
Hide wallet balance on Amount screen, according to wallet preference.
brendoncoin Oct 9, 2018
53fd27b
Wallet balance shown on Review Transaction screen according to wallet…
brendoncoin Oct 9, 2018
2b94870
On send tab, wallet balance is hidden according to wallet.balanceHidden.
brendoncoin Oct 9, 2018
ac6fd33
Unconfirmed BCH transactions now shown as Sent and Received.
brendoncoin Oct 9, 2018
0cc73b4
Merge pull request #379 from Bitcoin-com/wallet/task/605
Oct 9, 2018
845e61c
Merge pull request #377 from Bitcoin-com/wallet/task/603
Oct 9, 2018
f3da87b
Fix hidden balance for destination wallet
Oct 9, 2018
6234385
Merge pull request #380 from Bitcoin-com/wallet/task/603
Oct 9, 2018
7744bc6
Merge pull request #382 from Bitcoin-com/wallet/task/488
Oct 10, 2018
dfc432e
Restored the functionalithy of the Buy Bitcoin service registering it…
brendoncoin Oct 10, 2018
aa7d77a
change strategy : if address, redirect to the send flow
Oct 11, 2018
45201a0
615 - Add stats
Oct 16, 2018
4bc1524
Merge pull request #387 from Bitcoin-com/wallet/task/615
spasma Oct 16, 2018
72f2a0a
Merge pull request #384 from Bitcoin-com/wallet/task/604
brendoncoin Oct 17, 2018
daddf22
Workaround for Cordova not supporting XCode 10.
brendoncoin Oct 17, 2018
484c9fd
Merge pull request #388 from Bitcoin-com/wallet/task/617
Oct 17, 2018
7eb2130
Merge pull request #383 from Bitcoin-com/wallet/task/557
Oct 17, 2018
f689518
Merge pull request #389 from Bitcoin-com/wallet/sprint/22
Oct 17, 2018
6017de2
5.2-rc1
Oct 17, 2018
62fdcb2
translations from crowdin
Oct 17, 2018
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Translations
  • Loading branch information
spasma committed Sep 13, 2018
commit bc66cc1b6530dbdac1cd65f31186f7c2a7a4d16d
15 changes: 14 additions & 1 deletion i18n/po/template.pot
Original file line number Diff line number Diff line change
Expand Up @@ -595,6 +595,7 @@ msgstr ""
#: www/views/modals/search.html:3
#: www/views/modals/wallet-balance.html:3
#: www/views/modals/wallets.html:5
#: www/views/modals/txp-details.html:4
msgid "Close"
msgstr ""

Expand Down Expand Up @@ -898,6 +899,10 @@ msgstr ""
msgid "Create {{formData.requiredCopayers}}-of-{{formData.totalCopayers}} wallet"
msgstr ""

#: www/views/preferencesInformation.html:79
msgid "Copayers"
msgstr ""

#: www/views/modals/txp-details.html:81
#: www/views/tx-details.html:60
msgid "Created by"
Expand Down Expand Up @@ -1236,6 +1241,14 @@ msgstr ""
msgid "Expires"
msgstr ""

#: www/views/modals/txp-details.html:65
msgid "Display legacy address"
msgstr ""

#: www/views/modals/txp-details.html:68
msgid "Display new style address"
msgstr ""

#: www/views/preferencesAdvanced.html:21
msgid "Export Wallet"
msgstr ""
Expand Down Expand Up @@ -1574,7 +1587,7 @@ msgid "If enabled, the Recent Transactions card - a list of transactions occurin
msgstr ""

#: www/views/advancedSettings.html:14
msgid "If enabled, wallets will also try to spend unconfirmed funds. This option may cause transaction delays."
msgid "If enabled, wallets will also try to spend unconfirmed funds. Turning off this option may cause transaction delays."
msgstr ""

#: src/js/controllers/onboarding/backupRequest.js:18
Expand Down
2 changes: 1 addition & 1 deletion www/views/modals/txp-details.html
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<ion-modal-view id="txp-details" ng-controller="txpDetailsController" ng-init="init()">
<ion-header-bar align-title="center" class="bar-royal">
<button class="button button-clear" ng-click="close()">
<button class="button button-clear" ng-click="close()" translate>
Close
</button>
<div class="title" translate>
Expand Down
2 changes: 1 addition & 1 deletion www/views/preferencesInformation.html
Original file line number Diff line number Diff line change
Expand Up @@ -75,7 +75,7 @@
</span>
</div>

<div ng-show="wallet.cachedStatus.wallet.copayers[0]" class="item item-divider">
<div ng-show="wallet.cachedStatus.wallet.copayers[0]" class="item item-divider" translate>
Copayers
</div>

Expand Down