Skip to content
This repository has been archived by the owner on Oct 4, 2024. It is now read-only.

Merge staging changes into master #131

Merged
merged 39 commits into from
Sep 4, 2019
Merged

Merge staging changes into master #131

merged 39 commits into from
Sep 4, 2019

Commits on Jul 29, 2019

  1. fixed up example project

    Willem Wyndham committed Jul 29, 2019
    Configuration menu
    Copy the full SHA
    fba2e12 View commit details
    Browse the repository at this point in the history

Commits on Aug 1, 2019

  1. Updated blank project

    Willem Wyndham committed Aug 1, 2019
    Configuration menu
    Copy the full SHA
    afc219d View commit details
    Browse the repository at this point in the history

Commits on Aug 3, 2019

  1. Merge remote-tracking branch 'origin/master' into instructions

    @willemneal
    willemneal committed Aug 3, 2019
    Configuration menu
    Copy the full SHA
    3f5db0c View commit details
    Browse the repository at this point in the history

Commits on Aug 5, 2019

  1. small edit

    @willemneal
    willemneal committed Aug 5, 2019
    Configuration menu
    Copy the full SHA
    df0c3ff View commit details
    Browse the repository at this point in the history

Commits on Aug 9, 2019

  1. Updated gulp files

    Willem Wyndham committed Aug 9, 2019
    Configuration menu
    Copy the full SHA
    e5608a5 View commit details
    Browse the repository at this point in the history

  2. Updated to use new asc

    @willemneal
    willemneal committed Aug 9, 2019
    Configuration menu
    Copy the full SHA
    9172fe5 View commit details
    Browse the repository at this point in the history

Commits on Aug 13, 2019

  1. Update to use webpackaged asc

    @willemneal
    willemneal committed Aug 13, 2019
    Configuration menu
    Copy the full SHA
    2272843 View commit details
    Browse the repository at this point in the history

Commits on Aug 15, 2019

  1. Merge branch 'instructions' of https://github.com/willemneal/near-shell… 

    … into staging
    @janedegtiareva
    janedegtiareva committed Aug 15, 2019
    Configuration menu
    Copy the full SHA
    be8cf49 View commit details
    Browse the repository at this point in the history

Commits on Aug 16, 2019

  1. Update dependencies to staging branches

    @janedegtiareva
    janedegtiareva committed Aug 16, 2019
    Configuration menu
    Copy the full SHA
    bc51d45 View commit details
    Browse the repository at this point in the history

  2. Update blank project to depend on staging branches

    @janedegtiareva
    janedegtiareva committed Aug 16, 2019
    Configuration menu
    Copy the full SHA
    a3e8fe2 View commit details
    Browse the repository at this point in the history

  3. Fix typo in blank project in package.json

    @janedegtiareva
    janedegtiareva committed Aug 16, 2019
    Configuration menu
    Copy the full SHA
    c8548f8 View commit details
    Browse the repository at this point in the history

  4. Readd runtime-ts to dependencies for blank project

    @janedegtiareva
    janedegtiareva committed Aug 16, 2019
    Configuration menu
    Copy the full SHA
    afaa383 View commit details
    Browse the repository at this point in the history

  5. Update to staging branch for assemblyscript

    @janedegtiareva
    janedegtiareva committed Aug 16, 2019
    Configuration menu
    Copy the full SHA
    66c14b4 View commit details
    Browse the repository at this point in the history

  6. Remove package-lock

    @janedegtiareva
    janedegtiareva committed Aug 16, 2019
    Configuration menu
    Copy the full SHA
    e31ec1b View commit details
    Browse the repository at this point in the history

Commits on Aug 24, 2019

  1. Use nearlib#staging

    @vgrichina
    vgrichina committed Aug 24, 2019
    Configuration menu
    Copy the full SHA
    fdd351a View commit details
    Browse the repository at this point in the history

  2. Add .gitattributes to exclude generated files from default diff

    @vgrichina
    vgrichina committed Aug 24, 2019
    Configuration menu
    Copy the full SHA
    970491a View commit details
    Browse the repository at this point in the history

  3. Revert "Update to use webpackaged asc" 

    This reverts commit 2272843.
    @vgrichina
    vgrichina committed Aug 24, 2019
    Configuration menu
    Copy the full SHA
    0b1638a View commit details
    Browse the repository at this point in the history

  4. Remove package-lock.json (should use yarn.lock)

    @vgrichina
    vgrichina committed Aug 24, 2019
    Configuration menu
    Copy the full SHA
    9857bbe View commit details
    Browse the repository at this point in the history

  5. Version 0.10.0-preview

    @vgrichina
    vgrichina committed Aug 24, 2019
    Configuration menu
    Copy the full SHA
    4bef32c View commit details
    Browse the repository at this point in the history

