Skip to content

Main2#42

Closed
AdamKershner wants to merge 201 commits intomozilla-firefox:mainfrom
Kahana-LLC:main2
Closed

Main2#42
AdamKershner wants to merge 201 commits intomozilla-firefox:mainfrom
Kahana-LLC:main2

Conversation

@AdamKershner
Copy link

No description provided.

AdamKershner and others added 30 commits August 12, 2025 17:09
… title

- Update search bar placeholder from 'Search with Google or enter address' to '🔍 Search the web or enter a URL'
- Change section title from 'Thought-provoking stories' to 'Recommended for you'
- Update all localization files (en-US, en-GB, en-CA) for consistency
- Added custom branding directory with Kahana Browser branding
- Integrated Kahana logo (ocean/oasis design) as main app icon
- Set app display name to 'Kahana Browser'
- Configured custom bundle ID: com.kahana.browser
- Successfully built and tested custom-branded Firefox
Add custom Kahana branding with custom logo and app name
… app name from 'Kahana Browser' to 'Oasis'\n- Updated bundle ID to com.oasis.browser\n- Replaced about-logo.svg with Kahana logo\n- Created custom 'Oasis' wordmark for new tab page\n- Logo and wordmark will now appear on new tab page instead of Nightly branding
merge upstream firefox updates
…text

- Update brand.ftl and brand.properties to use 'Oasis' instead of 'Nightly'
- Add custom Oasis logo (default64.png, default32.png)
- Update firefox-wordmark.svg to display 'Oasis' text
- Configure build to use custom branding directory
Add Oasis branding: Update custom branding files with Oasis logo and …
… 'Firefox Home (Default)'

- Update firefox-home-brand-name in brandings.ftl to 'Oasis Home'
- Update preferences.ftl comment to reflect Oasis branding
- This changes the dropdown options in about:preferences#home page
- Change 'Support Firefox' to 'Support Mozilla' in preferences and newtab
- Change 'Firefox family' to 'Mozilla family' in content descriptions
- Change 'Our sponsors' to 'Mozilla sponsors' in mission message
- Updates both preferences page and new tab page for consistency
- Change main description to 'improve Oasis for everyone'
- Update data collection strings to reference 'Oasis' instead of 'Mozilla'
- Change 'Firefox Suggest' to 'Oasis Suggest' in branding
- Update studies link to 'View Oasis studies'
- Update profile references to use Oasis branding
- Change mobile promo to link to kahana.co for mobile and AR/VR versions
- Update sync description to mention mobile and AR/VR versions coming soon
- Update add-ons sync description to reference Oasis desktop
- Directs users to Kahana website for information about upcoming mobile and AR/VR versions of Oasis
- Update Firefox Labs branding to Experimental in toolkit branding file
- Changes the left sidebar and page title from Firefox Labs to Experimental
- Maintains the same functionality while using more generic Experimental branding
- Change page title from 'More from Mozilla' to 'Enterprise'
- Update subtitle to 'Explore enterprise solutions and upcoming Oasis products'
- Replace Firefox Mobile with 'Oasis Mobile' - coming soon with kahana.co link
- Replace Mozilla VPN with 'Contact Sales' linking to kahana.co/sales
- Replace Mozilla Monitor with 'Get a Demo' linking to kahana.co/schedule-demo
- Replace Firefox Relay with 'AR/VR Oasis' - coming soon with kahana.co link
- Update all button text and descriptions to match enterprise focus
- Direct users to Kahana website for demos, sales, and waitlist signups
Signed-off-by: Adam Kershner <79613708+AdamKershner@users.noreply.github.com>
Adam august updates (branding updates)
AdamKershner and others added 27 commits December 26, 2025 10:28
- Automatically hides when first message is sent
- Updated CSS to properly center content when no messages present
 add mixpanel to track mic, auth, click, any more for more detail che…
- Increase recursion limit from 16 to 32 for better complex command handling
- Add user-friendly error messages with feedback link for recursion errors
- Filter out tool output messages from chat UI for cleaner interface
- Add HTML support for clickable links in error messages
- Include feedback form link (https://tally.so/r/3jkNN6) in error messages
…essages

Add user-friendly error messages and improve AI assistant
…oasis into UI_updates

Merged Ashwin updates and added mic transcribing Animation.
- Add fallback logic to detect paid plans via stripe_subscription_id when plans join fails
- Process all messages in stream steps, not just the last one
- Add fallback to display tool output messages when no AI response is generated
- Update subscription URL to kahana.co/oasis-pricing
- Add comprehensive logging for debugging subscription detection
…ipe_subscription_id detection and improve assistant output display
@github-actions
Copy link
Contributor

(Automated Close) Please do not file pull requests here, see https://firefox-source-docs.mozilla.org/contributing/how_to_submit_a_patch.html

@github-actions github-actions bot closed this Jan 23, 2026
@github-actions github-actions bot locked and limited conversation to collaborators Jan 23, 2026
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

7 participants