Main2#42

Closed

AdamKershner wants to merge 201 commits intomozilla-firefox:mainfrom

Kahana-LLC:main2

Commits on Aug 12, 2025

Merge pull request #1 from mozilla-firefox/main
AdamKershner
authored
Customize Firefox new tab page: Change search placeholder and section title

Adam Kershner
authored and
Adam Kershner
committed

Commits on Aug 13, 2025

Merge pull request #2 from mozilla-firefox/main
AdamKershner
authored

Commits on Aug 14, 2025

Add custom Kahana branding with custom logo and app name

Adam Kershner
authored and
Adam Kershner
committed
Merge pull request #3 from mozilla-firefox/main
AdamKershner
authored
Merge pull request #4 from Kahana-LLC/adam-august-updates
AdamKershner
authored
Update branding to 'Oasis' with custom logo and wordmark\n\n- Changed app name from 'Kahana Browser' to 'Oasis'\n- Updated bundle ID to com.oasis.browser\n- Replaced about-logo.svg with Kahana logo…

Adam Kershner
authored and
Adam Kershner
committed

Commits on Aug 15, 2025

Add pyrightconfig.json for development tooling and update Firefox Oasis branding

Adam Kershner
authored and
Adam Kershner
committed
Update Firefox Oasis branding with new gradient icon and branding assets

Adam Kershner
authored and
Adam Kershner
committed
Merge pull request #5 from mozilla-firefox/main
AdamKershner
authored
Merge pull request #6 from Kahana-LLC/adam-august-updates
AdamKershner
authored

Commits on Aug 19, 2025

Merge pull request #7 from mozilla-firefox/main
AdamKershner
authored
Add Oasis branding: Update custom branding files with Oasis logo and text

Adam Kershner
authored and
Adam Kershner
committed
Merge pull request #8 from Kahana-LLC/adam-august-updates
AdamKershner
authored
Update preferences dropdown to show 'Oasis Home (Default)' instead of 'Firefox Home (Default)'

Adam Kershner
authored and
Adam Kershner
committed
Update support section to use Mozilla branding instead of Firefox

Adam Kershner
authored and
Adam Kershner
committed
Update privacy page to use Oasis branding instead of Firefox/Mozilla

Adam Kershner
authored and
Adam Kershner
committed
Update sync page to redirect to Kahana website for mobile/AR/VR info

Adam Kershner
authored and
Adam Kershner
committed
Change Firefox Labs to Experimental in settings

Adam Kershner
authored and
Adam Kershner
committed
Transform More from Mozilla page to Enterprise page with Kahana links

Adam Kershner
authored and
Adam Kershner
committed
Merge pull request #9 from mozilla-firefox/main
AdamKershner
authored
Merge branch 'main' into adam-august-updates
AdamKershner
authored
Merge pull request #10 from Kahana-LLC/adam-august-updates
AdamKershner
authored

Commits on Aug 20, 2025

Merge pull request #11 from mozilla-firefox/main
AdamKershner
authored

Commits on Aug 21, 2025

Commits on Aug 22, 2025

Commits on Aug 23, 2025

Commits on Aug 24, 2025

Add Oasis Browser branding and release build configuration

Adam Kershner
authored and
Adam Kershner
committed
Merge pull request #19 from mozilla-firefox/main
AdamKershner
authored
Merge pull request #20 from Kahana-LLC/oasis-branding-release
AdamKershner
authored
Add comprehensive developer guide for new contributors

Adam Kershner
authored and
Adam Kershner
committed
Add v1.1.0 release plan and build fixes for critical XPCOM issues

Adam Kershner
authored and
Adam Kershner
committed
Fix critical XPCOM and packaging issues for Oasis Browser v1.1.0

Adam Kershner
authored and
Adam Kershner
committed
Add v1.1.0 release summary document

Adam Kershner
authored and
Adam Kershner
committed
Merge pull request #21 from mozilla-firefox/main
AdamKershner
authored
Merge pull request #22 from Kahana-LLC/release/mac-v1.1.0
AdamKershner
authored

Commits on Aug 25, 2025

Merge pull request #23 from mozilla-firefox/main
AdamKershner
authored

Commits on Aug 27, 2025

Merge pull request #26 from mozilla-firefox/main
AdamKershner
authored

Commits on Sep 2, 2025

Merge upstream Firefox main branch

Adam Kershner
authored and
Adam Kershner
committed
Merge branch 'main' into mozilla-firefox-main
AdamKershner
authored
Merge pull request #28 from Kahana-LLC/mozilla-firefox-main
AdamKershner
authored
Transform Firefox Oasis to redirect users to Kahana ecosystem

Adam Kershner
authored and
Adam Kershner
committed
Merge pull request #29 from mozilla-firefox/main
AdamKershner
authored
Merge pull request #30 from Kahana-LLC/feature/documentation-update-links
AdamKershner
authored

Commits on Sep 3, 2025

Commits on Sep 4, 2025

Save local changes before upstream merge

Adam Kershner
authored and
Adam Kershner
committed
Merge upstream Firefox changes

Adam Kershner
authored and
Adam Kershner
committed

Commits on Sep 8, 2025

Merge upstream Firefox changes from mozilla-firefox:main

Adam Kershner
authored and
Adam Kershner
committed

Commits on Sep 9, 2025

Merge upstream Firefox main branch - resolve conflict in privacy.inc.xhtml

Adam Kershner
authored and
Adam Kershner
committed
Merge pull request #37 from mozilla-firefox/main
AdamKershner
authored

Commits on Sep 10, 2025

Commits on Sep 11, 2025

Commits on Sep 14, 2025

Merge pull request #45 from mozilla-firefox/main
AdamKershner
authored

