OmarHatem
|
f050f022b6
|
Merge branch 'main' of https://github.com/cake-tech/cake_wallet into dashboard-desktop-view
Conflicts:
lib/src/screens/buy/onramper_page.dart
lib/src/screens/seed/wallet_seed_page.dart
pubspec_base.yaml
res/values/strings_de.arb
res/values/strings_en.arb
res/values/strings_es.arb
res/values/strings_fr.arb
res/values/strings_hi.arb
res/values/strings_hr.arb
res/values/strings_it.arb
res/values/strings_ja.arb
res/values/strings_ko.arb
res/values/strings_nl.arb
res/values/strings_pl.arb
res/values/strings_pt.arb
res/values/strings_ru.arb
res/values/strings_uk.arb
res/values/strings_zh.arb
|
2023-02-24 00:40:19 +02:00 |
|
Serhii
|
50f1c051f9
|
Merge branch 'main' into CW-302-Update-Cake-Pay-checkout-wording-for-Bitcoin-only
|
2023-02-02 12:54:15 +02:00 |
|
Omar Hatem
|
2268e89b19
|
Merge pull request #743 from cake-tech/CW-287-Get-Address-from-twitter-bio
CW-287 get address from twitter bio
|
2023-02-01 19:40:49 +02:00 |
|
Serhii
|
ef01554fdb
|
fix openAlias address resolv
|
2023-01-31 21:39:08 +02:00 |
|
Godwin Asuquo
|
75f33a433e
|
refactor desktop settings sidebar
|
2023-01-28 12:43:44 +02:00 |
|
Serhii
|
cce56a61a3
|
minor fixes
|
2023-01-26 13:33:33 +02:00 |
|
Serhii
|
71d5a9b790
|
Merge branch 'main' into CW-247-Exchange-confirmation-screen-address-labels
|
2023-01-26 11:54:03 +02:00 |
|
Serhii
|
9ec006bb03
|
Merge branch 'main' into CW-302-Update-Cake-Pay-checkout-wording-for-Bitcoin-only
|
2023-01-25 18:31:30 +02:00 |
|
Serhii
|
9f5438d2f4
|
update localization files
|
2023-01-25 12:28:44 +02:00 |
|
OmarHatem
|
477d46b1d2
|
Merge branch 'main' of https://github.com/cake-tech/cake_wallet into CW-237-enhance-error-catching-reporting
|
2023-01-24 03:03:07 +02:00 |
|
Serhii
|
7f37bd3d59
|
update localization files
|
2023-01-14 23:29:47 +02:00 |
|
Serhii
|
25a71fa31e
|
Merge branch 'main' into CW-252-Add-notice-when-connecting-to-.onion-node
|
2023-01-13 15:43:29 +02:00 |
|
OmarHatem
|
e4af355b24
|
Fix Translation typo [skip ci]
|
2023-01-09 20:31:24 +02:00 |
|
OmarHatem
|
a373253fd2
|
Add localizations for error dialog content
|
2023-01-09 18:16:50 +02:00 |
|
Mathias Herberts
|
768320003c
|
Fixed FR translations. Added localized strings in contact list
|
2023-01-05 22:39:32 +01:00 |
|
Serhii
|
e53602afa3
|
Add alert for onion nodes
|
2023-01-05 12:53:05 +02:00 |
|
Omar Hatem
|
9bd0de6d08
|
Merge pull request #625 from cake-tech/CW-122-Rework-filter-on-the-transactions-list-screen
[CW-122] rework filter on the transactions list screen
|
2022-12-28 20:50:17 +02:00 |
|
Serhii
|
d893562dad
|
update localization
|
2022-12-24 01:09:54 +02:00 |
|
OmarHatem
|
e005e2aed7
|
Add Cake Pay Web Card to marketplace
|
2022-12-21 19:15:02 +02:00 |
|
Serhii
|
00c008ed8b
|
Merge branch 'main' into CW-122-Rework-filter-on-the-transactions-list-screen
|
2022-12-16 15:14:13 +02:00 |
|
Omar Hatem
|
d1832aa510
|
Merge branch 'main' into CW-225-pin-timeout
|
2022-12-13 20:40:20 +02:00 |
|
OmarHatem
|
01024b6694
|
Merge branch 'main' of https://github.com/cake-tech/cake_wallet into CW-66-open-app-from-qr-code
Conflicts:
lib/di.dart
lib/src/screens/send/send_page.dart
lib/src/screens/send/widgets/send_card.dart
lib/view_model/send/send_view_model.dart
res/values/strings_de.arb
res/values/strings_en.arb
res/values/strings_es.arb
res/values/strings_fr.arb
res/values/strings_hi.arb
res/values/strings_hr.arb
res/values/strings_it.arb
res/values/strings_ja.arb
res/values/strings_ko.arb
res/values/strings_nl.arb
res/values/strings_pl.arb
res/values/strings_pt.arb
res/values/strings_ru.arb
res/values/strings_uk.arb
res/values/strings_zh.arb
|
2022-12-12 15:41:16 +02:00 |
|
Serhii
|
b9ef71749e
|
Merge branch 'main' into CW-122-Rework-filter-on-the-transactions-list-screen
|
2022-12-09 23:35:14 +02:00 |
|
Godwin Asuquo
|
07ea937d37
|
Merge branch 'main' of https://github.com/cake-tech/cake_wallet into CW-225-pin-timeout
|
2022-12-09 19:42:07 +01:00 |
|
Omar Hatem
|
357ebe5fc8
|
Merge pull request #595 from cake-tech/CW-118-Allow-disabling-of-fiat
CW-118 Allow disabling of fiat
|
2022-12-09 20:20:16 +02:00 |
|
Justin Ehrenhofer
|
1fc4f809e5
|
Merge branch 'main' into warning-wording
|
2022-12-09 08:44:30 -06:00 |
|
OmarHatem
|
fddac23b94
|
Merge branch 'main' of https://github.com/cake-tech/cake_wallet into CW-118-Allow-disabling-of-fiat
Conflicts:
res/values/strings_de.arb
res/values/strings_en.arb
res/values/strings_es.arb
res/values/strings_fr.arb
res/values/strings_hi.arb
res/values/strings_hr.arb
res/values/strings_it.arb
res/values/strings_ja.arb
res/values/strings_ko.arb
res/values/strings_nl.arb
res/values/strings_pl.arb
res/values/strings_pt.arb
res/values/strings_ru.arb
res/values/strings_uk.arb
res/values/strings_zh.arb
|
2022-12-08 14:01:20 +02:00 |
|
OmarHatem
|
55b37164dc
|
- Make getters to ease attribute access
- Add the old 'disable_fiat' translation
- rename getters to be more bool like names
|
2022-12-07 22:07:32 +02:00 |
|
Serhii
|
228e157b39
|
[skip ci] Update localization
|
2022-12-07 14:04:14 +02:00 |
|
Serhii
|
214c1fe0db
|
Merge branch 'main' into CW-118-Allow-disabling-of-fiat
|
2022-12-06 17:37:12 +02:00 |
|
Godwin Asuquo
|
65cbdd3fbb
|
Merge branch 'main' of https://github.com/cake-tech/cake_wallet into CW-225-pin-timeout
|
2022-12-05 13:33:17 +01:00 |
|
OmarHatem
|
9d64789983
|
Fix Conflict with main
Rename classes to advanced privacy settings to avoid confusion between settings/privacy-settings
|
2022-12-04 05:08:42 +02:00 |
|
OmarHatem
|
f792b58338
|
Merge branch 'main' of https://github.com/cake-tech/cake_wallet into CW-180-advanced-startup-privacy-settings
Conflicts:
lib/di.dart
lib/routes.dart
lib/view_model/node_list/node_create_or_edit_view_model.dart
res/values/strings_de.arb
res/values/strings_en.arb
res/values/strings_es.arb
res/values/strings_fr.arb
res/values/strings_hi.arb
res/values/strings_hr.arb
res/values/strings_it.arb
res/values/strings_ja.arb
res/values/strings_ko.arb
res/values/strings_nl.arb
res/values/strings_pl.arb
res/values/strings_pt.arb
res/values/strings_ru.arb
res/values/strings_uk.arb
res/values/strings_zh.arb
|
2022-12-04 04:34:32 +02:00 |
|
Omar Hatem
|
dc60123f79
|
Merge pull request #529 from cake-tech/CW-182-allow-trusted-nodes
Cw 182 allow trusted nodes
|
2022-12-04 02:17:35 +02:00 |
|
Omar Hatem
|
bfcd3ee002
|
Merge pull request #643 from cake-tech/CW-223-settings-reorganization
Cw 223 settings reorganization
|
2022-12-01 21:37:43 +02:00 |
|
OmarHatem
|
0d685823ce
|
Merge branch 'main' of https://github.com/cake-tech/cake_wallet into CW-66-open-app-from-qr-code
Conflicts:
res/values/strings_de.arb
res/values/strings_en.arb
res/values/strings_es.arb
res/values/strings_fr.arb
res/values/strings_hi.arb
res/values/strings_hr.arb
res/values/strings_it.arb
res/values/strings_ja.arb
res/values/strings_ko.arb
res/values/strings_nl.arb
res/values/strings_pl.arb
res/values/strings_pt.arb
res/values/strings_ru.arb
res/values/strings_uk.arb
res/values/strings_zh.arb
|
2022-11-29 17:45:31 +02:00 |
|
Serhii
|
ab499c9069
|
Merge branch 'main' into CW-122-Rework-filter-on-the-transactions-list-screen
|
2022-11-28 22:33:54 +02:00 |
|
Serhii
|
1a420a7470
|
Merge branch 'main' into CW-221-Change-synchronization-status-text
|
2022-11-28 22:24:25 +02:00 |
|
Godwin Asuquo
|
7da2de60cb
|
Merge branch 'main' of https://github.com/cake-tech/cake_wallet into CW-225-pin-timeout
|
2022-11-28 18:27:21 +02:00 |
|
Godwin Asuquo
|
63df8c6b6f
|
Merge branch 'main' of https://github.com/cake-tech/cake_wallet into CW-223-settings-reorganization
|
2022-11-23 22:54:24 +02:00 |
|
Godwin Asuquo
|
818a8afe20
|
[CW-225] Add pin timeout setting
|
2022-11-22 22:52:28 +02:00 |
|
Serhii
|
50d32021f6
|
Merge branch 'main' into CW-118-Allow-disabling-of-fiat
|
2022-11-22 19:48:43 +02:00 |
|
Omar Hatem
|
9b32c9c956
|
CW-227 Add Disable Exchange option to settings (#642)
* Add Disable Exchange option to settings
|
2022-11-21 21:18:18 -05:00 |
|
Godwin Asuquo
|
549975ecc1
|
Reorganize settings
|
2022-11-16 09:29:14 +02:00 |
|
Justin Ehrenhofer
|
cf7c21946b
|
Improve warning wording
Recommended in the Telegram testing group
|
2022-11-10 14:45:10 -06:00 |
|
Serhii
|
bf86fd6ed0
|
update localization
|
2022-11-10 17:38:23 +02:00 |
|
OmarHatem
|
6210d8fba6
|
Merge branch 'main' of https://github.com/cake-tech/cake_wallet into CW-180-advanced-startup-privacy-settings
Conflicts:
cw_core/lib/node.dart
lib/di.dart
lib/router.dart
lib/routes.dart
lib/view_model/node_list/node_create_or_edit_view_model.dart
res/values/strings_de.arb
res/values/strings_en.arb
res/values/strings_es.arb
res/values/strings_fr.arb
res/values/strings_hi.arb
res/values/strings_hr.arb
res/values/strings_it.arb
res/values/strings_ja.arb
res/values/strings_ko.arb
res/values/strings_nl.arb
res/values/strings_pl.arb
res/values/strings_pt.arb
res/values/strings_ru.arb
res/values/strings_uk.arb
res/values/strings_zh.arb
|
2022-11-09 15:40:12 +02:00 |
|
Serhii
|
7d92a964c7
|
Change synchronization status text
changed the status from "Starting sync" to "Attempting sync".
|
2022-11-09 12:14:21 +02:00 |
|
OmarHatem
|
7c7de65cdf
|
Merge branch 'main' of https://github.com/cake-tech/cake_wallet into CW-66-open-app-from-qr-code
Conflicts:
lib/di.dart
lib/src/screens/send/send_page.dart
lib/src/screens/send/widgets/send_card.dart
lib/utils/payment_request.dart
res/values/strings_de.arb
res/values/strings_en.arb
res/values/strings_es.arb
res/values/strings_fr.arb
res/values/strings_hi.arb
res/values/strings_hr.arb
res/values/strings_it.arb
res/values/strings_ja.arb
res/values/strings_ko.arb
res/values/strings_nl.arb
res/values/strings_pl.arb
res/values/strings_pt.arb
res/values/strings_ru.arb
res/values/strings_uk.arb
res/values/strings_zh.arb
|
2022-11-08 14:44:58 +02:00 |
|
Serhii
|
b5e74874ce
|
update localization files
|
2022-11-04 14:11:06 +02:00 |
|