ZaneYork
/
zoneminder
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'master' of github.com:ZoneMinder/ZoneMinder

This commit is contained in:
Isaac Connor 2015-07-09 11:00:05 -04:00
parent 51631b84b4 1328ba456a
commit 42ac3ceb3b
2 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
db/zm_update-1.28.99.sql
View File

@ -336,7 +336,7 @@ SET @s = (SELECT IF(
AND column_name = 'Id' AND column_name = 'Id'
) > 0, ) > 0,
"SELECT 'Column Id exists in States'", "SELECT 'Column Id exists in States'",
"ALTER TABLE States ALTER Name DROP PRIMARY KEY;ALTER TABLE `States` ADD `Id` int(10) unsigned auto_increment NOT NULL PRIMARY KEY FIRST" "ALTER TABLE States DROP PRIMARY KEY;ALTER TABLE `States` ADD `Id` int(10) unsigned auto_increment NOT NULL PRIMARY KEY FIRST"
)); ));
PREPARE stmt FROM @s; PREPARE stmt FROM @s;

1
web/api/.htaccess
View File

@ -2,4 +2,5 @@
RewriteEngine on RewriteEngine on
RewriteRule ^$ app/webroot/ [L] RewriteRule ^$ app/webroot/ [L]
RewriteRule (.*) app/webroot/$1 [L] RewriteRule (.*) app/webroot/$1 [L]
RewriteBase /zm/api
</IfModule> </IfModule>