QPQ-AG/sophia
10
0
Fork 0
Code Issues 41 Pull Requests 5 Actions Packages Projects Releases 16 Wiki Activity

Merge lima – 4.3.0 #747

Merged
zxq9 merged 15 commits from github/fork/radrow/master into master 2020-04-30 20:52:52 +09:00
Conversation 11 Commits 15 Files Changed 35 +3858 -140
zxq9 commented 2020-04-02 22:33:38 +09:00 (Migrated from gitlab.com)
Copy Link

Created by: radrow

*Created by: radrow*
zxq9 commented 2020-04-09 04:45:39 +09:00 (Migrated from gitlab.com)
Copy Link

Created by: hanssv

There is a bit of documentation missing I think... The documentation has moved from protocol to aesophia. Just merging like this would leave the documentation in an inconsistent state.

*Created by: hanssv* There is a bit of documentation missing I think... The documentation has moved from protocol to aesophia. Just merging like this would leave the documentation in an inconsistent state.
zxq9 commented 2020-04-09 19:21:30 +09:00 (Migrated from gitlab.com)
Copy Link

Created by: radrow

I considered writing a documentation a separate step from this merge. Or else I can merge it into yet another branch, fix documentation there and then put it on master. I am not sure which approach is the most SOTA

*Created by: radrow* I considered writing a documentation a separate step from this merge. Or else I can merge it into yet another branch, fix documentation there and then put it on master. I am not sure which approach is the most SOTA
zxq9 commented 2020-04-14 17:01:42 +09:00 (Migrated from gitlab.com)
Copy Link

Created by: tolbrino

There is a bit of documentation missing I think... The documentation has moved from protocol to aesophia. Just merging like this would leave the documentation in an inconsistent state.

So the documentation changes from master would have to be merged to lima first, and then this step here can happen?

*Created by: tolbrino* > There is a bit of documentation missing I think... The documentation has moved from protocol to aesophia. Just merging like this would leave the documentation in an inconsistent state. So the documentation changes from master would have to be merged to lima first, and then this step here can happen?
zxq9 commented 2020-04-14 20:03:29 +09:00 (Migrated from gitlab.com)
Copy Link

Created by: radrow

No, the master contains undocumented changes that are not included in lima and therefore not in the lima's documentation. What is needed to be done, is to write the documentation for master on master.

*Created by: radrow* No, the master contains undocumented changes that are not included in lima and therefore not in the lima's documentation. What is needed to be done, is to write the documentation for master on master.
zxq9 commented 2020-04-16 19:02:05 +09:00 (Migrated from gitlab.com)
Copy Link

Created by: hanssv

Nothing is undocumented, but the documentation is written in the iris branch of the protocol-repo. It should be moved to aesophia, preferably in connection to this merge.

*Created by: hanssv* Nothing is undocumented, but the documentation is written in the iris branch of the protocol-repo. It should be moved to aesophia, preferably in connection to this merge.
zxq9 commented 2020-04-29 22:35:51 +09:00 (Migrated from gitlab.com)
Copy Link

Created by: radrow

The docs have been updated

*Created by: radrow* The docs have been updated
zxq9 commented 2020-04-30 00:29:20 +09:00 (Migrated from gitlab.com)
Copy Link

Created by: hanssv

Review: Changes requested

Looks promising, I still miss the part about AENS that was in protocol/contracts/sophia_explained.md on the Iris branch?

*Created by: hanssv* **Review:** Changes requested Looks promising, I still miss the part about AENS that was in `protocol/contracts/sophia_explained.md` on the Iris branch?
zxq9 commented 2020-04-30 07:04:11 +09:00 (Migrated from gitlab.com)
Copy Link

Created by: radrow

Okay, added AENS. Also, readded delegation signature minichapter

*Created by: radrow* Okay, added AENS. Also, readded delegation signature minichapter
zxq9 commented 2020-04-30 07:09:32 +09:00 (Migrated from gitlab.com)
Copy Link

Created by: hanssv

Review: Approved

Looks good to me!

*Created by: hanssv* **Review:** Approved Looks good to me!
zxq9 commented 2020-04-30 14:02:39 +09:00 (Migrated from gitlab.com)
Copy Link

Created by: UlfNorell

Review: Approved

*Created by: UlfNorell* **Review:** Approved
zxq9 commented 2020-04-30 20:52:52 +09:00 (Migrated from gitlab.com)
Copy Link

Merged by: radrow at 2020-04-30 11:52:52 UTC

*Merged by: radrow at 2020-04-30 11:52:52 UTC*
Sign in to join this conversation.
Reviewers
No Reviewers
Labels
Clear labels
WIP
bug
consensus-breaking
dependencies
documentation
duplicate
effort: high
effort: low
effort: medium
effort: trivial
enhancement
good first issue
help wanted
invalid
maintenance
question
task/feature
todo-in-rewrite
wontfix
bug
Something is not working
duplicate
This issue or pull request already exists
enhancement
New feature
help wanted
Need some help
invalid
Something is wrong
pig lipstick
Muggle-facing enhancements
question
More information is needed
wontfix
This won't be fixed
No Label
maintenance
Milestone
No items
No Milestone
Projects
Clear projects
No project
Assignees
Clear assignees
No Assignees
1 Participants
Notifications
Due Date
No due date set.
Dependencies

No dependencies set.

Reference: QPQ-AG/sophia#747
No description provided.
Delete Branch "github/fork/radrow/master"

Deleting a branch is permanent. Although the deleted branch may continue to exist for a short time before it actually gets removed, it CANNOT be undone in most cases. Continue?