Skip to content

feat: bring bs5 branch up to date with changes on main#3644

Merged
jennifer-richards merged 27 commits intoietf-tools:feat/bs5from
painless-security:jennifer/main-merge
Mar 15, 2022
Merged

feat: bring bs5 branch up to date with changes on main#3644
jennifer-richards merged 27 commits intoietf-tools:feat/bs5from
painless-security:jennifer/main-merge

Conversation

@jennifer-richards
Copy link
Copy Markdown
Member

No description provided.

NGPixel and others added 27 commits March 10, 2022 12:57
Sessions with long names lead to poor rendering of the agenda filter buttons
on the 'customize the agenda view' page. This truncates those labels at 3 words.
fix: point the api index page into GitHub instead of trac/svn
* fix: point to GitHub for bug reports

* fix: point report bug link to template chooser

* fix: point report bug link to template chooser (2)

Co-authored-by: Nicolas Giard <github@ngpixel.com>
# Conflicts:
#	README.md
#	docker/scripts/app-init.sh
#	ietf/templates/500.html
#	ietf/templates/api/index.html
#	ietf/templates/base.html
#	ietf/templates/base/menu.html
#	ietf/templates/group/group_about_status_edit.html
#	ietf/templates/meeting/agenda_filter.html
#	ietf/templates/release/about.html
#	package-lock.json
@jennifer-richards jennifer-richards merged commit 515dbed into ietf-tools:feat/bs5 Mar 15, 2022
@jennifer-richards
Copy link
Copy Markdown
Member Author

@NGPixel looked over the build stuff, merging myself to avoid letting it get out of date.

@jennifer-richards jennifer-richards deleted the jennifer/main-merge branch March 15, 2022 13:33
@github-actions github-actions Bot locked as resolved and limited conversation to collaborators Jun 16, 2022
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

6 participants