Repository navigation
Resolve release PR #2574 conflicts by merging master into dev - #2575
Merged
Merged
Conversation
…eEnd-to-bulk-ingestion [HOTFIX] Sys admin/bulk ingestion: add updatedDateEnd filter
Sales portal, bug fixes, Salesforce integration
Tweaks for sales page
…r-ai-decision [HOTFIX] allow admin to retrigger ai decision
Table: show ten columns in the PM-6392 order (Stage, Opportunity Name, Account Name, Subcontracting End Customer, Reporting SMU, Amount, Expected Revenue, Created Date, Close Date, Opportunity Owner) and drop Reporting Account, Close Month, Expected Revenue (Converted), Amount (Converted) and Forecast Alert. Selection and ordering are a display concern, so the API response and the WIN contract are untouched, a column the report adds later is kept behind the ordered ones, and each column keeps the cell index it has in row.cells. Numeric cells are right-aligned and non-wrapping, dates non-wrapping, and padding and type sizes are tightened so the table fits a laptop width. Summary: four fixed cards below the title — Total Opportunities, Total Amount, Total Expected Revenue and Total WON SOW Signed — reading the snapshot-wide summary, with an em dash for a column the report does not provide. Stage breakdown: a compact grid of clickable tiles, one per stage, each showing its count, Amount and Expected Revenue, ordered down the pipeline. A tile drills the table into that stage via the new Reports API drilldown, which leaves the summary intact so the breakdown does not collapse to the selected stage; the tile is highlighted and aria-pressed, and clicking it again or Clear stage releases it. Layout: the stage breakdown and the date range filter now share a two-column row beneath the cards, stacking below 1100px. Co-Authored-By: Claude Opus 5 (1M context) <noreply@anthropic.com>
PM-6392 Sales dashboard redesign: compact table, summary cards and stage filtering
Hotfix: stop automatic refresh on Sales page
September 2026 release 3
…y-freshness-20260929 Refresh analytics report results every minute
…ts-production-bucket Fix production project asset uploads -> master
* PM-6330 - Addr for the timesheet app * PM-6355 - user management for timesheet managers * PM-6355 - manage timesheet managers * PM-6357 - members page for entering timesheet entries * PM-6358 - allow admins & managers to manage timesheet entries * PM-6358 - show timesheet management tab in engagements app * lint * fix engagements url * PM-6358 - UI updates * Improve UI * lint * PM-6432 - associate payments to timesheet entries * fix(PM-6410): derive scheduled and stalled challenge card states * fix(PM-6412): use latest winner submission scores as fallback * fix(PM-6415): expose My Projects filtering for talent managers * feat(PM-6433): add rated forum mentions and member autocomplete * docs(PM-6410): explain scheduled and stalled active challenge labels * fix(PM-6412): replace AI-only stored score placeholders * PM-6432 - link payments to timesheet * fix(PM-6433): prevent forum mention dropdown clipping * Lint * PM-6451 - treat PM as not authorized for engagement timesheets * Add Forms tab with submission reports and complete CSV exports * lint * Lint * Fix assignee * Use cofirm modal for confirming timesheet manager removal * Timesheet various updates * Move edit managers to modal * Update UI for timesheet managers * Update UI for timesheet managers * Update UI for timesheet member * PM-6411 Compact challenge timelines and align endpoints (#2411) * PM-6480 - allow TM to edit managers * PM-6477 - audit trail for managers * PM-6480 - audit modals data format * Show status column for TM * lint * UI Fixes for engagement timesheets * PM-6492 Allow future years in unbounded date pickers * PM-6436 Return to project view after saving edits * PM-6491 Hide provisional scores until tests finish * PM-6427 Pace billing detail requests to prevent API bursts * PM-6457 Show edit timestamps on forum posts * PM-6496 Sort all submission data columns across pages * Fix newest-first competition sorting in Opportunities * PM-6499 Display failed Marathon system scores as zero * PM-6498 Show submission history counts for every Marathon viewer * PM-6510 Mark timed-out Marathon Match test results as failed * Serve Topgear challenges without the legacy hero banner * Require Wipro All membership before mounting Topgear routes * PM-6515 Allow Talent Managers to view non-member project workspaces * PM-6428 - campus homepage * PM-6428 - limit access to wipro users * PM-6514 - disable timesheet restrictions for now * PM-6515 Make the Assets Library read-only for non-member Talent Managers Talent Managers can now open non-internal projects without membership, and projects-api-v6 PR #50 lets them read the project's attachments. The Assets Library still showed "Add New File" / "Add New Link" to them, but the API rejects their attachment creates, so a file picked through Filestack would upload and then fail to save. Add checkCanAddProjectAssets (admins and project members) and hide the add actions for other viewers. Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com> * PM-6526 Show colored initial placeholders for members without photos Add a shared MemberAvatar to the Opportunities (community) app. Members without a usable photo now get a borderless placeholder with their handle's first initial on one of the eight Figma color pairs, chosen consistently from the handle so a member keeps the same color everywhere. Used for challenge registrant/submission/winner rows, forum members and participant stacks, completed competition winner avatars, and review opportunity applications (which previously showed a generic icon). Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com> * Add administrator website publishing page (#2434) * hide timesheet button * lint * lint --------- Co-authored-by: Vasilica Olariu <olariu.vasilica@gmail.com> Co-authored-by: Vasilica Olariu <vas3a@users.noreply.github.com> Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
Merge commit
October 2026 Release 2
…emory Fix production build heap exhaustion -> master
Fix dashboard navigation on reports portal
…-master Increase forum comment limit to 10,000 characters -> master
…master Fix Topgear URL submissions in My Submissions -> master
October 2026 Release 3
Tweaks for sales reports
…-master Show the full April–March fiscal year in sales dashboards -> master
PM-6660: Update pipeline bookings and filters on master
PM-6667: Update sales dashboards and customer payment reporting
PM-6668: Add annual totals and complete customer tables
…wups-master Update sales fiscal-year titles, date defaults and customer totals
PM-6672: consolidate Sales dashboards, filters and customer totals
…ster PM-6672: show selectable breakdowns and expandable customer reports
Preserve sales dashboard headlines, tests, and documentation alongside the shared totals and customer reporting changes. Bring in the remaining master updates without changing their contents.
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
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.
Release PR #2574 cannot merge because the sales dashboard changes overlap between
devandmaster. Merge the currentmasterintodev, preserving the PM-6632 headline figures, styling, tests, and documentation alongside the totals and customer-reporting updates already present on both branches. The remaining incoming changes retain their exactmastercontents.Use a merge commit to preserve the
masterancestry and clear the conflicts in PR #2574.Validation:
yarn lintpassed.yarn run buildpassed with source-map, CSS ordering, and bundle-size warnings.git diff --checkpassed.