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.

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

chore: merge develop into main #75

Merged
merged 154 commits into from
Apr 29, 2024
Merged

chore: merge develop into main #75

merged 154 commits into from
Apr 29, 2024

Conversation

heueristik
Copy link
Contributor

@heueristik heueristik commented Apr 18, 2024

Description

Task ID: OS-1195

Checklist:

  • I have selected the correct base branch.
  • I have performed a self-review of my own code.
  • I have commented my code, particularly in hard-to-understand areas.
  • I have made corresponding changes to the documentation.
  • My changes generate no new warnings.
  • Any dependent changes have been merged and published in downstream modules.
  • I created tasks to update dependent repositories (OSx, Plugins)
  • I ran all tests with success and extended them if necessary.
  • I have updated the CHANGELOG.md file in the root folder.

Rekard0 and others added 30 commits July 20, 2023 16:07
…graph-package

OS-600 : setup osx commons with subgraph package
* add subgraph tests

* Update subgraph/subgraph.yaml

Co-authored-by: Rekard0 <[email protected]>

* Update subgraph/schema.graphql

Co-authored-by: Rekard0 <[email protected]>

---------

Co-authored-by: Rekard0 <[email protected]>
…Setup-ids

F/ OS-588 Sbstract plugin repo  & plugin setup ids
…o-readmes

chore/ OS-704 Add security contact to the readme(s)
jordaniza and others added 21 commits March 26, 2024 20:59
feat: update generateActionEntityId to include all of data on caller, dao, callId and actionIndex
…-PR-changes

feat: define the develop and main branch to run the actions on commit…
* remove: SDK 1.0 unused folders, functions and constants

* update: changelog
* chore: folder restructure

* chore: delete examples from sdk 1.0

* fix: prettier

* fix: broken dependency

* fix: broken dependency

* fix: update yarn.lock

* fix: tests missing dependency

* fix: apply code structure suggestions

* fix: remove regex.ts

* fix: pr comments

* update: package.json version
* chore: bump OZ

* doc: add item to checklist

* docs: maintained changelog

* chore: bump package version
* add: getProtocolVersion function

* fix: prettier

* fix: linting

* Update sdk/src/introspection.ts

Co-authored-by: Carles <[email protected]>

* Update sdk/src/introspection.ts

Co-authored-by: Michael Heuer <[email protected]>

* Update sdk/test/unit/introspection.test.ts

Co-authored-by: Michael Heuer <[email protected]>

* remove: constant ADDRESS_ONE

* fix: prettier

* update: changelog and package version

* fix: export of addres one

* fix: update getProtocolVersion return comment

* chore: add ADDRESS_ONE to constants

---------

Co-authored-by: Carles <[email protected]>
Co-authored-by: Michael Heuer <[email protected]>
* add: getProtocolVersion function

* fix: prettier

* fix: linting

* Update sdk/src/introspection.ts

Co-authored-by: Carles <[email protected]>

* Update sdk/src/introspection.ts

Co-authored-by: Michael Heuer <[email protected]>

* Update sdk/test/unit/introspection.test.ts

Co-authored-by: Michael Heuer <[email protected]>

* remove: constant ADDRESS_ONE

* fix: prettier

* fix: export of addres one

* fix: update getProtocolVersion return comment

* chore: add ADDRESS_ONE to constants

* feat: add getProtocolVersion

* update pacakge.json

---------

Co-authored-by: Carles <[email protected]>
Co-authored-by: Michael Heuer <[email protected]>
* feat: add back plugin type enum

* chore: bump version and maintain changelog

* chore: update lockfile
* chore: adapt authors

* fix: merge conflict artifact
@heueristik heueristik marked this pull request as ready for review April 23, 2024 14:49
@heueristik
Copy link
Contributor Author

We will wait for #80 to be merged

* docs: added and improved READMEs

* docs: improved README.md

* style: code snipped formatting

* docs: improved title

* Update README.md

Co-authored-by: Claudia Barcelo <[email protected]>

---------

Co-authored-by: Claudia Barcelo <[email protected]>
@heueristik
Copy link
Contributor Author

One commit was not signed, so we skip branch protection rules now and still merge it (after having two approvals).

@heueristik heueristik merged commit 7df1629 into main Apr 29, 2024
18 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

6 participants