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.

Sign up for GitHub

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

Jump to bottom

removed toString() from returned negociator data. The data is cast as… #415

Open
wants to merge 744 commits into
base: main
Choose a base branch
from
Open

removed toString() from returned negociator data. The data is cast as… #415

wants to merge 744 commits into from
This pull request is big! We’re only showing the most recent 250 commits.

Commits on Sep 30, 2019

  1. Merge pull request #250 from AlphaWallet/require-enabled-DeFi 

    require the user enable DeFi services before making a supply/withdraw tx
    @jzaki
    jzaki committed Sep 30, 2019
    Configuration menu
    Copy the full SHA
    2c6df68 View commit details
    Browse the repository at this point in the history

Commits on Oct 1, 2019

  1. Boon's contribution

    Weiwu Zhang committed Oct 1, 2019
    Configuration menu
    Copy the full SHA
    13353c2 View commit details
    Browse the repository at this point in the history

Commits on Oct 2, 2019

  1. the makefile I wrote on Ubuntu 18.04 no longer works on Ubuntu 19.04.… 

    … Fixed that.
    Weiwu Zhang committed Oct 2, 2019
    Configuration menu
    Copy the full SHA
    055783b View commit details
    Browse the repository at this point in the history

Commits on Oct 4, 2019

  1. add p tokens

    @bitcoinwarrior1
    bitcoinwarrior1 committed Oct 4, 2019
    Configuration menu
    Copy the full SHA
    3aebfa7 View commit details
    Browse the repository at this point in the history

  2. add dForce USDx

    @bitcoinwarrior1
    bitcoinwarrior1 committed Oct 4, 2019
    Configuration menu
    Copy the full SHA
    535889d View commit details
    Browse the repository at this point in the history

  3. Merge pull request #251 from AlphaWallet/add-ptokens-and-dforce-usdx 

    Add ptokens and dforce usdx
    @zhangzhongnan928
    zhangzhongnan928 committed Oct 4, 2019
    Configuration menu
    Copy the full SHA
    322df9d View commit details
    Browse the repository at this point in the history

Commits on Oct 10, 2019

  1. delete contrib folder because we use resources instead

    @bitcoinwarrior1
    bitcoinwarrior1 committed Oct 10, 2019
    Configuration menu
    Copy the full SHA
    f230e7f View commit details
    Browse the repository at this point in the history

Commits on Oct 11, 2019

  1. make every example only one directory deep

    Weiwu Zhang committed Oct 11, 2019
    Configuration menu
    Copy the full SHA
    4e285e0 View commit details
    Browse the repository at this point in the history

  2. add multipliers and change schema to october

    @bitcoinwarrior1
    bitcoinwarrior1 authored and Weiwu Zhang committed Oct 11, 2019
    Configuration menu
    Copy the full SHA
    98d1c48 View commit details
    Browse the repository at this point in the history

  3. moving data out of tokenscript.xsd as it is becoming a project of its… 

    … own.

adding bitmap to etherem element
    Weiwu Zhang committed Oct 11, 2019
    Configuration menu
    Copy the full SHA
    54b4e22 View commit details
    Browse the repository at this point in the history

  4. revert the change of moving <data> definition to data

    Weiwu Zhang committed Oct 11, 2019
    Configuration menu
    Copy the full SHA
    f9c2c97 View commit details
    Browse the repository at this point in the history

  5. moving data element definition to a module included from the main schema

    @bitcoinwarrior1
    Weiwu Zhang authored and bitcoinwarrior1 committed Oct 11, 2019
    Configuration menu
    Copy the full SHA
    32808e7 View commit details
    Browse the repository at this point in the history

  6. change all TokenScripts to match 2019/10 

    correctly reference tokenscript.xsd in schemaLocation
    @bitcoinwarrior1
    bitcoinwarrior1 committed Oct 11, 2019
    Configuration menu
    Copy the full SHA
    d98f902 View commit details
    Browse the repository at this point in the history

Commits on Oct 16, 2019

  1. WIP add captcha to discovery token

    @bitcoinwarrior1
    bitcoinwarrior1 committed Oct 16, 2019
    Configuration menu
    Copy the full SHA
    4ecafdf View commit details
    Browse the repository at this point in the history

Commits on Oct 17, 2019

  1. Merge pull request #245 from AlphaWallet/october-schema 

    change schema to october
    @bitcoinwarrior1
    bitcoinwarrior1 committed Oct 17, 2019
    Configuration menu
    Copy the full SHA
    3e03544 View commit details
    Browse the repository at this point in the history

  2. translate remaining DeFi tokens to 2019/10

    @bitcoinwarrior1
    bitcoinwarrior1 committed Oct 17, 2019
    Configuration menu
    Copy the full SHA
    c81466a View commit details
    Browse the repository at this point in the history

Commits on Oct 30, 2019

  1. Remove dead link

    @bitcoinwarrior1
    bitcoinwarrior1 committed Oct 30, 2019
    Configuration menu
    Copy the full SHA
    1ca0325 View commit details
    Browse the repository at this point in the history

Commits on Oct 31, 2019

  1. the Venn picture explaining artefact and token will be referred to in… 

    … a document at certain point
    Weiwu Zhang committed Oct 31, 2019
    Configuration menu
    Copy the full SHA
    f9f963a View commit details
    Browse the repository at this point in the history

Commits on Nov 4, 2019

  1. remove rounding on dai bridge

    @bitcoinwarrior1
    bitcoinwarrior1 committed Nov 4, 2019
    Configuration menu
    Copy the full SHA
    5b698af View commit details
    Browse the repository at this point in the history

  2. Merge branch 'master' of https://github.com/AlphaWallet/TokenScript

    @bitcoinwarrior1
    bitcoinwarrior1 committed Nov 4, 2019
    Configuration menu
    Copy the full SHA
    94eb694 View commit details
    Browse the repository at this point in the history

Commits on Nov 7, 2019

  1. original data file was mostly about attribute process, hence the rena… 

    …me. Plus the new thing we discussed last week: data-objects
    colourful-land committed Nov 7, 2019
    Configuration menu
    Copy the full SHA
    625afd3 View commit details
    Browse the repository at this point in the history

  2. Tweak text formatting

    @hboon
    hboon committed Nov 7, 2019
    Configuration menu
    Copy the full SHA
    81a588c View commit details
    Browse the repository at this point in the history

Commits on Nov 9, 2019

  1. fix wrong text on WETH unwrap layout

    @bitcoinwarrior1
    bitcoinwarrior1 committed Nov 9, 2019
    Configuration menu
    Copy the full SHA
    38295af View commit details
    Browse the repository at this point in the history

  2. Allow users to gain tokens by email when service is down

    @bitcoinwarrior1
    bitcoinwarrior1 committed Nov 9, 2019
    Configuration menu
    Copy the full SHA
    71d5d97 View commit details
    Browse the repository at this point in the history

  3. add bonus for tweeting

    @bitcoinwarrior1
    bitcoinwarrior1 committed Nov 9, 2019
    Configuration menu
    Copy the full SHA
    a03cf1d View commit details
    Browse the repository at this point in the history

  4. Merge pull request #271 from AlphaWallet/unavailable-discovery 

    Unavailable discovery
    @bitcoinwarrior1
    bitcoinwarrior1 committed Nov 9, 2019
    Configuration menu
    Copy the full SHA
    843ba6b View commit details
    Browse the repository at this point in the history

Commits on Nov 13, 2019

  1. adding an explanation article articles/data-object.md to be shared be… 

    …fore Thursday meeting and published after (with links to the result of discussion)
    Weiwu Zhang committed Nov 13, 2019
    Configuration menu
    Copy the full SHA
    90fa55f View commit details
    Browse the repository at this point in the history

Commits on Nov 14, 2019

  1. language improvement in the article

    Weiwu Zhang committed Nov 14, 2019
    Configuration menu
    Copy the full SHA
    a36717e View commit details
    Browse the repository at this point in the history

Commits on Nov 15, 2019

  1. copy-edited

    Weiwu Zhang committed Nov 15, 2019
    Configuration menu
    Copy the full SHA
    50d89aa View commit details
    Browse the repository at this point in the history

Commits on Nov 17, 2019

  1. introducing svg image as illustraction since we discoverred that pand… 

    …oc can work with svg (if rsvg-convert is installed). also fix some typo
    Weiwu Zhang committed Nov 17, 2019
    Configuration menu
    Copy the full SHA
    aeb11cd View commit details
    Browse the repository at this point in the history

