Commit 90c7123
committed
Merge origin/staging into refactor/resource-views-tables
Six conflicts, all one cause: staging's unbolding sweep (#6400) landed on code
this branch had moved out of the route tree.
Resolved by keeping this branch's structure and replaying every one of staging's
21 `font-medium` removals at the element's new home — 16 applied, the rest
already absorbed by the auto-merge. Verified none of the strings staging
unbolded is still bold anywhere in the tree.
One deliberate deviation: staging rewrote the file-preview fallback as
`text-[14px]`, which the styling rule forbids (font-size only, inherits the
wrong line-height). Took staging's intent — dropping `font-medium` — and kept
the named `text-sm`, which is the same 14px.
`base.tsx` and `file-viewer.tsx` came back as delete/modify conflicts because
they no longer exist here; their changes were ported into `document-list.tsx`
and the file-view unit rather than dropped.
Suite: 20951 passed. R6/R3c 0, 23 audits green.289 files changed
Lines changed: 16438 additions & 2585 deletions
File tree
- .agents/skills
- add-integration
- add-tools
- validate-integration
- .claude/commands
- .cursor/commands
- apps
- docs
- components
- ui
- content/docs/en/integrations
- sim
- app
- (auth)/components
- (interfaces)
- chat/components
- auth/email
- message-container
- message
- components
- resume/[workflowId]/[executionId]
- (landing)
- demo/components/demo-scheduler
- enterprise/components/feature-graphics
- _shell
- api
- invitations/[id]
- pinned-items
- workspaces
- invite
- [id]
- components
- oauth-error
- playground
- unsubscribe
- workspace
- [workspaceId]
- components/message-actions
- files
- home/components
- message-content/components
- agent-group
- special-tags
- mothership-view/components
- add-resource-dropdown
- resource-content
- components
- browser-session
- generic-resource-content
- queued-messages
- user-input/components
- drop-overlay
- integrations
- [block]
- components/connect-slack-bot-modal
- connected/[credentialId]
- knowledge
- [id]/[documentId]
- components/edit-knowledge-base-modal
- logs
- components
- dashboard
- components
- line-chart
- status-bar
- workflows-list
- log-details
- settings/components
- general
- inbox/components/inbox-settings-tab
- mcp
- components/mcp-server-form-modal
- mothership
- settings-upgrade-notice
- team-management/components
- no-organization-view
- transfer-ownership-dialog
- workflow-mcp-servers
- tables
- upgrade
- components
- comparison-table
- plan-card
- w
- [workflowId]/components
- chat
- components
- chat-message
- output-select
- command-list
- cursors
- diff-controls
- error
- panel/components
- deploy/components/deploy-modal/components
- api
- chat
- general
- components
- mcp
- editor/components/sub-block/components/grouped-checkbox-list
- search-replace
- terminal/components/output-panel
- variables
- components
- preview
- components
- preview-editor
- preview-workflow
- components
- block
- subflow
- sidebar
- components
- settings-sidebar
- workflow-list/components
- delete-modal
- folder-item
- workspace-header
- components/pending-invitations
- hooks
- blocks
- blocks
- components
- chat
- chat-content
- user-message-content
- resources
- file-view/components
- pdf-viewer
- knowledge-view/components
- connector-selector-field
- connectors-section
- document-list
- log-view
- components
- execution-snapshot
- file-download
- trace-view
- table-view/components
- column-config-sidebar
- enrichment-details
- enrichments-sidebar
- remote-selection-overlay
- table-filter
- table-grid
- table-primitives
- workflow-sidebar
- resource
- components/resource-header
- settings
- ui
- workspace-host-provider
- ee
- access-control/components
- custom-blocks/components
- sso/components
- workspace-forking
- components
- fork-sync
- hooks
- executor
- execution
- handlers
- agent
- generic
- mothership
- pi
- hooks/queries
- lib
- api/contracts
- copilot/chat
- integrations
- invitations
- pinned-items
- uploads/utils
- users
- workspaces
- providers
- anthropic
- tools
- a2a
- browser_use
- context_dev
- cursor
- dynatrace
- elevenlabs
- exa
- extend
- firecrawl
- fireflies
- generated
- jina
- pulse
- reducto
- stt
- tavily
- textract
- video
- packages
- db
- workflow-renderer/src
- note
- subflow
- workflow-block
Some content is hidden
Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
131 | 131 | | |
132 | 132 | | |
133 | 133 | | |
134 | | - | |
| 134 | + | |
| 135 | + | |
| 136 | + | |
| 137 | + | |
135 | 138 | | |
136 | 139 | | |
137 | 140 | | |
138 | 141 | | |
139 | 142 | | |
140 | | - | |
141 | | - | |
142 | | - | |
143 | | - | |
144 | | - | |
145 | | - | |
146 | | - | |
147 | | - | |
| 143 | + | |
| 144 | + | |
| 145 | + | |
| 146 | + | |
| 147 | + | |
| 148 | + | |
| 149 | + | |
| 150 | + | |
| 151 | + | |
148 | 152 | | |
149 | 153 | | |
150 | 154 | | |
| |||
160 | 164 | | |
161 | 165 | | |
162 | 166 | | |
163 | | - | |
164 | | - | |
165 | | - | |
| 167 | + | |
| 168 | + | |
| 169 | + | |
166 | 170 | | |
167 | 171 | | |
168 | 172 | | |
| |||
173 | 177 | | |
174 | 178 | | |
175 | 179 | | |
176 | | - | |
177 | | - | |
178 | | - | |
179 | | - | |
180 | | - | |
181 | | - | |
| 180 | + | |
| 181 | + | |
| 182 | + | |
| 183 | + | |
| 184 | + | |
182 | 185 | | |
183 | 186 | | |
184 | 187 | | |
| |||
594 | 597 | | |
595 | 598 | | |
596 | 599 | | |
597 | | - | |
598 | | - | |
| 600 | + | |
| 601 | + | |
599 | 602 | | |
600 | 603 | | |
601 | 604 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
150 | 150 | | |
151 | 151 | | |
152 | 152 | | |
153 | | - | |
154 | | - | |
155 | | - | |
156 | | - | |
157 | | - | |
158 | | - | |
| 153 | + | |
| 154 | + | |
| 155 | + | |
| 156 | + | |
| 157 | + | |
| 158 | + | |
| 159 | + | |
| 160 | + | |
| 161 | + | |
| 162 | + | |
159 | 163 | | |
160 | 164 | | |
161 | 165 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
141 | 141 | | |
142 | 142 | | |
143 | 143 | | |
144 | | - | |
145 | | - | |
146 | | - | |
147 | | - | |
148 | | - | |
| 144 | + | |
| 145 | + | |
| 146 | + | |
| 147 | + | |
| 148 | + | |
| 149 | + | |
| 150 | + | |
149 | 151 | | |
150 | | - | |
| 152 | + | |
| 153 | + | |
| 154 | + | |
151 | 155 | | |
152 | 156 | | |
153 | 157 | | |
154 | 158 | | |
155 | 159 | | |
156 | 160 | | |
157 | | - | |
158 | | - | |
| 161 | + | |
| 162 | + | |
159 | 163 | | |
160 | 164 | | |
161 | 165 | | |
| |||
166 | 170 | | |
167 | 171 | | |
168 | 172 | | |
169 | | - | |
170 | | - | |
171 | | - | |
172 | | - | |
| 173 | + | |
| 174 | + | |
| 175 | + | |
173 | 176 | | |
174 | 177 | | |
175 | 178 | | |
| |||
348 | 351 | | |
349 | 352 | | |
350 | 353 | | |
351 | | - | |
352 | | - | |
| 354 | + | |
353 | 355 | | |
354 | 356 | | |
355 | 357 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
130 | 130 | | |
131 | 131 | | |
132 | 132 | | |
133 | | - | |
| 133 | + | |
| 134 | + | |
| 135 | + | |
| 136 | + | |
134 | 137 | | |
135 | 138 | | |
136 | 139 | | |
137 | 140 | | |
138 | 141 | | |
139 | | - | |
140 | | - | |
141 | | - | |
142 | | - | |
143 | | - | |
144 | | - | |
145 | | - | |
146 | | - | |
| 142 | + | |
| 143 | + | |
| 144 | + | |
| 145 | + | |
| 146 | + | |
| 147 | + | |
| 148 | + | |
| 149 | + | |
| 150 | + | |
147 | 151 | | |
148 | 152 | | |
149 | 153 | | |
| |||
159 | 163 | | |
160 | 164 | | |
161 | 165 | | |
162 | | - | |
163 | | - | |
164 | | - | |
| 166 | + | |
| 167 | + | |
| 168 | + | |
165 | 169 | | |
166 | 170 | | |
167 | 171 | | |
| |||
172 | 176 | | |
173 | 177 | | |
174 | 178 | | |
175 | | - | |
176 | | - | |
177 | | - | |
178 | | - | |
179 | | - | |
180 | | - | |
| 179 | + | |
| 180 | + | |
| 181 | + | |
| 182 | + | |
| 183 | + | |
181 | 184 | | |
182 | 185 | | |
183 | 186 | | |
| |||
593 | 596 | | |
594 | 597 | | |
595 | 598 | | |
596 | | - | |
597 | | - | |
| 599 | + | |
| 600 | + | |
598 | 601 | | |
599 | 602 | | |
600 | 603 | | |
| |||
0 commit comments