Debug/assistant-preview-fix-icons-2025-11-20 #5
+1,120,354
−131
Conversation
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
Pull in upstream updates
… 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
Merge upstream updates
- 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
merge upstream 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
Adam august updates
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
merge upstream
Signed-off-by: Adam Kershner <[email protected]>
Adam august updates (branding updates)
merge upstream firefox
Merge upstream
merge upstream
merge upstream
merge upstream
merge upstream
merge upstream
merge upstream
Fix authentication status check and UI updates
merge upstream
merge upstream
merge upstream
- Add comprehensive Supabase authentication implementation guide - Add Firefox browser authentication callback HTML files - Add SupabaseAuth service for Firefox assistant integration - Add TypeScript interfaces and environment configuration - Add OAuth flow handlers for Firefox browser context These files provide the foundation for implementing Supabase authentication specifically within the Firefox Oasis browser assistant, including: - Email/password authentication - Google OAuth integration - Session management - User profile handling - Custom protocol handling for OAuth redirects
- Replace real Supabase URL and anon key with placeholder values - Add security warnings about credential management - Update documentation with proper security guidelines - Use environment variables for sensitive configuration This fixes a critical security vulnerability where real Supabase credentials were exposed in the public repository.
- Restore original Supabase URL and anon key - Update documentation to clarify that anon key is designed to be public - Remove unnecessary security warnings about anon key exposure - Anon key is protected by RLS policies and rate limiting The Supabase anon key is specifically designed for client-side use and is safe to include in public repositories.
Feature/new UI updates
merge upstream
- Add Supabase authentication integration with email/password and Google OAuth - Implement authentication guard to prevent unauthorized API usage - Add cross-frame communication for popup assistant synchronization - Fix URL normalization for open_tab command (handles natural language inputs) - Implement command coordination to prevent duplicate execution - Add comprehensive UI state management and debugging - Update build configuration for Supabase environment variables Key files: - assistant.ui.js: Authentication UI, cross-frame sync, command coordination - auth-guard.js: Authentication enforcement wrapper - assistant.bundle.js: URL normalization for open_tab command - proxyClient.ts: Authentication checks before API calls - commands.ts: Enhanced open_tab with URL normalization - package.json: Added Supabase dependency
feat: Add authentication system and improve AI assistant functionality
This merge brings in the latest Firefox development changes from mozilla-firefox/main. Includes various bug fixes, performance improvements, and new features. Resolves PR #70 Conflicts resolved: - browser/base/content/main-popupset.js: Added new tabContextMenu case for TabContextMenu.addNewBadge()
merge upstream
merge upstream
Contributor
|
(Automated Close) Please do not file pull requests here, see https://firefox-source-docs.mozilla.org/contributing/how_to_submit_a_patch.html |
KSA2O3O
referenced
this pull request
Dec 4, 2025
…=niklas,fluent-reviewers,bolsson Differential Revision: https://phabricator.services.mozilla.com/D273016
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
4 participants
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.
Fixed send, mic icons and background theme of the AI Assistant