Commits on Nov 18, 2019

  1. James Zaki's suggestions

    Weiwu Zhang committed Nov 18, 2019
    Configuration menu
    Copy the full SHA
    96c7966 View commit details
    Browse the repository at this point in the history

Commits on Nov 20, 2019

  1. more editorial opinion from Zaki are integrated

    Weiwu Zhang committed Nov 20, 2019
    Configuration menu
    Copy the full SHA
    abc0463 View commit details
    Browse the repository at this point in the history

  2. first sprint of UEFA tsml ticket

    @bitcoinwarrior1
    bitcoinwarrior1 committed Nov 20, 2019
    Configuration menu
    Copy the full SHA
    7b16a1b View commit details
    Browse the repository at this point in the history

Commits on Nov 22, 2019

  1. Merge pull request #275 from AlphaWallet/UEFA 

    first sprint of UEFA tsml ticket
    @bitcoinwarrior1
    bitcoinwarrior1 committed Nov 22, 2019
    Configuration menu
    Copy the full SHA
    545096a View commit details
    Browse the repository at this point in the history

Commits on Nov 25, 2019

  1. fix redeemed conditional is wrong

    @bitcoinwarrior1
    bitcoinwarrior1 committed Nov 25, 2019
    Configuration menu
    Copy the full SHA
    3c217f1 View commit details
    Browse the repository at this point in the history

  2. only set redeemed value if it has actually loaded

    @bitcoinwarrior1
    bitcoinwarrior1 committed Nov 25, 2019
    Configuration menu
    Copy the full SHA
    c7e7d3f View commit details
    Browse the repository at this point in the history

Commits on Nov 28, 2019

  1. add rinkeby and xDAI to UEFA

    @bitcoinwarrior1
    bitcoinwarrior1 committed Nov 28, 2019
    Configuration menu
    Copy the full SHA
    e2ff115 View commit details
    Browse the repository at this point in the history

  2. with new rinkeby address

    @bitcoinwarrior1
    bitcoinwarrior1 committed Nov 28, 2019
    Configuration menu
    Copy the full SHA
    fdc6606 View commit details
    Browse the repository at this point in the history

Commits on Dec 2, 2019

  1. Implement UEFA design in TokenScript

    @rosieprom @bitcoinwarrior1
    rosieprom authored and bitcoinwarrior1 committed Dec 2, 2019
    Configuration menu
    Copy the full SHA
    480bfe0 View commit details
    Browse the repository at this point in the history

  2. Merge pull request #283 from AlphaWallet/UEFA-new-layout-shtml 

    UEFA new layout shtml
    @bitcoinwarrior1
    bitcoinwarrior1 committed Dec 2, 2019
    Configuration menu
    Copy the full SHA
    9b55c27 View commit details
    Browse the repository at this point in the history

  3. remove residual files

    @bitcoinwarrior1
    bitcoinwarrior1 committed Dec 2, 2019
    Configuration menu
    Copy the full SHA
    bd834fa View commit details
    Browse the repository at this point in the history

Commits on Dec 4, 2019

  1. added redeemed text, compressed images

    @rosieprom
    rosieprom committed Dec 4, 2019
    Configuration menu
    Copy the full SHA
    c0bf838 View commit details
    Browse the repository at this point in the history

Commits on Dec 5, 2019

  1. Update README.md

    @zhangzhongnan928
    zhangzhongnan928 committed Dec 5, 2019
    Configuration menu
    Copy the full SHA
    385d51b View commit details
    Browse the repository at this point in the history

  2. Update README.md

    @zhangzhongnan928
    zhangzhongnan928 committed Dec 5, 2019
    Configuration menu
    Copy the full SHA
    e314954 View commit details
    Browse the repository at this point in the history

  3. Update README.md

    @zhangzhongnan928
    zhangzhongnan928 committed Dec 5, 2019
    Configuration menu
    Copy the full SHA
    a66acd4 View commit details
    Browse the repository at this point in the history

Commits on Dec 8, 2019

  1. fixed shared.css to work on Android/iOS

    @rosieprom
    rosieprom committed Dec 8, 2019
    Configuration menu
    Copy the full SHA
    6030f0c View commit details
    Browse the repository at this point in the history

Commits on Dec 9, 2019

  1. changed the background image and some height issue fix

    @rosieprom
    rosieprom committed Dec 9, 2019
    Configuration menu
    Copy the full SHA
    81c7f3d View commit details
    Browse the repository at this point in the history

Commits on Dec 10, 2019

  1. Merge pull request #291 from AlphaWallet/UEFA-redeem-item 

    added redeemed text, compressed images
    @bitcoinwarrior1
    bitcoinwarrior1 committed Dec 10, 2019
    Configuration menu
    Copy the full SHA
    0ed4344 View commit details
    Browse the repository at this point in the history

  2. WIP add basic edcon draft TokenScript

    @bitcoinwarrior1
    bitcoinwarrior1 committed Dec 10, 2019
    Configuration menu
    Copy the full SHA
    ea23654 View commit details
    Browse the repository at this point in the history

  3. Merge pull request #298 from AlphaWallet/edcon 

    WIP add basic edcon draft TokenScript
    @zhangzhongnan928
    zhangzhongnan928 committed Dec 10, 2019
    Configuration menu
    Copy the full SHA
    48a8c83 View commit details
    Browse the repository at this point in the history

  4. add base files for alipay

    @bitcoinwarrior1
    bitcoinwarrior1 committed Dec 10, 2019
    Configuration menu
    Copy the full SHA
    a25a702 View commit details
    Browse the repository at this point in the history

  5. add location info to edcon

    @bitcoinwarrior1
    bitcoinwarrior1 committed Dec 10, 2019
    Configuration menu
    Copy the full SHA
    fa6df2c View commit details
    Browse the repository at this point in the history

  6. add pickup to alipay

    @bitcoinwarrior1
    bitcoinwarrior1 committed Dec 10, 2019
    Configuration menu
    Copy the full SHA
    2157ef9 View commit details
    Browse the repository at this point in the history

  7. populate with sample contracts and info

    @bitcoinwarrior1
    bitcoinwarrior1 committed Dec 10, 2019
    Configuration menu
    Copy the full SHA
    9876fde View commit details
    Browse the repository at this point in the history

Commits on Dec 13, 2019

  1. Merge pull request #299 from AlphaWallet/alipay 

    WIP Alipay Samples
    @bitcoinwarrior1
    bitcoinwarrior1 committed Dec 13, 2019
    Configuration menu
    Copy the full SHA
    e78db85 View commit details
    Browse the repository at this point in the history

  2. rename AliEuro TokenScripts

    @bitcoinwarrior1
    bitcoinwarrior1 committed Dec 13, 2019
    Configuration menu
    Copy the full SHA
    6b71301 View commit details
    Browse the repository at this point in the history

Commits on Dec 16, 2019

  1. fix up names

    @bitcoinwarrior1
    bitcoinwarrior1 committed Dec 16, 2019
    Configuration menu
    Copy the full SHA
    93f542c View commit details
    Browse the repository at this point in the history

Commits on Dec 17, 2019

  1. AliEuro TokenScripts with layouts 

    correct contracts

swap
    @bitcoinwarrior1
    bitcoinwarrior1 committed Dec 17, 2019
    Configuration menu
    Copy the full SHA
    12ef7fb View commit details
    Browse the repository at this point in the history

  2. Merge pull request #301 from AlphaWallet/airport-dropoff 

    TS Template es.html front-end for 6/11 tickets WIP
    @bitcoinwarrior1
    bitcoinwarrior1 committed Dec 17, 2019
    Configuration menu
    Copy the full SHA
    7ffa49c View commit details
    Browse the repository at this point in the history

  3. alipay amended css

    @rosieprom
    rosieprom committed Dec 17, 2019
    Configuration menu
    Copy the full SHA
    7c7f5d1 View commit details
    Browse the repository at this point in the history

Commits on Dec 18, 2019

  1. fixed alipay styled css

    @rosieprom
    rosieprom committed Dec 18, 2019
    Configuration menu
    Copy the full SHA
    7ed41f5 View commit details
    Browse the repository at this point in the history

  2. Merge pull request #302 from AlphaWallet/alipay-style-fixing 

    fixed alipay styled css
    @bitcoinwarrior1
    bitcoinwarrior1 committed Dec 18, 2019
    Configuration menu
    Copy the full SHA
    f48d84e View commit details
    Browse the repository at this point in the history

  3. made the edcon ts ticket layout

    @rosieprom
    rosieprom committed Dec 18, 2019
    Configuration menu
    Copy the full SHA
    3760319 View commit details
    Browse the repository at this point in the history