Commits on Sep 16, 2025

Merge pull request #49 from mozilla-firefox/main
AdamKershner
authored

Commits on Sep 17, 2025

Merge pull request #50 from mozilla-firefox/main
AdamKershner
authored

Commits on Sep 22, 2025

Merge pull request #51 from mozilla-firefox/main
AdamKershner
authored

Commits on Sep 23, 2025

Merge pull request #52 from mozilla-firefox/main
AdamKershner
authored

Commits on Sep 25, 2025

gemini updates
Naveen015
committed

Commits on Sep 30, 2025

Commits on Oct 1, 2025

Hubs page and AWS setup
Naveen015
committed

Commits on Oct 2, 2025

Commits on Oct 4, 2025

Merge pull request #59 from mozilla-firefox/main
AdamKershner
authored

Commits on Oct 6, 2025

Merge pull request #60 from mozilla-firefox/main
AdamKershner
authored

Commits on Oct 8, 2025

Commits on Oct 9, 2025

Commits on Oct 10, 2025

Merge pull request #64 from mozilla-firefox/main
AdamKershner
authored

Commits on Oct 13, 2025

Merge pull request #65 from mozilla-firefox/main
AdamKershner
authored

Commits on Oct 21, 2025

Commits on Oct 22, 2025

Moved Assistant to Sidebar
Naveen015
committed

Commits on Oct 24, 2025

Fixed Graph recursion
Naveen015
committed

Commits on Oct 27, 2025

Merge upstream mozilla-firefox/main into main
AdamKershner
committed
Merge pull request #75 from mozilla-firefox/main
AdamKershner
authored
Merge pull request #76 from Kahana-LLC/naveen-updates
AdamKershner
authored
context update

ashwin john
authored and
ashwin john
committed

Commits on Oct 28, 2025

context length and tts updates

ashwin john
authored and
ashwin john
committed
Merge pull request #77 from mozilla-firefox/main
AdamKershner
authored

Commits on Oct 30, 2025

Merge upstream/main into main: resolve search preferences conflict by keeping upstream online toggle and retaining Oasis data-collection toggle
AdamKershner
committed

Commits on Oct 31, 2025

Commits on Nov 3, 2025

Merge pull request #83 from mozilla-firefox/main
AdamKershner
authored

Commits on Nov 4, 2025

Commits on Nov 7, 2025

Merge pull request #86 from mozilla-firefox/main
AdamKershner
authored

Commits on Nov 11, 2025

splitview, hubs integration with firefox bookmarks

ashwin john
authored and
ashwin john
committed

Commits on Nov 14, 2025

Merge pull request #90 from mozilla-firefox/main
AdamKershner
authored

Commits on Nov 16, 2025

DEBUG: assistant.ui.js and preview.html — still debugging, DO NOT MERGE
blackhat955
committed

Commits on Nov 18, 2025

Merge PR #92: merge upstream from mozilla-firefox/main (438 commits)
AdamKershner
committed

Commits on Nov 19, 2025

Commits on Nov 20, 2025

Commits on Nov 25, 2025

Merge pull request #102 from mozilla-firefox/main
AdamKershner
authored

Commits on Dec 1, 2025

Merge pull request #103 from mozilla-firefox/main
AdamKershner
committed

Commits on Dec 11, 2025

Merge branch 'pr-104'
AdamKershner
committed
Add floating/draggable assistant overlay and remove Check Authentication button
AdamKershner
committed
Merge pull request #105 from Kahana-LLC/feature/assistant-ui-improvements
AdamKershner
authored
feat: replace embedding search with MiniSearch and improve hub indexing

ashwin john
authored and
ashwin john
committed

Commits on Dec 12, 2025

Merge pull request #106: merge upstream
AdamKershner
committed

Commits on Dec 13, 2025

chore: stop tracking node_modules and update build artifacts

ashwin john
authored and
ashwin john
committed
chore: update package dependencies and build bundle

ashwin john
authored and
ashwin john
committed
Oasis branding changes
aj0671
committed

Commits on Dec 15, 2025

Merge PR #106: merge upstream
AdamKershner
committed

Commits on Dec 18, 2025

Redesign assistant UI with clean header and updated color scheme
ashwin john
committed
Add bubble chat UI with authentication banner
ashwin john
committed
Merge pull request #111 from mozilla-firefox/main
AdamKershner
authored

Commits on Dec 19, 2025

added feedback button
SAIDEEP1216
committed

Commits on Dec 25, 2025

UI Updates: Enhanced Oasis AI Assistant interface
SAIDEEP1216
committed

Commits on Dec 26, 2025

Merge pull request #112 from Kahana-LLC/UI_Updates_1
AdamKershner
authored
Fix jittery floating window drag

ashwin john
authored and
ashwin john
committed
Add empty state with welcome image and text to assistant chat

ashwin john
authored and
ashwin john
committed

Commits on Dec 28, 2025

Merge PR #113: Upstream Firefox updates
AdamKershner
committed

Commits on Dec 30, 2025

Commits on Dec 31, 2025

Commits on Jan 2, 2026

Merge pull request #119 from mozilla-firefox/main
AdamKershner
authored

Commits on Jan 12, 2026

Merge pull request #120 from mozilla-firefox/main
AdamKershner
authored

Commits on Jan 15, 2026

Commits on Jan 16, 2026

Bug:Window Management, UI Updates
keurigdrip
committed

Commits on Jan 19, 2026

Commits on Jan 20, 2026

Commits on Jan 21, 2026

Commits on Jan 23, 2026

Merge PR #129: Subscription limit update - Add fallback logic for stripe_subscription_id detection and improve assistant output display
AdamKershner
committed