Commit graph

353 commits

Author SHA1 Message Date
sneurlax
796961ddd4 Merge branch 'tor-ui' into arti 2023-09-07 13:12:25 -05:00
sneurlax
622085ca5c Merge remote-tracking branch 'origin/staging' into arti 2023-09-07 13:12:20 -05:00
ryleedavis
1dea6cdb7d rough ui for desktop tor settings + svgs for tor settings 2023-09-05 16:26:52 -06:00
sneurlax
0ce108aa34 use cypherstack/tor, a Foundation-Devices/tor fork
use main
2023-09-04 20:13:05 -05:00
ryleedavis
f6a0950c24 WIP: tor settings view for mobile 2023-09-01 16:50:17 -06:00
sneurlax
662602bd2b use flutter_libarti main
now even newer and better
2023-09-01 17:46:42 -05:00
ryleedavis
cceab1a036 Merge branch 'staging' into add-xtz
# Conflicts:
#	lib/pages/settings_views/global_settings_view/manage_nodes_views/add_edit_node_view.dart
#	lib/pages/settings_views/global_settings_view/manage_nodes_views/node_details_view.dart
#	lib/widgets/node_card.dart
2023-08-23 10:53:34 -06:00
Diego Salazar
40ebaaa547
Bumped version (v1.7.19, build 187) 2023-08-22 20:10:12 -06:00
sneurlax
80fcdef330 Merge branch 'staging' into tor 2023-08-15 22:11:41 -05:00
Diego Salazar
27e33f4dea
Bump version (build 1.7.18, build 186) 2023-08-14 11:49:20 -06:00
sneurlax
2d130f916e tor->flutter_libtor 2023-08-08 11:01:45 -05:00
julian
9965d793bd WIP route over tor 2023-08-07 10:46:34 -06:00
julian
18e1a10ba1 Merge remote-tracking branch 'origin_SW/staging' into tor
# Conflicts:
#	pubspec.lock
2023-08-07 09:19:14 -06:00
likho
3c05c568eb Merge branch 'staging' into add-xtz 2023-08-07 17:13:55 +02:00
Diego Salazar
65fac64352
Bump version (1.7.17, build 185) 2023-07-28 15:17:41 -06:00
detherminal
a1ef84fbe6 fix stellarTestNet and dependency problems 2023-07-28 23:00:14 +03:00
detherminal
68f3bc8731 fix dependency conflict 2023-07-28 22:15:34 +03:00
ryleedavis
b66b25eb1f Merge branch 'staging' into add-xtz
# Conflicts:
#	lib/pages/settings_views/global_settings_view/manage_nodes_views/add_edit_node_view.dart
#	lib/pages/settings_views/global_settings_view/manage_nodes_views/node_details_view.dart
#	lib/services/coins/coin_service.dart
#	lib/services/price.dart
#	lib/utilities/amount/amount_unit.dart
#	lib/utilities/block_explorers.dart
#	lib/utilities/constants.dart
#	lib/utilities/default_nodes.dart
#	lib/utilities/enums/coin_enum.dart
#	lib/utilities/enums/derive_path_type_enum.dart
#	lib/widgets/node_card.dart
#	lib/widgets/node_options_sheet.dart
#	pubspec.yaml
2023-07-28 10:48:52 -06:00
Diego Salazar
e38f845f00
Bump version (1.7.17, build 184) 2023-07-27 15:34:55 -06:00
Diego Salazar
44aab53c9f
Bump version (v1.7.17, build 183) 2023-07-27 11:38:28 -06:00
ryleedavis
197d760102 Merge branch 'staging' into add-xtz
# Conflicts:
#	pubspec.lock
2023-07-27 10:45:41 -06:00
likho
bce20eab32 Resolve merge conflicts 2023-07-27 15:05:27 +02:00
julian
46e0258737 Merge remote-tracking branch 'origin_SW/staging' into ordinals
# Conflicts:
#	lib/pages_desktop_specific/my_stack_view/wallet_view/sub_widgets/desktop_wallet_features.dart
#	lib/pages_desktop_specific/my_stack_view/wallet_view/sub_widgets/more_features/more_features_dialog.dart
#	pubspec.yaml
2023-07-26 17:05:33 -06:00
likho
be8ede7750 Fix txs being sending and receiving, and missing fee and height in tx view 2023-07-24 16:53:04 +02:00
detherminal
e0df4723ae feat: add xlm 2023-07-22 10:21:04 +02:00
ryleedavis
ee5a97c2fb add monkey icon 2023-07-21 17:59:01 -06:00
julian
051fc7d1ef Merge remote-tracking branch 'origin_SW/staging' into ordinals 2023-07-21 17:18:18 -06:00
julian-CStack
ccc6b6434c Merge remote-tracking branch 'origin_sw/staging' into ui-fixes 2023-07-19 12:44:10 -06:00
julian-CStack
43d7f39f6f macos app icon 2023-07-19 12:43:42 -06:00
Diego Salazar
db1e34d745
Bump version (1.7.16, build 182) 2023-07-19 11:30:50 -06:00
likho
022ce7ed34 Resolve merge conflicts 2023-07-19 17:00:48 +02:00
detherminal
0ae747aebc feat: add xtz 2023-07-19 16:19:48 +02:00
julian
5b4a803215 add ordinals icon 2023-07-18 11:51:57 -06:00
julian
79670c5d47 WIP ordinal details view 2023-07-18 11:03:57 -06:00
Josh Babb
a71815ede7 Merge remote-tracking branch 'origin/staging' into tor 2023-07-12 16:50:55 -05:00
Diego Salazar
2ff855d7d0
Bump version (1.7.15, build 181) 2023-07-03 18:54:47 -06:00
julian
baec88a4f8 fix: dependency version 2023-06-22 09:44:55 -06:00
Diego Salazar
86630f2e85
Merge pull request #595 from cypherstack/custom_fee_selection
Custom fee selection
2023-06-19 15:08:52 -06:00
Diego Salazar
dbea96b80c
Bump version (1.7.14, build 180) 2023-06-19 14:35:32 -06:00
julian
43c056f264 fix: dependency override 2023-06-19 12:51:31 -06:00
detherminal
f43aeadc3f feat: add xtz 2023-06-12 22:03:32 +03:00
Diego Salazar
105e35658a
Bump version (1.7.13, build 179) 2023-06-08 14:59:21 -06:00
Diego Salazar
b283826933
Bump version (1.7.13, build 178) 2023-06-07 16:49:46 -06:00
julian
479b0b333d clean up and provide reasons for overridden deps 2023-06-07 12:23:29 -06:00
julian
73824e7a36 remove redundant dep override 2023-06-07 12:12:24 -06:00
julian
5557ec3509 use specific commit hash for wakelock override 2023-06-07 11:41:24 -06:00
julian
e0c53e80e0 update dependencies 2023-06-07 10:45:42 -06:00
julian
f912ce482f clean up unused deps 2023-06-07 10:12:50 -06:00
julian
4298b24231 update bip39 dependency 2023-06-07 10:11:29 -06:00
julian
a353ab341a Merge remote-tracking branch 'origin_SW/staging' into flutter_upgrade
# Conflicts:
#	crypto_plugins/flutter_libmonero
2023-06-05 16:26:28 -06:00