Commits on Dec 19, 2019

  1. changed background images to new design

    @rosieprom
    rosieprom committed Dec 19, 2019
    Configuration menu
    Copy the full SHA
    bbc4dd1 View commit details
    Browse the repository at this point in the history

  2. Merge pull request #303 from AlphaWallet/edcon-layout 

    EDCON Ticket Layout
    @bitcoinwarrior1
    bitcoinwarrior1 committed Dec 19, 2019
    Configuration menu
    Copy the full SHA
    e857b61 View commit details
    Browse the repository at this point in the history

  3. added new background image

    @rosieprom
    rosieprom committed Dec 19, 2019
    Configuration menu
    Copy the full SHA
    c181b7e View commit details
    Browse the repository at this point in the history

  4. Merge pull request #306 from AlphaWallet/edcon-layout-fix 

    added new background image
    @bitcoinwarrior1
    bitcoinwarrior1 committed Dec 19, 2019
    Configuration menu
    Copy the full SHA
    094fc8e View commit details
    Browse the repository at this point in the history

  5. blank ticket template done for tokenscript

    @rosieprom
    rosieprom committed Dec 19, 2019
    Configuration menu
    Copy the full SHA
    5330f2c View commit details
    Browse the repository at this point in the history

  6. Merge pull request #305 from AlphaWallet/blank-template-example 

    Blank ticket TS template
    @bitcoinwarrior1
    bitcoinwarrior1 committed Dec 19, 2019
    Configuration menu
    Copy the full SHA
    11693a0 View commit details
    Browse the repository at this point in the history

Commits on Dec 28, 2019

  1. add Chinese to UEFA

    @bitcoinwarrior1
    bitcoinwarrior1 committed Dec 28, 2019
    Configuration menu
    Copy the full SHA
    84bca45 View commit details
    Browse the repository at this point in the history

Commits on Dec 29, 2019

  1. allowing multiple views in <action> or <token-card>. 

    This may break the older build but since the only known tokenscript file that uses multiple views are UEFI, we might control the release schedule so those users who would hold such tokens gets new build.
    Weiwu Zhang committed Dec 29, 2019
    Configuration menu
    Copy the full SHA
    e2d8697 View commit details
    Browse the repository at this point in the history

Commits on Dec 31, 2019

  1. Merge pull request #308 from AlphaWallet/translate-uefa-to-chinese 

    add Chinese to UEFA
    @bitcoinwarrior1
    bitcoinwarrior1 committed Dec 31, 2019
    Configuration menu
    Copy the full SHA
    c3a434e View commit details
    Browse the repository at this point in the history

Commits on Jan 2, 2020

  1. this is the 1st part of a 3-part serial

    Weiwu Zhang committed Jan 2, 2020
    Configuration menu
    Copy the full SHA
    9d4ae62 View commit details
    Browse the repository at this point in the history

Commits on Jan 7, 2020

  1. Replace logo and title used in UEFA ticket

    @hboon
    hboon committed Jan 7, 2020
    Configuration menu
    Copy the full SHA
    4c82e73 View commit details
    Browse the repository at this point in the history

Commits on Jan 8, 2020

  1. Merge pull request #315 from AlphaWallet/replace-logo-and-title-used-… 

    …in-uefa

Replace logo and title used in UEFA ticket
    @bitcoinwarrior1
    bitcoinwarrior1 committed Jan 8, 2020
    Configuration menu
    Copy the full SHA
    aeb70fc View commit details
    Browse the repository at this point in the history

  2. change Makefile in UEFA to have name AlphaWallet

    @bitcoinwarrior1
    bitcoinwarrior1 committed Jan 8, 2020
    Configuration menu
    Copy the full SHA
    a8b4b17 View commit details
    Browse the repository at this point in the history

Commits on Jan 9, 2020

  1. Create The tech stack for tokenising tickets on public blockchain

    @zhangzhongnan928
    zhangzhongnan928 committed Jan 9, 2020
    Configuration menu
    Copy the full SHA
    fab82fa View commit details
    Browse the repository at this point in the history

  2. Update The tech stack for tokenising tickets on public blockchain

    @zhangzhongnan928
    zhangzhongnan928 committed Jan 9, 2020
    Configuration menu
    Copy the full SHA
    b45e753 View commit details
    Browse the repository at this point in the history

  3. Delete The tech stack for tokenising tickets on public blockchain

    @zhangzhongnan928
    zhangzhongnan928 committed Jan 9, 2020
    Configuration menu
    Copy the full SHA
    7a2de64 View commit details
    Browse the repository at this point in the history

  4. Add files via upload

    @zhangzhongnan928
    zhangzhongnan928 committed Jan 9, 2020
    Configuration menu
    Copy the full SHA
    dbfa630 View commit details
    Browse the repository at this point in the history

Commits on Jan 10, 2020

  1. change Makefile to use Shankai name

    @bitcoinwarrior1
    bitcoinwarrior1 committed Jan 10, 2020
    Configuration menu
    Copy the full SHA
    dd312c1 View commit details
    Browse the repository at this point in the history

  2. Merge branch 'master' of https://github.com/AlphaWallet/TokenScript

    @bitcoinwarrior1
    bitcoinwarrior1 committed Jan 10, 2020
    Configuration menu
    Copy the full SHA
    9d5bdfd View commit details
    Browse the repository at this point in the history

Commits on Jan 17, 2020

  1. add starwars sports tickets

    @bitcoinwarrior1
    bitcoinwarrior1 committed Jan 17, 2020
    Configuration menu
    Copy the full SHA
    a8d241c View commit details
    Browse the repository at this point in the history

  2. adjust fonts

    @bitcoinwarrior1
    bitcoinwarrior1 committed Jan 17, 2020
    Configuration menu
    Copy the full SHA
    27d4e28 View commit details
    Browse the repository at this point in the history

Commits on Jan 18, 2020

  1. rename star wars sports

    @bitcoinwarrior1
    bitcoinwarrior1 committed Jan 18, 2020
    Configuration menu
    Copy the full SHA
    6eb8873 View commit details
    Browse the repository at this point in the history

Commits on Jan 20, 2020

  1. rename legacy DAI to SAI

    @bitcoinwarrior1
    bitcoinwarrior1 committed Jan 20, 2020
    Configuration menu
    Copy the full SHA
    6036512 View commit details
    Browse the repository at this point in the history

  2. add cDAI TokenScript

    @bitcoinwarrior1
    bitcoinwarrior1 committed Jan 20, 2020
    Configuration menu
    Copy the full SHA
    8241ed8 View commit details
    Browse the repository at this point in the history

  3. change bridge to use DAI rather than SAI

    @bitcoinwarrior1
    bitcoinwarrior1 committed Jan 20, 2020
    Configuration menu
    Copy the full SHA
    43146fb View commit details
    Browse the repository at this point in the history

  4. add SAI Migration TokenScript to replace bridge

    @bitcoinwarrior1
    bitcoinwarrior1 committed Jan 20, 2020
    Configuration menu
    Copy the full SHA
    a5ae9ff View commit details
    Browse the repository at this point in the history

Commits on Jan 21, 2020

  1. update images of DAI

    @bitcoinwarrior1
    bitcoinwarrior1 committed Jan 21, 2020
    Configuration menu
    Copy the full SHA
    f7a3527 View commit details
    Browse the repository at this point in the history

Commits on Jan 22, 2020

  1. remove examples, resources and tutorial while changing the readme to … 

    …reference to TokenScript-examples for these files
    @bitcoinwarrior1
    bitcoinwarrior1 committed Jan 22, 2020
    Configuration menu
    Copy the full SHA
    8d7a1fa View commit details
    Browse the repository at this point in the history

  2. Merge pull request #324 from AlphaWallet/adapt-for-examples-repo 

    Adapt for TokenScript examples repo
    @bitcoinwarrior1
    bitcoinwarrior1 committed Jan 22, 2020
    Configuration menu
    Copy the full SHA
    2bf1c44 View commit details
    Browse the repository at this point in the history

