Skip to content
This repository has been archived by the owner on Feb 3, 2023. It is now read-only.

Rename container to conductor #942

Merged
merged 25 commits into from
Feb 5, 2019
Merged

Rename container to conductor #942

merged 25 commits into from
Feb 5, 2019

Commits on Feb 1, 2019

  1. rename container to conductor

    @zippy
    zippy committed Feb 1, 2019
    Configuration menu
    Copy the full SHA
    653b1a4 View commit details
    Browse the repository at this point in the history

  2. container file in docs to conductor

    @zippy
    zippy committed Feb 1, 2019
    Configuration menu
    Copy the full SHA
    fd5fce4 View commit details
    Browse the repository at this point in the history

  3. Merge branch 'develop' into containter-to-conductor

    @zippy
    zippy authored Feb 1, 2019
    Configuration menu
    Copy the full SHA
    5fd3bfe View commit details
    Browse the repository at this point in the history

  4. update circle ci yaml for conductor

    @zippy
    zippy committed Feb 1, 2019
    Configuration menu
    Copy the full SHA
    da44f6d View commit details
    Browse the repository at this point in the history

  5. missed a file rename

    @zippy
    zippy committed Feb 1, 2019
    Configuration menu
    Copy the full SHA
    ef9c4f4 View commit details
    Browse the repository at this point in the history

  6. fmt

    @zippy
    zippy committed Feb 1, 2019
    Configuration menu
    Copy the full SHA
    33c1e3c View commit details
    Browse the repository at this point in the history

  7. missed file rename

    @zippy
    zippy committed Feb 1, 2019
    Configuration menu
    Copy the full SHA
    9d7d08c View commit details
    Browse the repository at this point in the history

  8. merge develop into containter-to-conductor

    @zippy
    zippy committed Feb 1, 2019
    Configuration menu
    Copy the full SHA
    aaf75f5 View commit details
    Browse the repository at this point in the history

Commits on Feb 2, 2019

  1. renames in .travis

    @zippy
    zippy committed Feb 2, 2019
    Configuration menu
    Copy the full SHA
    3a66c6a View commit details
    Browse the repository at this point in the history

Commits on Feb 3, 2019

  1. merge develop into containter-to-conductor

    @zippy
    zippy committed Feb 3, 2019
    Configuration menu
    Copy the full SHA
    224bf2b View commit details
    Browse the repository at this point in the history

  2. Update README.md 

    Co-Authored-By: zippy <eric@harris-braun.com>
    @maackle @zippy
    maackle and zippy authored Feb 3, 2019
    Configuration menu
    Copy the full SHA
    780cb13 View commit details
    Browse the repository at this point in the history

  3. Update README.md 

    Co-Authored-By: zippy <eric@harris-braun.com>
    @maackle @zippy
    maackle and zippy authored Feb 3, 2019
    Configuration menu
    Copy the full SHA
    ee91c7d View commit details
    Browse the repository at this point in the history

  4. Update README.md 

    Co-Authored-By: zippy <eric@harris-braun.com>
    @maackle @zippy
    maackle and zippy authored Feb 3, 2019
    Configuration menu
    Copy the full SHA
    cf35fae View commit details
    Browse the repository at this point in the history

  5. deprecate adr15

    @zippy
    zippy committed Feb 3, 2019
    Configuration menu
    Copy the full SHA
    eee2e81 View commit details
    Browse the repository at this point in the history

Commits on Feb 4, 2019

  1. Merge branch 'develop' into containter-to-conductor

    @zippy
    zippy committed Feb 4, 2019
    Configuration menu
    Copy the full SHA
    a342ad3 View commit details
    Browse the repository at this point in the history

  2. Merge branch 'develop' into containter-to-conductor

    @zippy
    zippy committed Feb 4, 2019
    Configuration menu
    Copy the full SHA
    7212c45 View commit details
    Browse the repository at this point in the history

  3. Merge branch 'develop' into containter-to-conductor

    @Connoropolous
    Connoropolous committed Feb 4, 2019
    Configuration menu
    Copy the full SHA
    5a1fb31 View commit details
    Browse the repository at this point in the history

  4. Update CHANGELOG.md

    @Connoropolous
    Connoropolous authored Feb 4, 2019
    Configuration menu
    Copy the full SHA
    607a361 View commit details
    Browse the repository at this point in the history

  5. fmt

    @Connoropolous
    Connoropolous committed Feb 4, 2019
    Configuration menu
    Copy the full SHA
    bb49570 View commit details
    Browse the repository at this point in the history

  6. Merge branch 'containter-to-conductor' of https://github.com/holochai… 

    …n/holochain-rust into containter-to-conductor
    @Connoropolous
    Connoropolous committed Feb 4, 2019
    Configuration menu
    Copy the full SHA
    c7d31a4 View commit details
    Browse the repository at this point in the history

  7. [skip travis] fix path to conductor config

    Connor Turland authored Feb 4, 2019
    Configuration menu
    Copy the full SHA
    f3bf89d View commit details
    Browse the repository at this point in the history

Commits on Feb 5, 2019

  1. fixups

    @Connoropolous
    Connoropolous committed Feb 5, 2019
    Configuration menu
    Copy the full SHA
    af42ebc View commit details
    Browse the repository at this point in the history

  2. Merge branch 'containter-to-conductor' of https://github.com/holochai… 

    …n/holochain-rust into containter-to-conductor
    @Connoropolous
    Connoropolous committed Feb 5, 2019
    Configuration menu
    Copy the full SHA
    b21e3f6 View commit details
    Browse the repository at this point in the history

  3. messed up imports during merge

    @Connoropolous
    Connoropolous committed Feb 5, 2019
    Configuration menu
    Copy the full SHA
    0c813a8 View commit details
    Browse the repository at this point in the history

  4. [skip travis] [ci skip] correct paths

    @Connoropolous
    Connoropolous committed Feb 5, 2019
    Configuration menu
    Copy the full SHA
    cc332f4 View commit details
    Browse the repository at this point in the history