Commits on Aug 27, 2019

  1. Update ci node url for the staging version

    @janedegtiareva
    janedegtiareva committed Aug 27, 2019
    Configuration menu
    Copy the full SHA
    7e85fb0 View commit details
    Browse the repository at this point in the history

  2. Update main.ts in blank project so that it compiles with latest runtime

    @janedegtiareva
    janedegtiareva committed Aug 27, 2019
    Configuration menu
    Copy the full SHA
    a0acd67 View commit details
    Browse the repository at this point in the history

  3. Update assembly script dependency to staging, also clean up runtime-t… 

    …s deps

.. so that it's only in 1 place.
    @janedegtiareva
    janedegtiareva committed Aug 27, 2019
    Configuration menu
    Copy the full SHA
    9057f3d View commit details
    Browse the repository at this point in the history

  4. attempt to fix build: remove package lock

    @janedegtiareva
    janedegtiareva committed Aug 27, 2019
    Configuration menu
    Copy the full SHA
    32ed58b View commit details
    Browse the repository at this point in the history

Commits on Aug 28, 2019

  1. Remove yarn.lock

    @janedegtiareva
    janedegtiareva committed Aug 28, 2019
    Configuration menu
    Copy the full SHA
    6122cb6 View commit details
    Browse the repository at this point in the history

  2. Fix deployContract to use non-deprecated API

    @vgrichina
    vgrichina committed Aug 28, 2019
    Configuration menu
    Copy the full SHA
    8169258 View commit details
    Browse the repository at this point in the history

  3. Add staging to environments list in config

    @janedegtiareva
    janedegtiareva committed Aug 28, 2019
    Configuration menu
    Copy the full SHA
    fcc8d35 View commit details
    Browse the repository at this point in the history

  4. Merge pull request #119 from nearprotocol/update-urls-for-staging 

    Add staging to environments list in config
    @vgrichina
    vgrichina authored Aug 28, 2019
    Configuration menu
    Copy the full SHA
    534a088 View commit details
    Browse the repository at this point in the history

  5. Use ci-staging for staging branch

    @janedegtiareva
    janedegtiareva committed Aug 28, 2019
    Configuration menu
    Copy the full SHA
    356a8f8 View commit details
    Browse the repository at this point in the history

  6. Add keys for staging ci env

    @janedegtiareva
    janedegtiareva committed Aug 28, 2019
    Configuration menu
    Copy the full SHA
    f2730b4 View commit details
    Browse the repository at this point in the history

Commits on Aug 29, 2019

  1. Merge pull request #120 from nearprotocol/keys-for-staging-ci 

    Add keys for staging ci env
    @vgrichina
    vgrichina authored Aug 29, 2019
    Configuration menu
    Copy the full SHA
    6184a0f View commit details
    Browse the repository at this point in the history

Commits on Aug 30, 2019

  1. added mkdirp to gulp utils 

    - write file now creates directories that don't exist in the path of a new file.
    Willem Wyndham committed Aug 30, 2019
    Configuration menu
    Copy the full SHA
    806d5a6 View commit details
    Browse the repository at this point in the history

  2. Fix shell login (update code that checks if key got added to use new … 

    …format of rpc)
    @janedegtiareva
    janedegtiareva committed Aug 30, 2019
    Configuration menu
    Copy the full SHA
    47a130d View commit details
    Browse the repository at this point in the history

  3. Merge pull request #124 from nearprotocol/fix-login-key 

    Fix shell login (update code that checks if key got added to use new format
    @janedegtiareva
    janedegtiareva authored Aug 30, 2019
    Configuration menu
    Copy the full SHA
    27f8d55 View commit details
    Browse the repository at this point in the history

  4. Merge pull request #122 from willemneal/mkdirp 

    added mkdirp to gulp utils
    @janedegtiareva
    janedegtiareva authored Aug 30, 2019
    Configuration menu
    Copy the full SHA
    e547fb7 View commit details
    Browse the repository at this point in the history

Commits on Sep 3, 2019

  1. Merge branch 'staging' into staging-merge

    @janedegtiareva
    janedegtiareva committed Sep 3, 2019
    Configuration menu
    Copy the full SHA
    ba0f810 View commit details
    Browse the repository at this point in the history

  2. Remove #staging from package.json dependencies

    @janedegtiareva
    janedegtiareva committed Sep 3, 2019
    Configuration menu
    Copy the full SHA
    98c953d View commit details
    Browse the repository at this point in the history

  3. v0.10.0

    @janedegtiareva
    janedegtiareva committed Sep 3, 2019
    Configuration menu
    Copy the full SHA
    4671ed2 View commit details
    Browse the repository at this point in the history

  4. Update package.json dependencies

    @janedegtiareva
    janedegtiareva committed Sep 3, 2019
    Configuration menu
    Copy the full SHA
    923a2be View commit details
    Browse the repository at this point in the history

  5. Use nearlib 0.13.0

    @janedegtiareva
    janedegtiareva committed Sep 3, 2019
    Configuration menu
    Copy the full SHA
    2c93ce0 View commit details
    Browse the repository at this point in the history