Merge branch 'release' into staging

7f47f84c9f7ec29ba245aa95d96c25c264eb80b9

Cohee <18619528+Cohee1207@users.noreply.github.com>

Parents: ecbe8d38c5589987e733cf2e03937779ec4aa6d8 303c1dcf140b23d87d49c6451c6d9889694ce842
1 files changed, +1 -1Showing whitespace changes
public/scripts/extensions/caption/settings.html+1 -1
@@ -188,7 +188,6 @@
188 <div class="flexBasis100p m-b-1">188 <div class="flexBasis100p m-b-1">
189 <small><b data-i18n="Hint:">Hint:</b> <span data-i18n="Set your API keys and endpoints in the 'API Connections' tab first.">Set your API keys and endpoints in the 'API Connections' tab first.</span></small>189 <small><b data-i18n="Hint:">Hint:</b> <span data-i18n="Set your API keys and endpoints in the 'API Connections' tab first.">Set your API keys and endpoints in the 'API Connections' tab first.</span></small>
190 </div>190 </div>
191 </div>
192 <div data-type="koboldcpp,ollama,vllm,llamacpp,ooba" class="flex-container flexFlowColumn">191 <div data-type="koboldcpp,ollama,vllm,llamacpp,ooba" class="flex-container flexFlowColumn">
193 <label for="caption_altEndpoint_enabled" class="checkbox_label">192 <label for="caption_altEndpoint_enabled" class="checkbox_label">
194 <input id="caption_altEndpoint_enabled" type="checkbox">193 <input id="caption_altEndpoint_enabled" type="checkbox">
@@ -199,6 +198,7 @@
199 </label>198 </label>
200 <input id="caption_altEndpoint_url" class="text_pole" type="text" placeholder="e.g. http://localhost:5001" />199 <input id="caption_altEndpoint_url" class="text_pole" type="text" placeholder="e.g. http://localhost:5001" />
201 </div>200 </div>
201 </div>
202 <div id="caption_prompt_block">202 <div id="caption_prompt_block">
203 <label for="caption_prompt" data-i18n="Caption Prompt">Caption Prompt</label>203 <label for="caption_prompt" data-i18n="Caption Prompt">Caption Prompt</label>
204 <textarea id="caption_prompt" class="text_pole" rows="1" placeholder="&lt; Use default &gt;">{{PROMPT_DEFAULT}}</textarea>204 <textarea id="caption_prompt" class="text_pole" rows="1" placeholder="&lt; Use default &gt;">{{PROMPT_DEFAULT}}</textarea>