Most recent stuff from dev#1050
Merged
binh-dam-ibigroup merged 308 commits intodev-flex-2024from Feb 2, 2026
Merged
Conversation
Conflicts: lib/common/user/Auth0Manager.js lib/manager/actions/visibilityFilter.js
Conflicts: mkdocs.yml
MTC docs update
Merge mtc-deploy into dev
…rce-table Display Feed Publish Status on List of Feeds
Contributor
Author
There was a problem hiding this comment.
Somehow the deployment bundle name got added under "Flex" and that's not right, I'll fix it.
miles-grant-ibigroup
approved these changes
Feb 2, 2026
Contributor
miles-grant-ibigroup
left a comment
miles-grant-ibigroup
left a comment
There was a problem hiding this comment.
All seems to be working!
Comment on lines
+144
to
+150
| let routePublic = 1 // public | ||
| let routeStatus = 2 // approved | ||
| if (isExtensionEnabled('mtc')) { | ||
| // MTC has specific initial editor route states. | ||
| routePublic = 0 // not public | ||
| routeStatus = 0 // in progress | ||
| } |
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 up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
6 participants
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.
Checklist
Description
Merging
devintodev-flex-2024resulted in conflicts, so here are my proposed resolutions.Merge conflicts were in the following files (you might skip reviewing the other ones):