Commits on Feb 1, 2020

  1. add why XML section

    @bitcoinwarrior1
    bitcoinwarrior1 committed Feb 1, 2020
    Configuration menu
    Copy the full SHA
    6954bbb View commit details
    Browse the repository at this point in the history

  2. Merge pull request #327 from AlphaWallet/add-why-xml 

    add why XML section
    @bitcoinwarrior1
    bitcoinwarrior1 committed Feb 1, 2020
    Configuration menu
    Copy the full SHA
    6216a04 View commit details
    Browse the repository at this point in the history

Commits on Feb 2, 2020

  1. adding a few paragraphs to explain the difference between signing a t… 

    …okenscript and expressing trust towards a tokenscript
    Weiwu Zhang committed Feb 2, 2020
    Configuration menu
    Copy the full SHA
    0e2414a View commit details
    Browse the repository at this point in the history

Commits on Feb 3, 2020

  1. allowing event card in <cards>

    Weiwu Zhang committed Feb 3, 2020
    Configuration menu
    Copy the full SHA
    99d9217 View commit details
    Browse the repository at this point in the history

  2. rename <token-card> to <token>

    Weiwu Zhang committed Feb 3, 2020
    Configuration menu
    Copy the full SHA
    8937839 View commit details
    Browse the repository at this point in the history

Commits on Feb 17, 2020

  1. adding asnx schema and changing view to include only javascript and s… 

    …tylesheet, not html at all
    Weiwu Zhang committed Feb 17, 2020
    Configuration menu
    Copy the full SHA
    188a33d View commit details
    Browse the repository at this point in the history

  2. adding xhtml:body to support html (abeit with namespace, meaning norm… 

    …al html won't work here, but it has to be like this†

https://stackoverflow.com/questions/60254648/elementformdefault-sometimes-doesnt-work/60255473#60255473
    Weiwu Zhang committed Feb 17, 2020
    Configuration menu
    Copy the full SHA
    7ef248b View commit details
    Browse the repository at this point in the history

  3. changing view-iconified to item-view because 

        1) no one got what iconified meant. it meant that the view is not interactive, like a desktop icon isn't interactive (no button inside), and it can be selected and multi-selected.
    2) tomek is going to introduce <icon> for each token, so we will confuse our users with 'iconified'.
    Weiwu Zhang committed Feb 17, 2020
    Configuration menu
    Copy the full SHA
    4dba0d6 View commit details
    Browse the repository at this point in the history

  4. reading for being published as 2020-03 schema

    Weiwu Zhang committed Feb 17, 2020
    Configuration menu
    Copy the full SHA
    f1eafb6 View commit details
    Browse the repository at this point in the history

  5. reversing a seemly mistaken change. I never intended sub-elements und… 

    …er <action> to be anything but sequence
    Weiwu Zhang committed Feb 17, 2020
    Configuration menu
    Copy the full SHA
    ab16fd6 View commit details
    Browse the repository at this point in the history

  6. turn aciton from an element with local definition to an element from … 

    …a type called 'action-card'
    Weiwu Zhang committed Feb 17, 2020
    Configuration menu
    Copy the full SHA
    d666d74 View commit details
    Browse the repository at this point in the history

Commits on Feb 20, 2020

  1. Update JavaScript doc with API for TokenScript view container access.… 

    … Ref: https://community.tokenscript.org/t/weekly-design-meeting-21/329
    @hboon
    hboon authored and Weiwu Zhang committed Feb 20, 2020
    Configuration menu
    Copy the full SHA
    4b807dc View commit details
    Browse the repository at this point in the history

Commits on Feb 21, 2020

  1. change action back to a global element so it can be uesd as root element

    Weiwu Zhang committed Feb 21, 2020
    Configuration menu
    Copy the full SHA
    2a4b5f1 View commit details
    Browse the repository at this point in the history

Commits on Mar 13, 2020

  1. Update design_paper.md

    @zhangzhongnan928
    zhangzhongnan928 committed Mar 13, 2020
    Configuration menu
    Copy the full SHA
    b5e322e View commit details
    Browse the repository at this point in the history

Commits on Mar 14, 2020

  1. Change licence to MIT 

    Let's use the least complex and most permissive license (MIT). Apache is good too (permissive) but is more complex than we need and may come with other restrictions.
    @bitcoinwarrior1
    bitcoinwarrior1 committed Mar 14, 2020
    Configuration menu
    Copy the full SHA
    daac10d View commit details
    Browse the repository at this point in the history

  2. Merge pull request #334 from AlphaWallet/zhangzhongnan928-patch-1 

    Chang immensively to immensely
    @bitcoinwarrior1
    bitcoinwarrior1 committed Mar 14, 2020
    Configuration menu
    Copy the full SHA
    fb75e7b View commit details
    Browse the repository at this point in the history

  3. Merge pull request #335 from AlphaWallet/change-to-mit 

    Change licence to MIT
    @zhangzhongnan928
    zhangzhongnan928 committed Mar 14, 2020
    Configuration menu
    Copy the full SHA
    f006805 View commit details
    Browse the repository at this point in the history

Commits on Mar 16, 2020

  1. Update README.md

    @zhangzhongnan928
    zhangzhongnan928 committed Mar 16, 2020
    Configuration menu
    Copy the full SHA
    905630c View commit details
    Browse the repository at this point in the history

Commits on Mar 23, 2020

  1. a minimalist asnx schema for urn:ietf:params:xml:ns:asnx namespace, j… 

    …ust enough to release the event support we are having now.
    Weiwu Zhang committed Mar 23, 2020
    Configuration menu
    Copy the full SHA
    e0eec08 View commit details
    Browse the repository at this point in the history

  2. adding comments

    Weiwu Zhang committed Mar 23, 2020
    Configuration menu
    Copy the full SHA
    696f96d View commit details
    Browse the repository at this point in the history

  3. adding ethereum namespace for ethereum-only attributes

    Weiwu Zhang committed Mar 23, 2020
    Configuration menu
    Copy the full SHA
    17e8a06 View commit details
    Browse the repository at this point in the history

Commits on Mar 31, 2020

  1. forgot this spot (adding indexed attribute) in the last commit

    Weiwu Zhang committed Mar 31, 2020
    Configuration menu
    Copy the full SHA
    9da9964 View commit details
    Browse the repository at this point in the history

Commits on Apr 9, 2020

  1. now allowing actions to have two attributes: exclude and available-to… 

    …, both are references to a selection
    Weiwu Zhang committed Apr 9, 2020
    Configuration menu
    Copy the full SHA
    72ebaeb View commit details
    Browse the repository at this point in the history

  2. using xml.xsd we hosted instead of w3c's which sometimes becomes unav… 

    …ailable
    Weiwu Zhang committed Apr 9, 2020
    Configuration menu
    Copy the full SHA
    86bec1a View commit details
    Browse the repository at this point in the history

  3. remove the <selections> elements which we no longer use

    Weiwu Zhang committed Apr 9, 2020
    Configuration menu
    Copy the full SHA
    458ad81 View commit details
    Browse the repository at this point in the history

Commits on Apr 10, 2020

  1. finish removing <attribute-types> and <selections>

    Weiwu Zhang committed Apr 10, 2020
    Configuration menu
    Copy the full SHA
    6dd7429 View commit details
    Browse the repository at this point in the history

  2. Update tutorial link

    @jzaki
    jzaki committed Apr 10, 2020
    Configuration menu
    Copy the full SHA
    11958b2 View commit details
    Browse the repository at this point in the history

  3. Fix typo

    @jzaki
    jzaki committed Apr 10, 2020
    Configuration menu
    Copy the full SHA
    3f69cd4 View commit details
    Browse the repository at this point in the history

Commits on Apr 16, 2020

  1. Create We need a better framework for applications using blockchain 中文

    @zhangzhongnan928
    zhangzhongnan928 committed Apr 16, 2020
    Configuration menu
    Copy the full SHA
    dbc31aa View commit details
    Browse the repository at this point in the history

Commits on May 4, 2020

  1. add local-ref

    @bitcoinwarrior1
    bitcoinwarrior1 committed May 4, 2020
    Configuration menu
    Copy the full SHA
    23cf27a View commit details
    Browse the repository at this point in the history

  2. correct address element to variable

    @bitcoinwarrior1
    bitcoinwarrior1 committed May 4, 2020
    Configuration menu
    Copy the full SHA
    a5389a0 View commit details
    Browse the repository at this point in the history

