Commit graph

908 commits

Author SHA1 Message Date
OleksandrSobol
8603e3f2bf Merge branch 'main' into CAKE-272-implement-localization-generation-script 2021-03-24 13:34:14 +02:00
M
08891e9ab0 Changed app version to 4.1.3 2021-03-24 13:03:52 +02:00
M
2e98783cff Updated Podfile.lock 2021-03-24 12:42:53 +02:00
M
d51805ef7d Changed pubspec.lock 2021-03-24 12:24:54 +02:00
M
12d5fec5b1 Merge pull request #97 from cake-tech/deploy
Deploy
2021-03-24 12:22:52 +02:00
M
47c12a459c Merge branch 'main' into deploy 2021-03-24 12:22:42 +02:00
M
21ae0ec0da Merge pull request #96 from cake-tech/CAKE-279-integrate-wyre
Cake 279 integrate wyre
2021-03-24 12:13:01 +02:00
M
9017a99a8d Update MainActivity.java
Undo changes for MainActivity.java file
2021-03-24 12:11:37 +02:00
M
ea42f2fcb4 Merge branch 'deploy' of github.com:cake-tech/cake_wallet into deploy 2021-03-24 12:10:44 +02:00
M
1d31f3dd59 Back compatibility. 2021-03-24 12:10:18 +02:00
M
c1b52ebede Fixes for wyre. 2021-03-24 11:50:51 +02:00
Tanner Silva
1355c0ccdf changed version number of flutter doctor output 2021-03-23 21:43:02 -05:00
OleksandrSobol
a9566b2748 Merge remote-tracking branch 'origin/CAKE-279-integrate-wyre' into CAKE-279-integrate-wyre 2021-03-23 20:58:23 +02:00
OleksandrSobol
1cbbc71201 CAKE-279 | canceled changes in AndroidManifest.xml and MainActivity.java; added static constants to wyre_service.dart; moved WyreException class into own file; imported WyreService by di.dart 2021-03-23 20:57:20 +02:00
M
4c788eb2aa Merge branch 'CAKE-279-integrate-wyre' of github.com:cake-tech/cake_wallet into CAKE-279-integrate-wyre 2021-03-23 20:09:40 +02:00
M
de2074e6eb Changed way to get order id. 2021-03-23 20:09:35 +02:00
OleksandrSobol
08efc52f71 CAKE-279 | removed find_order_by_id.dart; added and applied wyre_service.dart to the app 2021-03-23 19:19:01 +02:00
M
5cad3a9612 Updates wyre. 2021-03-23 13:05:01 +02:00
OleksandrSobol
78689d394d CAKE-272 | moved constants into localization_constants.dart and locale_list.dart; moved generation of localized strings inside of the loop body 2021-03-22 20:08:10 +02:00
M
23f73df391 Whatever. 2021-03-22 19:38:55 +02:00
Tanner Silva
4fca2681d0 more instruction 2021-03-20 21:40:22 -05:00
OleksandrSobol
319a7bfca6 CAKE-272 | resolved problems 2021-03-19 21:52:07 +02:00
OleksandrSobol
3bfeaeb46b Merge branch 'main' into CAKE-272-implement-localization-generation-script
# Conflicts:
#	lib/generated/i18n.dart
#	res/values/strings_de.arb
2021-03-19 20:35:22 +02:00
OleksandrSobol
a44cb07137 CAKE-272 | implemented localization generation script to the app (generate_localization.dart) 2021-03-19 20:19:14 +02:00
OleksandrSobol
b20246ad89 CAKE-279 | renamed WebViewPage on WyrePage; applied spinner to Buy button on dashboard_page.dart 2021-03-18 20:36:58 +02:00
M
7b7ba17f7a Merge pull request #93 from cake-tech/CAKE-292-remove-changenow-fix-rate-from-ui
CAKE-292 | removed StandardCheckBox from exchange_page.dart; made rec…
2021-03-18 20:32:34 +02:00
M
0c290ee63e Merge pull request #94 from cake-tech/CAKE-293-exchange-confirm-alert
CAKE-293 | changed information on exchange confirm alert
2021-03-18 20:32:26 +02:00
M
e77cf89651 Changed api to prod mode. 2021-03-18 11:15:07 +02:00
Tanner Silva
0397e98387 initial readme created 2021-03-17 19:45:39 -05:00
M
ed336bdd18 Added script for generate key.properties file. 2021-03-17 22:19:51 +02:00
OleksandrSobol
af9d39f460 CAKE-279 | added isRunningWebView to the dashboard_view_model.dart; applied isRunningWebView to call of WebViewPage in the dashboard_page.dart 2021-03-17 21:32:13 +02:00
OleksandrSobol
d752692c3f CAKE-279 | saved orderId in the orders store; added saveOrder() method to the dashboard_view_model.dart 2021-03-17 20:21:26 +02:00
M
e787a764c0 Getting order id from url. 2021-03-17 16:14:48 +02:00
M
237141d4a7 Changed semibold font name. 2021-03-17 12:54:01 +02:00
OleksandrSobol
76c7108bd7 CAKE-293 | applied webview to the app 2021-03-17 12:32:22 +02:00
M
a319d1e6ef Added build scripts for android. 2021-03-16 20:18:54 +02:00
M
db75167302 Changed monero dependencies path for android. Changed scripts for generation of secrets. 2021-03-16 15:20:46 +02:00
OleksandrSobol
ead43439d1 CAKE-293 | changed information on exchange confirm alert 2021-03-15 20:52:15 +02:00
OleksandrSobol
7316646b44 CAKE-292 | removed StandardCheckBox from exchange_page.dart; made receive amount not editable 2021-03-15 19:54:04 +02:00
OleksandrSobol
60333e235d CAKE-279 | applied order details to the app 2021-03-12 21:04:37 +02:00
OleksandrSobol
313f829689 CAKE-279 | integrated Wyre to the app; added buy button to dashboard page for btc wallet; added buyCryptoCurrency() method to dashboard_view_model.dart 2021-03-03 20:54:23 +02:00
M
206e518e02 Merge pull request #92 from cake-tech/terms-changes
Update Terms_of_Use.txt
2021-03-02 21:52:14 +02:00
Nadiia
c02204c443 Update Terms_of_Use.txt 2021-03-02 14:09:54 +02:00
M
fd2cf98e51 Merge pull request #91 from cake-tech/CAKE-284-add-support-to-the-main-menu
Cake 284 add support to the main menu
2021-03-01 20:29:16 +02:00
OleksandrSobol
d228b75f54 CAKE-284 | resolved problems 2021-03-01 20:19:04 +02:00
OleksandrSobol
4d50970fc9 Merge remote-tracking branch 'origin/CAKE-284-add-support-to-the-main-menu' into CAKE-284-add-support-to-the-main-menu
# Conflicts:
#	lib/view_model/settings/settings_view_model.dart
2021-03-01 20:18:14 +02:00
OleksandrSobol
6245dfe885 CAKE-284 | added static function defineUrlForCalculatingAmount() to changenow_exchange_provider.dart; fixed FAQ in the support_view_model.dart 2021-03-01 20:16:28 +02:00
OleksandrSobol
5b242002d1 Merge branch 'main' into CAKE-284-add-support-to-the-main-menu
# Conflicts:
#	lib/view_model/settings/settings_view_model.dart
2021-03-01 19:51:08 +02:00
M
46b7175c4e Merge pull request #90 from cake-tech/CAKE-284-add-support-to-the-main-menu
Cake 284 add support to the main menu
2021-03-01 19:41:10 +02:00
M
99cb00f0bd Merge branch 'main' into CAKE-284-add-support-to-the-main-menu 2021-03-01 19:41:03 +02:00