Skip to content

Allow tag names in languages ​​other than English & Bump version to 1.39.6 #4779

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
IgorA100 wants to merge 15 commits into
base: master
Choose a base branch
from
Open

Allow tag names in languages ​​other than English & Bump version to 1.39.6 #4779

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
15 commits
Select commit Hold shift + click to select a range
30564b4
Allow tag names in languages ​​other than English (zm_create.sql.in)
IgorA100 May 2, 2026
c3d3ea5
Create zm_update-1.39.6.sql
IgorA100 May 2, 2026
e365280
Bump version to 1.39.6 (zoneminder.spec)
IgorA100 May 2, 2026
fdc02fc
Bump version to 1.39.6
IgorA100 May 2, 2026
dce6965
Potential fix for pull request finding
IgorA100 May 2, 2026
c702d23
To avoid problems when modifying the database, we'll continue to use …
IgorA100 May 2, 2026
bf7b0a0
Merge branch 'master' into patch-121679
IgorA100 May 3, 2026
4d4af2b
Merge branch 'master' into patch-121679
IgorA100 May 3, 2026
1c989e8
Potential fix for pull request finding
IgorA100 May 6, 2026
673a6d0
Merge branch 'master' into patch-121679
IgorA100 May 6, 2026
4ff7020
Update zm_update-1.39.6.sql
IgorA100 May 6, 2026
8a45941
Merge branch 'master' into patch-121679
IgorA100 May 10, 2026
95bb320
Merge branch 'master' into patch-121679
IgorA100 May 15, 2026
6c7d749
Merge branch 'master' into patch-121679
IgorA100 May 23, 2026
a963154
Merge branch 'master' into patch-121679
IgorA100 Jun 1, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion db/zm_create.sql.in
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1379,7 +1379,7 @@ CREATE TABLE Reports (

CREATE TABLE `Tags` (
`Id` bigint(20) unsigned NOT NULL AUTO_INCREMENT,
`Name` varchar(64) CHARACTER SET latin1 COLLATE latin1_bin NOT NULL DEFAULT '',
`Name` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_bin NOT NULL DEFAULT '',
`CreateDate` TIMESTAMP DEFAULT CURRENT_TIMESTAMP,
`CreatedBy` int(10) unsigned,
`LastAssignedDate` dateTime,
Expand Down
6 changes: 6 additions & 0 deletions db/zm_update-1.39.6.sql
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
--
-- This updates a 1.39.5 database to 1.39.6
--
-- Make changes to the Tags table and change the Name column's COLLATE to utf8mb4_bin
--
ALTER TABLE `Tags` MODIFY `Name` VARCHAR(64) CHARACTER SET `utf8mb4` COLLATE `utf8mb4_bin` NOT NULL DEFAULT '';
2 changes: 1 addition & 1 deletion distros/redhat/zoneminder.spec
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
%global zmtargetdistro %{?rhel:el%{rhel}}%{!?rhel:fc%{fedora}}

Name: zoneminder
Version: 1.39.5
Version: 1.39.6
Release: 1%{?dist}
Summary: A camera monitoring and analysis tool
Group: System Environment/Daemons
Expand Down