Commits on May 10, 2020

  1. move the definition of "as" attribute and "mapping" element to data w… 

    …here it belongs
    Weiwu Zhang committed May 10, 2020
    Configuration menu
    Copy the full SHA
    d2edad2 View commit details
    Browse the repository at this point in the history

  2. clarification in express-of-trust

    Weiwu Zhang committed May 10, 2020
    Configuration menu
    Copy the full SHA
    184c663 View commit details
    Browse the repository at this point in the history

  3. upping namespace to 2020/06 for quite a few schema-breaking changes i… 

    …ntroduced in the last months' TS weekly meetings
    Weiwu Zhang committed May 10, 2020
    Configuration menu
    Copy the full SHA
    169c6d4 View commit details
    Browse the repository at this point in the history

Commits on May 11, 2020

  1. moving etheruem calls to its own namespace

    Weiwu Zhang committed May 11, 2020
    Configuration menu
    Copy the full SHA
    4c8c830 View commit details
    Browse the repository at this point in the history

  2. renaming name to label

    Weiwu Zhang committed May 11, 2020
    Configuration menu
    Copy the full SHA
    72b0c15 View commit details
    Browse the repository at this point in the history

  3. for attribute-types, changing attribute id into name

    Weiwu Zhang committed May 11, 2020
    Configuration menu
    Copy the full SHA
    4f976b6 View commit details
    Browse the repository at this point in the history

Commits on May 13, 2020

  1. changing <token> and <action> cards into <card type="…". detail https… 

    …://community.tokenscript.org/t/card-element-or-not/368
    Weiwu Zhang committed May 13, 2020
    Configuration menu
    Copy the full SHA
    6d49229 View commit details
    Browse the repository at this point in the history

  2. fixing the sequence of the elements inside cards - we can always rela… 

    …x the order later if the flexibility is so desired, but now fixing them to prevent messy TS
    Weiwu Zhang committed May 13, 2020
    Configuration menu
    Copy the full SHA
    bb68d7a View commit details
    Browse the repository at this point in the history

  3. add e6 which replaces #350

    @bitcoinwarrior1
    bitcoinwarrior1 committed May 13, 2020
    Configuration menu
    Copy the full SHA
    18f2352 View commit details
    Browse the repository at this point in the history

  4. Merge pull request #348 from AlphaWallet/rename-names 

        rename <name> element
    rename all id= to name= for attribute-type
    changing <token> and <action> cards into <card type="…"
    Weiwu Zhang committed May 13, 2020
    Configuration menu
    Copy the full SHA
    ff5cc21 View commit details
    Browse the repository at this point in the history

Commits on May 15, 2020

  1. Merge pull request #332 from AlphaWallet/schema/2020/03 

    Schema/2020/03
    @bitcoinwarrior1
    bitcoinwarrior1 committed May 15, 2020
    Configuration menu
    Copy the full SHA
    aaad8c4 View commit details
    Browse the repository at this point in the history

  2. Merge pull request #345 from AlphaWallet/schema/2020/06 

    Schema/2020/06
    @bitcoinwarrior1
    bitcoinwarrior1 committed May 15, 2020
    Configuration menu
    Copy the full SHA
    8e85f5a View commit details
    Browse the repository at this point in the history

  3. introducing <ethereum:transaction> based on <ethereum:call>

    Weiwu Zhang committed May 15, 2020
    Configuration menu
    Copy the full SHA
    740be6d View commit details
    Browse the repository at this point in the history

Commits on May 16, 2020

  1. Merge pull request #353 from AlphaWallet/rename-names 

    introducing <ethereum:transaction> based on <ethereum:call>
    @bitcoinwarrior1
    bitcoinwarrior1 committed May 16, 2020
    Configuration menu
    Copy the full SHA
    67d54e0 View commit details
    Browse the repository at this point in the history

