Commit Graph

3081 Commits (a31a7db1a33005a85e157d526466e5bbeff54b6c)
 

Author SHA1 Message Date
James Sangalli ce2a9d5798
Merge branch 'master' into remove-redundant-file-leftover-from-renaming 6 years ago
James Sangalli 94c13901a5
Merge pull request #632 from alpha-wallet/remove-unused-inherited-code 6 years ago
James Sangalli 6be7a3d30b
Merge branch 'master' into remove-unused-inherited-code 6 years ago
James Sangalli 707158a5af
Merge pull request #635 from alpha-wallet/fix-wrong-message-shown-when-token-transfer-fails 6 years ago
Hwee-Boon Yar 628b25613d Fix: wrong text shown in token transfer UI 6 years ago
Hwee-Boon Yar 499cb39fdf Remove unused inherited code 6 years ago
Hwee-Boon Yar cb1a304841 Remove redundant file leftover from previous renaming tickets -> tokens 6 years ago
James Sangalli 979f8cb026
Merge pull request #638 from alpha-wallet/fix-merge-problem-in-master 6 years ago
Hwee-Boon Yar af0420e81d Fix: master broken by merge 6 years ago
James Sangalli d0d6edae2e
Merge pull request #633 from alpha-wallet/remove-unused-code 6 years ago
James Sangalli c61ca2987d
Merge branch 'master' into remove-unused-code 6 years ago
James Sangalli 7192c4ae45
Merge pull request #636 from alpha-wallet/remove-remaining-references-to-ticket-in-type-names 6 years ago
James Sangalli a5e661b098
Merge branch 'master' into remove-remaining-references-to-ticket-in-type-names 6 years ago
James Sangalli abbf7f2bcf
Merge pull request #637 from alpha-wallet/safer-contract-address-comparison 6 years ago
James Sangalli 004d0f69a7
Merge branch 'master' into safer-contract-address-comparison 6 years ago
James Sangalli 119666d80f
Merge pull request #634 from alpha-wallet/remove-unnecessary-arg-in-xmlhandler-getName 6 years ago
James Sangalli a74d053b5f
Merge branch 'master' into remove-unnecessary-arg-in-xmlhandler-getName 6 years ago
James Sangalli f8b84797a5
Merge pull request #631 from alpha-wallet/fix-file-header-comment 6 years ago
James Sangalli 75a1166459
Merge pull request #629 from alpha-wallet/fiat-value-not-formatted-2-decimals-in-import-ui 6 years ago
James Sangalli 00b2a2edef
Merge branch 'master' into fiat-value-not-formatted-2-decimals-in-import-ui 6 years ago
James Sangalli f3e2b56005
Merge pull request #628 from alpha-wallet/fix-crash-when-selling-tickets-at-more-than-1000-eth 6 years ago
James Sangalli 999d9ff607
Merge branch 'master' into fix-crash-when-selling-tickets-at-more-than-1000-eth 6 years ago
James Sangalli 91bf6f9813
Merge pull request #626 from alpha-wallet/replace-ticket-string-references-with-tokens 6 years ago
Hwee-Boon Yar 56dffd0d8a Safer contract address comparison 6 years ago
Hwee-Boon Yar e5d6c5360e Remove remaining references to tickets in type names 6 years ago
Hwee-Boon Yar f30c73b365 Remove unnecessary func arg, simplifying code 6 years ago
Hwee-Boon Yar 69611e32e6 Remove unused code — cell height for ticket flow. Auto sizing now 6 years ago
Hwee-Boon Yar bc3d2ab141 Fix file header comment 6 years ago
Hwee-Boon Yar f75d6397bf Fix: fiat value not formatted in 2 decimal places in import ticket UI 6 years ago
Hwee-Boon Yar bcd80eca0d Rename types for consistency 6 years ago
Hwee-Boon Yar 0dfa106207 Fix: crash when ticket price is set to 1000 or more 6 years ago
Hwee-Boon Yar f73067780f Fix snapshot test after previous commit 6 years ago
Hwee-Boon Yar b643486a1a Abstract token type name (e.g ticket). Hardcode tickets and cryptokitties for appropriate addresses and fallback to tokens. This sets it up so that in the future, we can read the type name from the XML before fallback 6 years ago
Hwee-Boon Yar 8b52140cb8 No longer always display ticket token just below ETH in wallet tab 6 years ago
Hwee-Boon Yar 2a6f1a3a46 Replace == check for contract address with sameContract(as:). Safer 6 years ago
James Sangalli 5c64e65915
Merge pull request #621 from alpha-wallet/organise-project-files 6 years ago
James Sangalli 2f56ca918c
Merge branch 'master' into organise-project-files 6 years ago
Hwee-Boon Yar b39c2c72f8
Merge pull request #624 from alpha-wallet/zhangzhongnan928-patch-1 6 years ago
Hwee-Boon Yar 6bfd9aab83
Merge branch 'master' into zhangzhongnan928-patch-1 6 years ago
James Sangalli 12e5ccbc83
Merge pull request #625 from alpha-wallet/no-longer-add-default-ticket-token-for-new-users 6 years ago
Hwee-Boon Yar b5ff77f394 No longer add the default ticket token for new users 6 years ago
Victor Zhang 3cdd22e305
Update Localizable.strings 6 years ago
Hwee-Boon Yar dbebdc0874 Move files to better place 6 years ago
James Sangalli 36c1877383 up build and version to match github 6 years ago
James Sangalli fc8854ce5e
Merge pull request #619 from alpha-wallet/add-localization-placeholders-for-detecting-token-text-zh-es 6 years ago
Hwee-Boon Yar aca73d9179 Add placeholders for localized strings for zh and es for recent commit 6 years ago
James Sangalli 713b56c3c9
Merge pull request #618 from alpha-wallet/fix-merge 6 years ago
Hwee-Boon Yar d0855fce7a Fix: bad merge 6 years ago
James Sangalli a224145067
Merge pull request #617 from alpha-wallet/more-let-less-var 6 years ago
James Sangalli 7325b62b70
Merge branch 'master' into more-let-less-var 6 years ago