Dev to main #19
Merged
Dev to main #19
+51
−6
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign in
to join this conversation on GitHub.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Brings the design mockups from
devintomainfor the first delivery.#18 (closes #17) was merged into
devwithout review, so please review those changes here.What's included
docs/design/docs/design/README.md, which explains that the mockups are only a visual impression of the idea, and that colours, style and example data are placeholdersdocs/USER_INTERFACE.md--
Note on the workflow: From now on, all work goes into
devfirst, anddevis merged intomainbefore each delivery. This keepsmainas the delivered version and lets us review each delivery as a whole. #18 (closes #17) was merged intodevwithout review becausedevisn't in use yet apart from the data branch, so nobody else was affected. Please review those changes here instead. Going forward,devwill have the same review rules asmain.