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

Develop to Master #3081

Merged
merged 27 commits into from
May 12, 2023
Merged

Develop to Master #3081

merged 27 commits into from
May 12, 2023

Commits on Oct 12, 2022

  1. Fix/gRPC drop stream bugfix (#2749) 

    Signed-off-by: iceseer <iceseer@gmail.com>
    @iceseer
    iceseer committed Oct 12, 2022
    Configuration menu
    Copy the full SHA
    fdb8e79 View commit details
    Browse the repository at this point in the history

Commits on Oct 20, 2022

  1. Allow configuring max past time of transaction created_time (#1776) 

    Signed-off-by: G.Bazior <bazior@agh.edu.pl>
    @baziorek
    baziorek committed Oct 20, 2022
    Configuration menu
    Copy the full SHA
    b8ddc67 View commit details
    Browse the repository at this point in the history

Commits on Oct 21, 2022

  1. Follow-up: 1776: changed variable type from time_t to moderm c++ std:… 

    …:chrono::duration

Signed-off-by: Grzegorz Bazior <bazior@agh.edu.pl>
    @baziorek @appetrosyan
    baziorek authored and appetrosyan committed Oct 21, 2022
    Configuration menu
    Copy the full SHA
    686053d View commit details
    Browse the repository at this point in the history

Commits on Oct 24, 2022

  1. Repaired building iroha according to instruction: Added patch file to… 

    … repair building of abseil library: std::max ambiguous call (#2902)

Signed-off-by: Grzegorz Bazior <bazior@agh.edu.pl>

Signed-off-by: Grzegorz Bazior <bazior@agh.edu.pl>
    @baziorek
    baziorek committed Oct 24, 2022
    Configuration menu
    Copy the full SHA
    925163c View commit details
    Browse the repository at this point in the history

  2. Add Iroha select label and restore temporary changes (#2903) 

    * Add Iroha select label

Signed-off-by: safinsaf <safinsaft@gmail.com>

* Fix stray space comments from review

Signed-off-by: safinsaf <safinsaft@gmail.com>

* Fix called jobs for git merge-commit in workflow

Signed-off-by: safinsaf <safinsaft@gmail.com>

Signed-off-by: safinsaf <safinsaft@gmail.com>
    @safinsaf
    safinsaf committed Oct 24, 2022
    Configuration menu
    Copy the full SHA
    1e90d5f View commit details
    Browse the repository at this point in the history

Commits on Oct 25, 2022

  1. Repaired building iroha according to instruction: Added patch file to… 

    … repair building of benchmark library: std::numeric_limits requires <limits> header

Signed-off-by: Grzegorz Bazior <bazior@agh.edu.pl>
    @baziorek @appetrosyan
    baziorek authored and appetrosyan committed Oct 25, 2022
    Configuration menu
    Copy the full SHA
    6fc436a View commit details
    Browse the repository at this point in the history

  2. Added not empty author of the commit in last patch file 

    Signed-off-by: Grzegorz Bazior <bazior@agh.edu.pl>
    @baziorek @appetrosyan
    baziorek authored and appetrosyan committed Oct 25, 2022
    Configuration menu
    Copy the full SHA
    d5d7551 View commit details
    Browse the repository at this point in the history

Commits on Oct 26, 2022

  1. Remove cache from main workflow 

    Signed-off-by: safinsaf <safinsaft@gmail.com>
    @safinsaf @appetrosyan
    safinsaf authored and appetrosyan committed Oct 26, 2022
    Configuration menu
    Copy the full SHA
    cef5e4d View commit details
    Browse the repository at this point in the history

  2. [iroha-lib] Implement iroha library as a separate module. 

    Signed-off-by: Andrzej <dekoderer@gmail.com>
    @andprogrammer @appetrosyan
    andprogrammer authored and appetrosyan committed Oct 26, 2022
    Configuration menu
    Copy the full SHA
    fc4a140 View commit details
    Browse the repository at this point in the history

Commits on Nov 15, 2022

  1. [iroha-lib] Added more descriptive Readme file. 

    Signed-off-by: Andrzej <dekoderer@gmail.com>
    @andprogrammer @appetrosyan
    andprogrammer authored and appetrosyan committed Nov 15, 2022
    Configuration menu
    Copy the full SHA
    d93228d View commit details
    Browse the repository at this point in the history

Commits on Nov 16, 2022

  1. Added missing dependence to requirements.txt file 

    Added description for rpi

Signed-off-by: Grzegorz Bazior <bazior@agh.edu.pl>
    @baziorek @appetrosyan
    baziorek authored and appetrosyan committed Nov 16, 2022
    Configuration menu
    Copy the full SHA
    e0025d5 View commit details
    Browse the repository at this point in the history

  2. Update docs/source/build/index.rst 

    Apply suggestion

Co-authored-by: Aleksandr Petrosyan <a-p-petrosyan@yandex.ru>
Signed-off-by: G. Bazior <gbaz@o2.pl>
    @baziorek @appetrosyan
    baziorek and appetrosyan committed Nov 16, 2022
    Configuration menu
    Copy the full SHA
    8858ba2 View commit details
    Browse the repository at this point in the history

  3. Update index.rst 

    Corrected typo

Signed-off-by: G. Bazior <bazior@agh.edu.pl>
    @baziorek @appetrosyan
    baziorek authored and appetrosyan committed Nov 16, 2022
    Configuration menu
    Copy the full SHA
    3affec2 View commit details
    Browse the repository at this point in the history

Commits on Jan 25, 2023

  1. Merge branch 'main' into develop

    @safinsaf
    safinsaf committed Jan 25, 2023
    Configuration menu
    Copy the full SHA
    77fafcc View commit details
    Browse the repository at this point in the history

Commits on Mar 19, 2023

  1. Fix in iroha-cpp library + added example 

    Signed-off-by: Grzegorz Bazior <g.bazior@yodiss.pl>
    @appetrosyan
    Grzegorz Bazior authored and appetrosyan committed Mar 19, 2023
    Configuration menu
    Copy the full SHA
    2257628 View commit details
    Browse the repository at this point in the history

  2. Update iroha-lib/examples/DomainAssetCreation.cpp 

    Co-authored-by: Aleksandr Petrosyan <a-p-petrosyan@yandex.ru>
Signed-off-by: G. Bazior <gbaz@o2.pl>
Signed-off-by: Grzegorz Bazior <g.bazior@yodiss.pl>
    @baziorek @appetrosyan
    baziorek and appetrosyan committed Mar 19, 2023
    Configuration menu
    Copy the full SHA
    fac89d4 View commit details
    Browse the repository at this point in the history

  3. Updates after review 

    Signed-off-by: Grzegorz Bazior <g.bazior@yodiss.pl>
    @appetrosyan
    Grzegorz Bazior authored and appetrosyan committed Mar 19, 2023
    Configuration menu
    Copy the full SHA
    9b84f5d View commit details
    Browse the repository at this point in the history

  4. Updates after review v2 

    Signed-off-by: Grzegorz Bazior <g.bazior@yodiss.pl>
    @appetrosyan
    Grzegorz Bazior authored and appetrosyan committed Mar 19, 2023
    Configuration menu
    Copy the full SHA
    a791070 View commit details
    Browse the repository at this point in the history

  5. Updates after review v3 

    Signed-off-by: Grzegorz Bazior <g.bazior@yodiss.pl>
    @appetrosyan
    Grzegorz Bazior authored and appetrosyan committed Mar 19, 2023
    Configuration menu
    Copy the full SHA
    fd0d5dd View commit details
    Browse the repository at this point in the history

Commits on Mar 23, 2023

  1. Merge branch 'main' into develop 

    Signed-off-by: Aleksandr Petrosyan <a-p-petrosyan@yandex.ru>
    @appetrosyan
    appetrosyan committed Mar 23, 2023
    Configuration menu
    Copy the full SHA
    714b4f2 View commit details
    Browse the repository at this point in the history

Commits on Mar 30, 2023

  1. Update vcpkg from last release 

    Signed-off-by: safinsaf <safinsaft@gmail.com>
    @safinsaf @appetrosyan
    safinsaf authored and appetrosyan committed Mar 30, 2023
    Configuration menu
    Copy the full SHA
    fdc2c1e View commit details
    Browse the repository at this point in the history

  2. Enable mac build in PR 

    Signed-off-by: safinsaf <safinsaft@gmail.com>
    @safinsaf @appetrosyan
    safinsaf authored and appetrosyan committed Mar 30, 2023
    Configuration menu
    Copy the full SHA
    829357f View commit details
    Browse the repository at this point in the history

  3. Fix sources 

    Signed-off-by: safinsaf <safinsaft@gmail.com>
    @safinsaf @appetrosyan
    safinsaf authored and appetrosyan committed Mar 30, 2023
    Configuration menu
    Copy the full SHA
    82b7e70 View commit details
    Browse the repository at this point in the history

Commits on Apr 13, 2023

  1. 1. Added path to fix building benchmark library on MacOS 

    2. Removed incorrect patches to vcpkg libraries after VCPKG version bump
3. Fixed building for irohad and iroha-cli after after VCPKG version bump (and 3rd part libraries version bump)

Signed-off-by: Grzegorz Bazior <g.bazior@yodiss.pl>
    @appetrosyan
    Grzegorz Bazior authored and appetrosyan committed Apr 13, 2023
    Configuration menu
    Copy the full SHA
    3b40f22 View commit details
    Browse the repository at this point in the history

  2. Add autoconf dep 

    Signed-off-by: safinsaf <safinsaft@gmail.com>
    @safinsaf @appetrosyan
    safinsaf authored and appetrosyan committed Apr 13, 2023
    Configuration menu
    Copy the full SHA
    63f8688 View commit details
    Browse the repository at this point in the history

Commits on Apr 14, 2023

  1. Corrections in MR: #3081 (develop -> master) 

    Signed-off-by: Grzegorz Bazior <bazior@agh.edu.pl>
Signed-off-by: Grzegorz Bazior <g.bazior@yodiss.pl>
    @appetrosyan
    Grzegorz Bazior authored and appetrosyan committed Apr 14, 2023
    Configuration menu
    Copy the full SHA
    fef6a34 View commit details
    Browse the repository at this point in the history

Commits on May 12, 2023

  1. Merge branch 'main' into develop

    @appetrosyan
    appetrosyan committed May 12, 2023
    Configuration menu
    Copy the full SHA
    5d913a2 View commit details
    Browse the repository at this point in the history