From 053fe1e18759f0017d278b20ab26de3d0ab732a6 Mon Sep 17 00:00:00 2001 From: Adam Brown Date: Fri, 14 Jan 2022 11:21:56 +0000 Subject: [PATCH 1/5] adding .dev towncrier category to the release notes - the aim is to link merged PRs to WIP features so that every change is traceable to every release --- CONTRIBUTING.md | 1 + towncrier.toml | 5 +++++ 2 files changed, 6 insertions(+) diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 22d12ac6631..b758f7929ed 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -61,6 +61,7 @@ Supported filename extensions are: - ``.feature``: Signifying a new feature in Element Android or in the Matrix SDK. - ``.bugfix``: Signifying a bug fix. +- ``.dev``: Signifying a change which is not ready to be user facing, typically a component of a larger feature. - ``.doc``: Signifying a documentation improvement. - ``.removal``: Signifying a deprecation or removal of public API. Can be used to notifying about API change in the Matrix SDK - ``.misc``: Any other changes. diff --git a/towncrier.toml b/towncrier.toml index 486ef6f1861..666542a18cc 100644 --- a/towncrier.toml +++ b/towncrier.toml @@ -15,6 +15,11 @@ name = "Bugfixes 🐛" showcontent = true + [[tool.towncrier.type]] + directory = "dev" + name = "In development" + showcontent = true + [[tool.towncrier.type]] directory = "doc" name = "Improved Documentation 📚" From 13c34865f282b147da439fafd3e6312a4de23246 Mon Sep 17 00:00:00 2001 From: Adam Brown Date: Fri, 14 Jan 2022 11:25:22 +0000 Subject: [PATCH 2/5] adding .dev changelogs for the currently merged wip tasks --- changelog.d/4914.dev | 1 + changelog.d/4918.dev | 1 + changelog.d/4927.dev | 1 + 3 files changed, 3 insertions(+) create mode 100644 changelog.d/4914.dev create mode 100644 changelog.d/4918.dev create mode 100644 changelog.d/4927.dev diff --git a/changelog.d/4914.dev b/changelog.d/4914.dev new file mode 100644 index 00000000000..9d471d40ac0 --- /dev/null +++ b/changelog.d/4914.dev @@ -0,0 +1 @@ +Disabling onboarding automatic carousel transitions on user interaction \ No newline at end of file diff --git a/changelog.d/4918.dev b/changelog.d/4918.dev new file mode 100644 index 00000000000..ed5a273e167 --- /dev/null +++ b/changelog.d/4918.dev @@ -0,0 +1 @@ +Locking phones to portrait during the FTUE onboarding \ No newline at end of file diff --git a/changelog.d/4927.dev b/changelog.d/4927.dev new file mode 100644 index 00000000000..86e9abad269 --- /dev/null +++ b/changelog.d/4927.dev @@ -0,0 +1 @@ +Adds a messaging use case screen to the FTUE onboarding \ No newline at end of file From cdce8df002c3ca63647b08bc03ed7f748b6d1ea5 Mon Sep 17 00:00:00 2001 From: Adam Brown Date: Fri, 14 Jan 2022 11:40:31 +0000 Subject: [PATCH 3/5] adding a construction emoji to the in dev release notes section for more context --- towncrier.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/towncrier.toml b/towncrier.toml index 666542a18cc..c98617413ef 100644 --- a/towncrier.toml +++ b/towncrier.toml @@ -17,7 +17,7 @@ [[tool.towncrier.type]] directory = "dev" - name = "In development" + name = "In development 🚧" showcontent = true [[tool.towncrier.type]] From 37aadf4dbf92cd72549869cf09973faa0659447b Mon Sep 17 00:00:00 2001 From: Adam Brown Date: Fri, 14 Jan 2022 14:51:19 +0000 Subject: [PATCH 4/5] using .wip extension and updates the docs for more clarity --- CONTRIBUTING.md | 2 +- changelog.d/{4914.dev => 4914.wip} | 0 changelog.d/{4918.dev => 4918.wip} | 0 changelog.d/{4927.dev => 4927.wip} | 0 towncrier.toml | 2 +- 5 files changed, 2 insertions(+), 2 deletions(-) rename changelog.d/{4914.dev => 4914.wip} (100%) rename changelog.d/{4918.dev => 4918.wip} (100%) rename changelog.d/{4927.dev => 4927.wip} (100%) diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index b758f7929ed..0d395269857 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -61,7 +61,7 @@ Supported filename extensions are: - ``.feature``: Signifying a new feature in Element Android or in the Matrix SDK. - ``.bugfix``: Signifying a bug fix. -- ``.dev``: Signifying a change which is not ready to be user facing, typically a component of a larger feature. +- ``.wip``: Signifying a work in progress change, typically a component of a larger feature which will be enabled once all tasks are complete. - ``.doc``: Signifying a documentation improvement. - ``.removal``: Signifying a deprecation or removal of public API. Can be used to notifying about API change in the Matrix SDK - ``.misc``: Any other changes. diff --git a/changelog.d/4914.dev b/changelog.d/4914.wip similarity index 100% rename from changelog.d/4914.dev rename to changelog.d/4914.wip diff --git a/changelog.d/4918.dev b/changelog.d/4918.wip similarity index 100% rename from changelog.d/4918.dev rename to changelog.d/4918.wip diff --git a/changelog.d/4927.dev b/changelog.d/4927.wip similarity index 100% rename from changelog.d/4927.dev rename to changelog.d/4927.wip diff --git a/towncrier.toml b/towncrier.toml index c98617413ef..8ae8495f660 100644 --- a/towncrier.toml +++ b/towncrier.toml @@ -16,7 +16,7 @@ showcontent = true [[tool.towncrier.type]] - directory = "dev" + directory = "wip" name = "In development 🚧" showcontent = true From 7259324b3ba1d871ba389a8239a5acc592e22110 Mon Sep 17 00:00:00 2001 From: Adam Brown Date: Fri, 14 Jan 2022 16:22:46 +0000 Subject: [PATCH 5/5] updating the removal towncrier usage to be an explicit sdk category --- CONTRIBUTING.md | 2 +- towncrier.toml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 0d395269857..25120529532 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -63,7 +63,7 @@ Supported filename extensions are: - ``.bugfix``: Signifying a bug fix. - ``.wip``: Signifying a work in progress change, typically a component of a larger feature which will be enabled once all tasks are complete. - ``.doc``: Signifying a documentation improvement. -- ``.removal``: Signifying a deprecation or removal of public API. Can be used to notifying about API change in the Matrix SDK +- ``.sdk``: Signifying a change to the Matrix SDK, this could be an addition, deprecation or removal of a public API. - ``.misc``: Any other changes. See https://github.com/twisted/towncrier#news-fragments if you need more details. diff --git a/towncrier.toml b/towncrier.toml index 8ae8495f660..e4d569faa73 100644 --- a/towncrier.toml +++ b/towncrier.toml @@ -26,7 +26,7 @@ showcontent = true [[tool.towncrier.type]] - directory = "removal" + directory = "sdk" name = "SDK API changes ⚠️" showcontent = true