Skip to content

Merge main branch into copilot/fast-forward-main-commit#1703

Closed
Copilot wants to merge 8 commits intoprodfrom
copilot/fast-forward-main-commit
Closed

Merge main branch into copilot/fast-forward-main-commit#1703
Copilot wants to merge 8 commits intoprodfrom
copilot/fast-forward-main-commit

Conversation

Copy link
Contributor

Copilot AI commented Jan 9, 2026

Brings the branch up to date with main by merging 6 commits from origin/main.

Changes Merged

Files Updated

  • Workflow configurations (.github/workflows/*)
  • Mobile app dependencies (pubspec.yaml, Podfile.lock)
  • Challenge template views and models
  • New language certification assets (Chinese, Spanish)
  • Test infrastructure updates

Warning

Firewall rules blocked me from connecting to one or more addresses (expand for details)

I tried to connect to the following addresses, but was blocked by firewall rules:

  • https://storage.googleapis.com/flutter_infra_release/flutter/78fc3012e45889657f72359b005af7beac47ba3d/dart-sdk-linux-x64.zip
    • Triggering command: /update-job-proxy /update-job-proxy DOCKER test test -e si_-_Surum_1.pem test est ID_Root_G3.pem ctl /usr/bin/test test -e ot_CA_-_R4.pem test b4c2074bc4363f3f034e2839ac64959ec068443a2ae090fa69b/log.json ertum_Trusted_Ne/usr/sbin/iptables git test test (http block)
    • Triggering command: /update-job-proxy /update-job-proxy ACCEPT est sed 452a�� cation_Authorityssh://git@github.com/ /usr/share/ca-certificates/mozilla/TeliaSonera_Root_CA_v1.crt /home/dependabot/bin/test 3418fda.0 test /usr/bin/gradle/test test -e C_RAIZ_FNMT-RCM_SERVIDORES_SEGUROS.pem test test CA.pem ot-02.crt /bin/test test (http block)

If you need me to access, download, or install something from one of these locations, you can either:

Original prompt

Fast forward the branch to latest commit in main


💡 You can make Copilot smarter by setting up custom instructions, customizing its development environment and configuring Model Context Protocol (MCP) servers. Learn more Copilot coding agent tips in the docs.

Sembauke and others added 7 commits December 9, 2025 15:41
* chore: update pipelines to use flutter 3.38.5

* chore: resolve dependency issues

* fix: update deprecated code

* chore: update android deps

* fix: snackbar overlay error

Stacked-Org/stacked#1178

* fix: curriculum e2e test timeout error

Co-authored-by: Sem Bauke <semboot699@gmail.com>

* fix: missing SB for learn landing test

* fix: YT playback error

---------

Co-authored-by: Sem Bauke <semboot699@gmail.com>
Co-authored-by: Sem Bauke <semboot699@gmail.com>
* feat: landing v9 layout  (#1684)

* refactor: simplify button background color logic and update super block layout handling

* Update mobile-app/lib/ui/views/learn/landing/landing_viewmodel.dart

Co-authored-by: Huyen Nguyen <25715018+huyenltnguyen@users.noreply.github.com>

---------

Co-authored-by: Huyen Nguyen <25715018+huyenltnguyen@users.noreply.github.com>

* fix: remove exams from chapter block view (#1693)

* fix: remove exams from chapters list view

* fix: remove log

* Merge main into feat/7

* feat: add nodules support for interactive challenges (#1674)

* feat: add nodules support for interactive challenges and update pubspec.lock dependencies

* fix: make nodule values nullable

* fix: multiple files in interactive editor

* feat: refactor multiple choice view to use ExampleEditor for nodules

---------

Co-authored-by: Niraj Nandish <nirajnandish@icloud.com>

* fix: chinese SB

* chore: update phone_ide dependency to version 2.0.1 (#1696)

* feat: add new icons for SuperBlock fix: add icons to v9 superblocks (#1697)

Co-authored-by: Niraj Nandish <nirajnandish@icloud.com>

* feat: handle single block modules to directly navigate to challenge and add some extra color (#1695)

* feat(chapter-view): enhance module display with dynamic colors and navigation

* feat(chapter-view): add visual indicators for certification projects and reviews

* feat: add A1 Chinese and A1 Spanish icons (#1698)

* feat: add A1 Chinese and A1 Spanish icons

* refactor: English icons

* refactor: remove A2 Spanish

* fix: y value

* fix: Spanish Cert issues (#1701)

* fix: Spanish cert issues

* fix: correct indentation for audio challenge card in review view

* fix: remove archived super blocks (#1700)

* fix: highlighted text style in spanish lessons

---------

Co-authored-by: Huyen Nguyen <25715018+huyenltnguyen@users.noreply.github.com>
Co-authored-by: Niraj Nandish <nirajnandish@icloud.com>
* release(app): v7.0.0+70000

* fix: skip legacy content in landing e2e test
Copilot AI changed the title [WIP] Fast forward branch to latest commit in main Merge main branch into copilot/fast-forward-main-commit Jan 9, 2026
Copilot AI requested a review from Nirajn2311 January 9, 2026 05:59
@Nirajn2311 Nirajn2311 closed this Jan 9, 2026
@Nirajn2311 Nirajn2311 deleted the copilot/fast-forward-main-commit branch January 9, 2026 06:00
@Nirajn2311
Copy link
Member

🤦‍♂️

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants