Skip to content

Commit

Permalink
Merge branch 'release/4.2.2'
Browse files Browse the repository at this point in the history
  • Loading branch information
abidibo committed Dec 12, 2024
2 parents d644332 + bd2e083 commit 03c4003
Show file tree
Hide file tree
Showing 10 changed files with 14 additions and 11 deletions.
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ Baton 4.0.* introduces a bunch of new AI functionalities!
- image vision
- image generation

It also introduces themes, and makes it easier to customize the application, there is no need to recompile the js app unless you wanto to change primary and secondary colors or you need heavy customization.
It also introduces themes, and makes it easier to customize the application, there is no need to recompile the js app unless you want to change primary and secondary colors or you need heavy customization.

> New!
> Take a look at the new `django-baton-themes` repo: [django-baton-themes](https://github.com/otto-torino/django-baton-themes)
Expand Down
2 changes: 1 addition & 1 deletion baton/static/baton/app/dist/baton.min.js

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions baton/static/baton/app/package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion baton/static/baton/app/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "baton",
"version": "4.2.1",
"version": "4.2.2",
"description": "Django Baton App",
"main": "index.js",
"scripts": {
Expand Down
2 changes: 1 addition & 1 deletion baton/static/baton/app/src/core/AI.js
Original file line number Diff line number Diff line change
Expand Up @@ -170,7 +170,7 @@ const AI = {
self.handleVision(field, conf)
})
.prepend($('<i />', { class: 'fa fa-image' }))
.append($('<span />').text(` ${self.t.get('generateAltText')}: ${targetLabel.text().replace(':', '')}`))
.append($('<span />').text(` ${self.t.get('generateAltText')}${targetLabel ? ': ' + targetLabel.text().replace(':', '') : ''}`))
field.after(visionButton)
})
},
Expand Down
4 changes: 4 additions & 0 deletions baton/static/baton/app/src/styles/_main.scss
Original file line number Diff line number Diff line change
Expand Up @@ -54,6 +54,10 @@ input[type=checkbox] {
clear: both;
}

.hidden {
display: none !important;
}

// remove django 3.1 sidebar
#toggle-nav-sidebar,
#nav-sidebar {
Expand Down
3 changes: 1 addition & 2 deletions baton/templates/baton/ai_stats.html
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ <h2>
<span><strong style="font-weight: 900">Translations model</strong>: {{ translations_model }}</span>
<span><strong style="font-weight: 900">Summarizations model</strong>: {{ summarizations_model }}</span>
<span><strong style="font-weight: 900">Corrections model</strong>: {{ corrections_model }}</span>
<span><strong style="font-weight: 900">Vision model</strong>: {{ vision }}</span>
<span><strong style="font-weight: 900">Vision model</strong>: {{ vision_model }}</span>
<span><strong style="font-weight: 900">Images model</strong>: {{ images_model }}</span>
</div>
<script>
Expand Down Expand Up @@ -239,7 +239,6 @@ <h2>
mutations.forEach(function(mutation) {
if (mutation.type === "attributes") {
const theme = $('html').attr('data-bs-theme');
console.log('DRAWING CHART', theme)
aiChart.destroy();
drawChart(theme);
}
Expand Down
4 changes: 2 additions & 2 deletions docs/conf.py
Original file line number Diff line number Diff line change
Expand Up @@ -54,8 +54,8 @@
# built documents.
#
# The short X.Y version.
version = u'4.2.1'
release = u'4.2.1'
version = u'4.2.2'
release = u'4.2.2'

# The language for content autogenerated by Sphinx. Refer to documentation
# for a list of supported languages.
Expand Down
2 changes: 1 addition & 1 deletion setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@

setup(
name='django-baton',
version='4.2.1',
version='4.2.2',
packages=['baton', 'baton.autodiscover', 'baton.templatetags'],
include_package_data=True,
license='MIT License',
Expand Down
Binary file modified testapp/app/db.sqlite3
Binary file not shown.

0 comments on commit 03c4003

Please sign in to comment.