torbjorn/antigravity-claude-proxy
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge main into PR #221 to resolve conflicts

Browse Source 
Resolved merge conflicts in public/views/settings.html:
- Fixed HTML entity escaping for quote characters in presetHint text
- Fixed HTML entity escaping for pendingPresetName text
This commit is contained in:
Badri Narayanan S
2026-02-01 16:20:55 +05:30
parent 7985524d49 793b20db59
commit 02f8e2e323
9 changed files with 82 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
public/views/settings.html
View File

@@ -301,10 +301,7 @@
<span x-show="deletingPreset" class="loading loading-spinner loading-xs"></span>
</button>
</div>
<p class="text-[10px] text-gray-600 mt-2"
x-text="$store.global.t('presetHint') || 'Select a preset to load it. Click \" Apply to Claude
CLI\" to save changes.'">Select a preset to load it. Click "Apply to Claude CLI" to save
changes.</p>
<p class="text-[10px] text-gray-600 mt-2" x-text="$store.global.t('presetHint') || 'Select a preset to load it. Click &quot;Apply to Claude CLI&quot; to save changes.'">Select a preset to load it. Click "Apply to Claude CLI" to save changes.</p>
</div>
<!-- Base URL -->
@@ -700,8 +697,7 @@
x-text="$store.global.t('unsavedChangesMessage') || 'Your current configuration doesn\'t match any saved preset.'">Your
current configuration doesn't match any saved preset.</span>
<br><br>
<span class="text-yellow-400/80" x-text="'Load \"' + pendingPresetName + ' \" and lose
current changes?'"></span>
<span class="text-yellow-400/80" x-text="'Load &quot;' + pendingPresetName + '&quot; and lose current changes?'"></span>
</p>
<div class="modal-action">
<button class="btn btn-ghost text-gray-400" @click="cancelLoadPreset()"
@@ -762,7 +758,7 @@
</div>
<!-- Tab 3: Models Configuration -->
<div x-show="activeTab === 'models'" x-data="window.Components.modelManager()"
<div x-show="activeTab === 'models'" x-data="window.Components.models()"
class="space-y-6 max-w-3xl animate-fade-in">
<div class="flex items-center justify-between">