Hide_D 4d7223b7a4 Merge branch 'main' into feature/nation-general-lists ...

# Conflicts:
#	app/game-frontend/package.json
#	app/game-frontend/src/router/index.ts

2026-07-26 06:32:54 +00:00

..

auction.spec.ts

feat: complete auction menu parity

2026-07-26 05:33:33 +00:00

battleSimulator.spec.ts

feat(frontend): finish battle simulator workflows

2026-07-26 05:31:37 +00:00

battleSimulatorRef.spec.ts

feat(frontend): finish battle simulator workflows

2026-07-26 05:31:37 +00:00

board.spec.ts

Complete legacy-compatible board rooms

2026-07-26 04:19:20 +00:00

directoryLists.spec.ts

Merge branch 'main' into feature/nation-general-lists

2026-07-26 06:32:54 +00:00

inGameInfo.spec.ts

feat: complete map-to-city page parity

2026-07-26 05:11:49 +00:00

inGameMenus.spec.ts

Track legacy page refresh activity

2026-07-26 05:49:45 +00:00

nationGeneralSecret.spec.ts

Add nation general and secret office parity

2026-07-26 05:16:07 +00:00

nationOffices.spec.ts

test: resolve nation office assets across worktrees

2026-07-26 04:37:14 +00:00

npcPolicy.spec.ts

Restore legacy NPC policy frontend

2026-07-26 05:18:04 +00:00

playwright.config.mjs

Merge branch 'main' into feature/nation-general-lists

2026-07-26 06:32:54 +00:00

troop.spec.ts

merge: add secure troop management

2026-07-25 08:50:01 +00:00