Commits on May 19, 2020

  1. add in local-ref to ethereum:value (#354) 

    * add in local-ref to ethereum:value

* removing part of ethereum element definition as a stepping stone for removing ethereum element entirely from tokenscript.xsd

Co-authored-by: Weiwu Zhang <a@colourful.land>
    @bitcoinwarrior1
    bitcoinwarrior1 and Weiwu Zhang committed May 19, 2020
    Configuration menu
    Copy the full SHA
    0225d2b View commit details
    Browse the repository at this point in the history

Commits on May 20, 2020

  1. reformat - wanted to do this for a long time but schema has always be… 

    …en on the move
    Weiwu Zhang committed May 20, 2020
    Configuration menu
    Copy the full SHA
    f630edf View commit details
    Browse the repository at this point in the history

  2. Merge pull request #356 from AlphaWallet/reformat-schema-files 

    reformat - wanted to do this for a long time but schema has always be…
    @bitcoinwarrior1
    bitcoinwarrior1 committed May 20, 2020
    Configuration menu
    Copy the full SHA
    7748505 View commit details
    Browse the repository at this point in the history

Commits on May 24, 2020

  1. moving attributes' type definition into its own element

    Weiwu Zhang committed May 24, 2020
    Configuration menu
    Copy the full SHA
    c0cffe2 View commit details
    Browse the repository at this point in the history

  2. Merge pull request #358 from AlphaWallet/type-in-attribute 

    moving attributes' type definition into its own element
    @bitcoinwarrior1
    bitcoinwarrior1 committed May 24, 2020
    Configuration menu
    Copy the full SHA
    62f1d2f View commit details
    Browse the repository at this point in the history

Commits on May 31, 2020

  1. rename id to name for all <selection>

    Weiwu Zhang committed May 31, 2020
    Configuration menu
    Copy the full SHA
    02e8457 View commit details
    Browse the repository at this point in the history

  2. using asnx module correctly, as per RFC4912, to include sequence in a… 

    … named type
    Weiwu Zhang committed May 31, 2020
    Configuration menu
    Copy the full SHA
    6f046d5 View commit details
    Browse the repository at this point in the history

Commits on Jun 1, 2020

  1. Merge pull request #359 from AlphaWallet/id-and-asnx-module-correction 

    Id and asnx module correction
    @bitcoinwarrior1
    bitcoinwarrior1 committed Jun 1, 2020
    Configuration menu
    Copy the full SHA
    7856914 View commit details
    Browse the repository at this point in the history

Commits on Jun 12, 2020

  1. add sample activities for ERC20 & ERC721

    @bitcoinwarrior1
    bitcoinwarrior1 authored and Weiwu Zhang committed Jun 12, 2020
    Configuration menu
    Copy the full SHA
    ed478c1 View commit details
    Browse the repository at this point in the history

  2. directory structure - the ERCs implemented in TokenScripts are real t… 

    …okenscripts, not examples.
    Weiwu Zhang committed Jun 12, 2020
    Configuration menu
    Copy the full SHA
    264e30c View commit details
    Browse the repository at this point in the history

  3. adding README

    Weiwu Zhang committed Jun 12, 2020
    Configuration menu
    Copy the full SHA
    c88ab21 View commit details
    Browse the repository at this point in the history

  4. relax schema rules so that ERCs can be implemented in TokenScript

    Weiwu Zhang committed Jun 12, 2020
    Configuration menu
    Copy the full SHA
    1c02db0 View commit details
    Browse the repository at this point in the history

  5. updating tokenscript to validate

    Weiwu Zhang committed Jun 12, 2020
    Configuration menu
    Copy the full SHA
    92dd2be View commit details
    Browse the repository at this point in the history

Commits on Jun 22, 2020

  1. Fix: TokenScript file for ERC20 should not have string interpolation … 

    …on the LHS
    @hboon
    hboon committed Jun 22, 2020
    Configuration menu
    Copy the full SHA
    a3cde51 View commit details
    Browse the repository at this point in the history

  2. Merge pull request #361 from AlphaWallet/fix-erc20-filter-lhs-no-stri… 

    …ng-interpolation

Fix: TokenScript file for ERC20 should not have string interpolation on the LHS
    @bitcoinwarrior1
    bitcoinwarrior1 committed Jun 22, 2020
    Configuration menu
    Copy the full SHA
    6484039 View commit details
    Browse the repository at this point in the history

  3. Fix: TokenScript file for ERC20's ownerApproved filter

    @hboon
    hboon committed Jun 22, 2020
    Configuration menu
    Copy the full SHA
    b218c77 View commit details
    Browse the repository at this point in the history

  4. Merge pull request #362 from AlphaWallet/fix-erc20-filter-ownerApprov… 

    …ed-activity-filter

Fix: TokenScript file for ERC20's ownerApproved filter
    @bitcoinwarrior1
    bitcoinwarrior1 committed Jun 22, 2020
    Configuration menu
    Copy the full SHA
    8d22e0c View commit details
    Browse the repository at this point in the history

Commits on Jun 24, 2020

  1. modifies readme for tokenscript 

    keeps the overall flow and content. Changes:
- text changes for clarity
- Adds benefit section (top)
- adds working examples
- adds "join the conversation" section
- adds contributors section
- adds license section
- add hero image
    lucas committed Jun 24, 2020
    Configuration menu
    Copy the full SHA
    bf75453 View commit details
    Browse the repository at this point in the history

Commits on Jun 25, 2020

  1. RFC4912 required a <type> for a named type that defines a type

    Weiwu Zhang committed Jun 25, 2020
    Configuration menu
    Copy the full SHA
    c506dc1 View commit details
    Browse the repository at this point in the history

  2. apply the same RFC4912 comformation change to the default ERC scripts

    Weiwu Zhang committed Jun 25, 2020
    Configuration menu
    Copy the full SHA
    5c260b1 View commit details
    Browse the repository at this point in the history

  3. corrisponding change in ERC72 was left out in the last commit

    Weiwu Zhang committed Jun 25, 2020
    Configuration menu
    Copy the full SHA
    a632653 View commit details
    Browse the repository at this point in the history

Commits on Jun 26, 2020

  1. Fix: TokenScript file for ERC20's activity filters not using correct … 

    …field names
    @hboon
    hboon committed Jun 26, 2020
    Configuration menu
    Copy the full SHA
    b19b8d5 View commit details
    Browse the repository at this point in the history

  2. link correction

    lucas committed Jun 26, 2020
    Configuration menu
    Copy the full SHA
    4927e61 View commit details
    Browse the repository at this point in the history

  3. allowing contracts to be absent in ethereum:*

    Weiwu Zhang committed Jun 26, 2020
    Configuration menu
    Copy the full SHA
    5422a58 View commit details
    Browse the repository at this point in the history

  4. format editing

    Weiwu Zhang committed Jun 26, 2020
    Configuration menu
    Copy the full SHA
    5337776 View commit details
    Browse the repository at this point in the history

  5. Remove "Don't we already have a front-end for tokens?"

    Weiwu Zhang committed Jun 26, 2020
    Configuration menu
    Copy the full SHA
    ed69c84 View commit details
    Browse the repository at this point in the history

  6. Merge pull request #363 from AlphaWallet/origin/readme-updates 

    modifies readme for tokenscript
    Lucas Toledo committed Jun 26, 2020
    Configuration menu
    Copy the full SHA
    ba1d9e6 View commit details
    Browse the repository at this point in the history

Commits on Jun 29, 2020

  1. Merge pull request #368 from AlphaWallet/fix-erc20-activity-event-fil… 

    …ters-field-names

Fix: TokenScript file for ERC20's activity filters not using correct field names
    @bitcoinwarrior1
    bitcoinwarrior1 committed Jun 29, 2020
    Configuration menu
    Copy the full SHA
    8c2cd61 View commit details
    Browse the repository at this point in the history

  2. adding JavaScript xmldsig verification example (#369) 

    adding JavaScript xmldsig verification example. Examples in golang/tcl/java coming soon.
    Weiwu Zhang committed Jun 29, 2020
    Configuration menu
    Copy the full SHA
    a517d0d View commit details
    Browse the repository at this point in the history

Commits on Jun 30, 2020

  1. updating the tokenscript schema README to explain the release cycle. (#… 

    …371)

Updating the tokenscript schema README to explain the release cycle.
    Weiwu Zhang committed Jun 30, 2020
    Configuration menu
    Copy the full SHA
    364ad54 View commit details
    Browse the repository at this point in the history

Commits on Jul 5, 2020

  1. RFC4912 required a <type> for a named type that defines a type

    Weiwu Zhang committed Jul 5, 2020
    Configuration menu
    Copy the full SHA
    745b503 View commit details
    Browse the repository at this point in the history

  2. apply the same RFC4912 comformation change to the default ERC scripts

    Weiwu Zhang committed Jul 5, 2020
    Configuration menu
    Copy the full SHA
    44ae8ad View commit details
    Browse the repository at this point in the history

  3. corrisponding change in ERC72 was left out in the last commit

    Weiwu Zhang committed Jul 5, 2020
    Configuration menu
    Copy the full SHA
    af0b3a3 View commit details
    Browse the repository at this point in the history

  4. allowing <origins> and allowing empty <asnx:element>

    Weiwu Zhang committed Jul 5, 2020
    Configuration menu
    Copy the full SHA
    9dbe81f View commit details
    Browse the repository at this point in the history

  5. making ERC721 compatible with the <origins> style too

    Weiwu Zhang committed Jul 5, 2020
    Configuration menu
    Copy the full SHA
    eb0aadc View commit details
    Browse the repository at this point in the history

  6. retro-rename the 3rd element in ERC20 transfer/approve events to amou… 

    …nt to fit JavaScript which uses the word 'amount'
    Weiwu Zhang committed Jul 5, 2020
    Configuration menu
    Copy the full SHA
    c5d3a76 View commit details
    Browse the repository at this point in the history

Commits on Jul 8, 2020

  1. Add the link to basic tutorial 

    A really good starting point to generating your own TokenScript
    @zhangzhongnan928
    zhangzhongnan928 committed Jul 8, 2020
    Configuration menu
    Copy the full SHA
    746e7b5 View commit details
    Browse the repository at this point in the history

Commits on Jul 13, 2020

  1. Merge pull request #365 from AlphaWallet/correct-violation-of-rfc4912 

    RFC4912 required a <type> for a named type that defines a type
    Weiwu Zhang committed Jul 13, 2020
    Configuration menu
    Copy the full SHA
    d076ff6 View commit details
    Browse the repository at this point in the history

  2. Update JavaScript doc with API to separate token and card attribute d… 

    …ata access in callback
    @hboon
    hboon committed Jul 13, 2020
    Configuration menu
    Copy the full SHA
    b1df515 View commit details
    Browse the repository at this point in the history

Commits on Jul 14, 2020

  1. revert a change in the previous version which forced asnx:element to … 

    …have children
    Weiwu Zhang committed Jul 14, 2020
    Configuration menu
    Copy the full SHA
    98064be View commit details
    Browse the repository at this point in the history

Commits on Jul 15, 2020

  1. forgot a few patches in the previous comment that replaces card attri… 

    …butes with card origins
    Weiwu Zhang committed Jul 15, 2020
    Configuration menu
    Copy the full SHA
    a5d310b View commit details
    Browse the repository at this point in the history

  2. ah still wrong, correcting LHS field name

    Weiwu Zhang committed Jul 15, 2020
    Configuration menu
    Copy the full SHA
    3f74249 View commit details
    Browse the repository at this point in the history

  3. Merge branch 'master' into correct-violation-of-rfc4912+add-origins-i… 

    …n-activity
    Weiwu Zhang committed Jul 15, 2020
    Configuration menu
    Copy the full SHA
    9d8061e View commit details
    Browse the repository at this point in the history

Commits on Jul 20, 2020

  1. adding the keyref constraints on the newly added card/origins's events

    Weiwu Zhang committed Jul 20, 2020
    Configuration menu
    Copy the full SHA
    72afaba View commit details
    Browse the repository at this point in the history

  2. requiring contract in Ethereum Event as Sangalli would need

    Weiwu Zhang committed Jul 20, 2020
    Configuration menu
    Copy the full SHA
    ea565c9 View commit details
    Browse the repository at this point in the history

  3. Merge pull request #373 from AlphaWallet/correct-violation-of-rfc4912… 

    …+add-origins-in-activity

Add origins in activity
    Weiwu Zhang committed Jul 20, 2020
    Configuration menu
    Copy the full SHA
    2bc5140 View commit details
    Browse the repository at this point in the history

Commits on Jul 22, 2020

  1. adding use="required" to the attributes that needs it

    Weiwu Zhang committed Jul 22, 2020
    Configuration menu
    Copy the full SHA
    543008b View commit details
    Browse the repository at this point in the history

  2. make function required when calling, optional when making a transaction

    Weiwu Zhang committed Jul 22, 2020
    Configuration menu
    Copy the full SHA
    6676cc4 View commit details
    Browse the repository at this point in the history

Commits on Jul 25, 2020

  1. refactor type to allow token/activity/action cards to have different … 

    …types
    Weiwu Zhang committed Jul 25, 2020
    Configuration menu
    Copy the full SHA
    a24e1e2 View commit details
    Browse the repository at this point in the history

  2. taking <cards> out to a global element so that it can be used as root… 

    … element in some action-only token scripts
    Weiwu Zhang committed Jul 25, 2020
    Configuration menu
    Copy the full SHA
    e16561a View commit details
    Browse the repository at this point in the history

Commits on Jul 26, 2020

  1. refactor view as we only need them in cards

    Weiwu Zhang committed Jul 26, 2020
    Configuration menu
    Copy the full SHA
    660967c View commit details
    Browse the repository at this point in the history

  2. allowing guide-view

    Weiwu Zhang committed Jul 26, 2020
    Configuration menu
    Copy the full SHA
    ebb8f9f View commit details
    Browse the repository at this point in the history

  3. requiring name for cards, reasons explained https://community.tokensc… 

    …ript.org/t/cards-name/406
    Weiwu Zhang committed Jul 26, 2020
    Configuration menu
    Copy the full SHA
    ef180f3 View commit details
    Browse the repository at this point in the history

Commits on Jul 28, 2020

  1. attempt to make the keyref enforcement work on ethereum:call's type a… 

    …s well
    Weiwu Zhang committed Jul 28, 2020
    Configuration menu
    Copy the full SHA
    6c1dbd7 View commit details
    Browse the repository at this point in the history

  2. Resolved issue - The XPath expression //ts:origins/ethereum:event|//t… 

    …s:origins/ethereum:call could not be compiled.
    @darakhbharat
    darakhbharat authored and Weiwu Zhang committed Jul 28, 2020
    Configuration menu
    Copy the full SHA
    9361fcd View commit details
    Browse the repository at this point in the history

Commits on Aug 7, 2020

  1. introducing distinct as per previous ts meeting

    Weiwu Zhang committed Aug 7, 2020
    Configuration menu
    Copy the full SHA
    0b02703 View commit details
    Browse the repository at this point in the history

  2. introducing distinct as per previous ts meeting

    Weiwu Zhang committed Aug 7, 2020
    Configuration menu
    Copy the full SHA
    5e5c5a2 View commit details
    Browse the repository at this point in the history

  3. unify token as top level element & as reference, both allow name

    Weiwu Zhang committed Aug 7, 2020
    Configuration menu
    Copy the full SHA
    5ac912d View commit details
    Browse the repository at this point in the history

Commits on Sep 3, 2020

  1. Fix: TokenScript file for ERC721's activity filters not using correct… 

    … field names
    @hboon
    hboon committed Sep 3, 2020
    Configuration menu
    Copy the full SHA
    7c17ce5 View commit details
    Browse the repository at this point in the history

  2. Merge pull request #385 from AlphaWallet/fix-erc721-activity-event-fi… 

    …lters-field-names

Fix: TokenScript file for ERC721's activity filters not using correct field names
    @bitcoinwarrior1
    bitcoinwarrior1 committed Sep 3, 2020
    Configuration menu
    Copy the full SHA
    3cf25b6 View commit details
    Browse the repository at this point in the history

  3. Fix: TokenScript view files for ERC721's activity for reference to `t… 

    …okenId` field in event
    @hboon
    hboon committed Sep 3, 2020
    Configuration menu
    Copy the full SHA
    f3e88c2 View commit details
    Browse the repository at this point in the history

Commits on Sep 6, 2020

  1. distinct attribute is not allowed for attributes in <card>, only if i… 

    …t is directly in <token> (the global element <token>). The changes are XSD 1.0 compatible
    @darakhbharat
    darakhbharat committed Sep 6, 2020
    Configuration menu
    Copy the full SHA
    c4ca79f View commit details
    Browse the repository at this point in the history

Commits on Sep 8, 2020

  1. Merge pull request #386 from AlphaWallet/fix-erc721-activity-views-re… 

    …ference-to-implicit-tokenid

Fix: TokenScript view files for ERC721's activity for reference to implict `tokenId` attribute
    @bitcoinwarrior1
    bitcoinwarrior1 committed Sep 8, 2020
    Configuration menu
    Copy the full SHA
    879faf0 View commit details
    Browse the repository at this point in the history

Commits on Sep 17, 2020

  1. Completed: 1. all attribute element under the token can have only one… 

    … attribute distinct with value true. 2. TokenScript that did not define <origins> under <token>, require at least one of the <attribute> has distinct.
    @darakhbharat
    darakhbharat committed Sep 17, 2020
    Configuration menu
    Copy the full SHA
    73020c6 View commit details
    Browse the repository at this point in the history

Commits on Sep 19, 2020

  1. Merge branch 'master' into distinct

    @darakhbharat
    darakhbharat committed Sep 19, 2020
    Configuration menu
    Copy the full SHA
    aae2315 View commit details
    Browse the repository at this point in the history

  2. formatting changes

    @darakhbharat
    darakhbharat committed Sep 19, 2020
    Configuration menu
    Copy the full SHA
    1faec47 View commit details
    Browse the repository at this point in the history

Commits on Oct 11, 2020

  1. XSLT is not needed for xml.xsd

    Weiwu Zhang committed Oct 11, 2020
    Configuration menu
    Copy the full SHA
    29cf1f6 View commit details
    Browse the repository at this point in the history

  2. Merge branch 'master' of github.com:AlphaWallet/TokenScript

    Weiwu Zhang committed Oct 11, 2020
    Configuration menu
    Copy the full SHA
    68d20ad View commit details
    Browse the repository at this point in the history

Commits on Oct 12, 2020

  1. update web3 data changed callback

    @bitcoinwarrior1
    bitcoinwarrior1 committed Oct 12, 2020
    Configuration menu
    Copy the full SHA
    40cab86 View commit details
    Browse the repository at this point in the history

  2. Merge pull request #394 from AlphaWallet/update-callback-to-token-data 

    update web3 data changed callback
    @bitcoinwarrior1
    bitcoinwarrior1 committed Oct 12, 2020
    Configuration menu
    Copy the full SHA
    656935f View commit details
    Browse the repository at this point in the history

Commits on Oct 20, 2020

  1. Merge pull request #388 from AlphaWallet/distinct 

    Distinct
    Weiwu Zhang committed Oct 20, 2020
    Configuration menu
    Copy the full SHA
    bc0020b View commit details
    Browse the repository at this point in the history

  2. providing a basic frame for using tokenscript on a web page

    Weiwu Zhang committed Oct 20, 2020
    Configuration menu
    Copy the full SHA
    1783424 View commit details
    Browse the repository at this point in the history

  3. adding notes on future extensibility

    Weiwu Zhang committed Oct 20, 2020
    Configuration menu
    Copy the full SHA
    62cd231 View commit details
    Browse the repository at this point in the history

  4. first version handed to Oleg

    Weiwu Zhang committed Oct 20, 2020
    Configuration menu
    Copy the full SHA
    91dfb67 View commit details
    Browse the repository at this point in the history

  5. new version with TokenNegotiation

    Weiwu Zhang committed Oct 20, 2020
    Configuration menu
    Copy the full SHA
    d768428 View commit details
    Browse the repository at this point in the history

  6. realised that doing .then() on the 2nd round of negotiation isn't nec… 

    …essary in this example thanks to prior event listener
    Weiwu Zhang committed Oct 20, 2020
    Configuration menu
    Copy the full SHA
    a8f6332 View commit details
    Browse the repository at this point in the history

  7. using meta correctly + using x.509 convention that objectClass be in … 

    …lowercase
    Weiwu Zhang committed Oct 20, 2020
    Configuration menu
    Copy the full SHA
    c6bfc94 View commit details
    Browse the repository at this point in the history

  8. added bootstrap.js to parse XML and updated entry-token.html(fixed er… 

    …rors, added comments, changed come logic)
    @oleggrib
    oleggrib authored and Weiwu Zhang committed Oct 20, 2020
    Configuration menu
    Copy the full SHA
    370970a View commit details
    Browse the repository at this point in the history

  9. sample JSON to be transformed from module

    Weiwu Zhang committed Oct 20, 2020
    Configuration menu
    Copy the full SHA
    bde9349 View commit details
    Browse the repository at this point in the history

  10. breaking down the negotiation into active/passive pair

    Weiwu Zhang committed Oct 20, 2020
    Configuration menu
    Copy the full SHA
    bc9b9d3 View commit details
    Browse the repository at this point in the history

  11. refactored bootstrap.js , created Negotiator global object to parse X… 

    …ML file and meta tags. if meta token defined then its auto create top-left bar with token view, in other way user have to click button to open pop-up box with list of tokens to activate.
    @oleggrib
    oleggrib authored and Weiwu Zhang committed Oct 20, 2020
    Configuration menu
    Copy the full SHA
    5a29fac View commit details
    Browse the repository at this point in the history

  12. James Brown provided a new contract address for Rinkby

    Weiwu Zhang committed Oct 20, 2020
    Configuration menu
    Copy the full SHA
    c50854b View commit details
    Browse the repository at this point in the history

  13. JB updated the contract address for token holder 0x0C770da98559DD6806… 

    …a6C7cbC77411cF7a9042Ae
    Weiwu Zhang committed Oct 20, 2020
    Configuration menu
    Copy the full SHA
    e180dc7 View commit details
    Browse the repository at this point in the history

  14. adding definition for balanceOf

    Weiwu Zhang committed Oct 20, 2020
    Configuration menu
    Copy the full SHA
    fee6705 View commit details
    Browse the repository at this point in the history

  15. most of methods moved to Negotiator. Negotiator do all work to prepar… 

    …e floating box, listeners, pop-up select, XML parsing. TokenScript class render iframe and inject helpers.
    @oleggrib
    oleggrib authored and Weiwu Zhang committed Oct 20, 2020
    Configuration menu
    Copy the full SHA
    767f8d2 View commit details
    Browse the repository at this point in the history

  16. updated token ID to use tokenID=... or ownerAddress=0x...

    @oleggrib
    oleggrib authored and Weiwu Zhang committed Oct 20, 2020
    Configuration menu
    Copy the full SHA
    edf49d1 View commit details
    Browse the repository at this point in the history

  17. adding an 2nd example with activity defined

    Weiwu Zhang committed Oct 20, 2020
    Configuration menu
    Copy the full SHA
    8c2bd3b View commit details
    Browse the repository at this point in the history

  18. added event parsing code with console output. to run code we have to … 

    …press button
    @oleggrib
    oleggrib authored and Weiwu Zhang committed Oct 20, 2020
    Configuration menu
    Copy the full SHA
    8ed17c8 View commit details
    Browse the repository at this point in the history

  19. fix : let -> var

    @oleggrib
    oleggrib authored and Weiwu Zhang committed Oct 20, 2020
    Configuration menu
    Copy the full SHA
    df5e09e View commit details
    Browse the repository at this point in the history

  20. added erc-20 activity cards pop-up

    @oleggrib
    oleggrib authored and Weiwu Zhang committed Oct 20, 2020
    Configuration menu
    Copy the full SHA
    658a9dc View commit details
    Browse the repository at this point in the history

  21. ready to be taken into master soon, renaming directories

    Weiwu Zhang committed Oct 20, 2020
    Configuration menu
    Copy the full SHA
    1ab95b0 View commit details
    Browse the repository at this point in the history

  22. changed message for connect/disconnect network and added button to Co… 

    …nnect to Metamask
    @oleggrib
    oleggrib authored and Weiwu Zhang committed Oct 20, 2020
    Configuration menu
    Copy the full SHA
    135a5d9 View commit details
    Browse the repository at this point in the history

  23. convert the error message to a table for better display

    Weiwu Zhang committed Oct 20, 2020
    Configuration menu
    Copy the full SHA
    6a628bd View commit details
    Browse the repository at this point in the history

  24. breaking things a bit by assuming passive negotiation and show the fi… 

    …lter expression.
    Weiwu Zhang committed Oct 20, 2020
    Configuration menu
    Copy the full SHA
    f640ed6 View commit details
    Browse the repository at this point in the history

  25. added upload/download XML and filters

    @oleggrib
    oleggrib authored and Weiwu Zhang committed Oct 20, 2020
    Configuration menu
    Copy the full SHA
    2e395bf View commit details
    Browse the repository at this point in the history

  26. fixed box title

    @oleggrib
    oleggrib authored and Weiwu Zhang committed Oct 20, 2020
    Configuration menu
    Copy the full SHA
    491fe4e View commit details
    Browse the repository at this point in the history

  27. added tests, some code moved to separate module, active negotiation p… 

    …op-up removed
    @oleggrib
    oleggrib authored and Weiwu Zhang committed Oct 20, 2020
    Configuration menu
    Copy the full SHA
    2a5ec76 View commit details
    Browse the repository at this point in the history

  28. every card use own iframe

    @oleggrib
    oleggrib authored and Weiwu Zhang committed Oct 20, 2020
    Configuration menu
    Copy the full SHA
    6fb6c7c View commit details
    Browse the repository at this point in the history

  29. added live event update, new event marker, erc20 token props list and… 

    … lot other improvements
    @oleggrib
    oleggrib authored and Weiwu Zhang committed Oct 20, 2020
    Configuration menu
    Copy the full SHA
    a70bc16 View commit details
    Browse the repository at this point in the history

Commits on Oct 22, 2020

  1. relaxing contract name rule to allow NCName instead of ID, as contrac… 

    …ts are referred by name, not by xml id
    Weiwu Zhang committed Oct 22, 2020
    Configuration menu
    Copy the full SHA
    e7b2887 View commit details
    Browse the repository at this point in the history

  2. Merge branch 'master' of github.com:AlphaWallet/TokenScript

    Weiwu Zhang committed Oct 22, 2020
    Configuration menu
    Copy the full SHA
    448410a View commit details
    Browse the repository at this point in the history

  3. rolling back part of the change in #388 

    as we couldn't get the validator to work with the new <assert> statement
documented here
#395
    Weiwu Zhang committed Oct 22, 2020
    Configuration menu
    Copy the full SHA
    d6e7dc1 View commit details
    Browse the repository at this point in the history

Commits on Oct 25, 2020

  1. token name is required thanks to the previous merge of Oleg's token n… 

    …egotiation
    Weiwu Zhang committed Oct 25, 2020
    Configuration menu
    Copy the full SHA
    e2a8c9a View commit details
    Browse the repository at this point in the history

Commits on Oct 26, 2020

  1. no longer using IDREF (replaced most with keyref) since many months a… 

    …go but found this left-over
    Weiwu Zhang committed Oct 26, 2020
    Configuration menu
    Copy the full SHA
    4855c96 View commit details
    Browse the repository at this point in the history

Commits on Oct 31, 2020

  1. allow contract reference & attribute refer to another

    Weiwu Zhang committed Oct 31, 2020
    Configuration menu
    Copy the full SHA
    0ea2c00 View commit details
    Browse the repository at this point in the history

Commits on Nov 2, 2020

  1. allowing accessing storage

    Weiwu Zhang committed Nov 2, 2020
    Configuration menu
    Copy the full SHA
    37c310e View commit details
    Browse the repository at this point in the history

Commits on Dec 24, 2020

  1. docs are generated from the document repository

    Weiwu Zhang committed Dec 24, 2020
    Configuration menu
    Copy the full SHA
    8054ba4 View commit details
    Browse the repository at this point in the history

  2. Set theme jekyll-theme-minimal

    Weiwu Zhang committed Dec 24, 2020
    Configuration menu
    Copy the full SHA
    2076527 View commit details
    Browse the repository at this point in the history

Commits on Jan 7, 2021

  1. Web example: devcon issuer

    @nicktaras
    nicktaras committed Jan 7, 2021
    Configuration menu
    Copy the full SHA
    09ed5c0 View commit details
    Browse the repository at this point in the history

  2. switched npm package polyfill for bigint to big-integer, updated Sign… 

    …edDevonTicket.jsto work with this polyfill library.
    @nicktaras
    nicktaras committed Jan 7, 2021
    Configuration menu
    Copy the full SHA
    fce6c9b View commit details
    Browse the repository at this point in the history

  3. Merge pull request #411 from TokenScript/web-examples 

    switched npm package polyfill for bigint to big-integer, updated Sign…
    @AW-STJ
    AW-STJ committed Jan 7, 2021
    Configuration menu
    Copy the full SHA
    c81f55f View commit details
    Browse the repository at this point in the history

Commits on Jan 9, 2021

  1. removed toString() from returned negociator data. The data is cast as… 

    … a string inside the react component instead.
    @nicktaras
    nicktaras committed Jan 9, 2021
    Configuration menu
    Copy the full SHA
    865fb6b View commit details
    Browse the repository at this point in the history

  2. removed a local code example to help debug where the unit tests were … 

    …failing.
    @nicktaras
    nicktaras committed Jan 9, 2021
    Configuration menu
    Copy the full SHA
    e8d7d25 View commit details
    Browse the repository at this point in the history