ZaneYork
/
zoneminder
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
3,042 Commits 20 Branches 69 Tags 131 MiB
Commit Graph

3042 Commits

Author SHA1 Message Date
Knniggett 6d00540b5d Improve Chrome browser support & log streaming events 2013-09-21 14:52:41 -05:00
Isaac Connor 07fd2b11fe blah 2013-09-18 13:04:28 -04:00
Isaac Connor b08a8252c4 Merge branch 'dukess-master' into v1.26.4-beta 
Conflicts:
	scripts/zmupdate.pl.in
 2013-09-18 13:03:54 -04:00
Isaac Connor b80ac24c76 Merge branch 'master' of github.com:ZoneMinder/ZoneMinder 2013-09-18 13:00:06 -04:00
Isaac Connor c9ad6e661a Merge branch 'master' of https://github.com/dukess/ZoneMinder into dukess-master 2013-09-18 12:57:26 -04:00
Isaac Connor eba8b0dde0 move this into the distros dir 2013-09-18 12:51:10 -04:00
Andy Bauer d02f6ee0d3 Merge branch 'debian2' of https://github.com/knnniggett/ZoneMinder into knnniggett-debian2 2013-09-17 18:39:33 -05:00
Andy Bauer 4123f2be1c Can't seem to catch a break tonight. Moving dian files into correct folder. 2013-09-17 18:32:53 -05:00
Andy Bauer d7dc4ce4ed Merge branch 'debian' of https://github.com/knnniggett/ZoneMinder into knnniggett-debian 2013-09-17 18:02:24 -05:00
Andy Bauer e30a43bc0a Move debian folder under distros 2013-09-17 17:50:50 -05:00
mastertheknife 5a9364703c a better fix for the sign comparison warnings during compilation 2013-09-17 10:28:59 +03:00
Andy Bauer 7d5e0d3ba2 Update README.Fedora 
Update README.Fedora installation instructions. Fixes issue #145.
 2013-09-16 08:21:37 -05:00
Andy Bauer 46aa2e0ebb Merge pull request #141 from knnniggett/redhat 
Removing the redhat folder from the root for real this time
 2013-09-15 15:07:39 -07:00
abauer 2858a58f79 Removing the redhat folder from the root for real this time 2013-09-15 17:03:40 -05:00
Andy Bauer ee5413f5d9 Merge pull request #136 from knnniggett/redhat 
Add Redhat rpm dev files to distros/redhat
 2013-09-15 14:41:37 -07:00
abauer efc729110a Move redhat folder to a subfolder called distros 2013-09-15 16:33:09 -05:00
Isaac Connor ab4c091693 change eq's to le's so that it runs scripts for upgrading from 1.26.0 2013-09-15 12:59:45 -04:00
Isaac Connor 7173b42d67 Merge branch 'master' of github.com:ZoneMinder/ZoneMinder 2013-09-15 12:56:27 -04:00
mastertheknife c3f7af7cd1 Fix sign warning during compilation 2013-09-15 04:13:09 +03:00
Kyle Johnson f0006404cc Merge pull request #121 from rkojedzinszky/master 
Rewrote the logState() sql query to allow mysql to use indexes
 2013-09-14 17:43:43 -07:00
Andy Bauer 4cc80d4cc5 Update zoneminder.1.26.el6.spec 
Removed reference to a patch that has been added upstream
 2013-09-14 12:14:08 -05:00
Andy Bauer a6d3b35996 Delete zoneminder-1.25.0-installfix.patch 
no longer needed.  Fix has been added to latest branch.
 2013-09-14 12:11:49 -05:00
Serguei S. Dukachev ed9f647dd7 Update actions.php 
SQL-ERR 'Incorrect integer value: '' for column 'Enabled' at row 1', statement was 'update Monitors set Function = 'Monitor', Enabled = '' where Id = '2''
 2013-09-13 03:48:01 -07:00
Serguei S. Dukachev 67595c1c84 Error correction 
Table "Users":
ERROR 1366 (HY000) at line 523: Incorrect integer value: '' for column 'Id' at row 1

Table "MonitorPresets":
ERROR 1366 (HY000) at line 550: Incorrect integer value: '' for column 'Id' at row 1
...and many others like this

Incorrect 'channel' field type in table "MonitorPresets":
ERROR 1366 (HY000) at line 550: Incorrect integer value: 'simple' for column 'Channel' at row 1
...and many others like this

"DefaultValue" field is very small in table "Config":
ERROR 1406 (22001) at line 743: Data too long for column 'DefaultValue' at row 1

Some 'INSERT INTO MonitorPresets' querys are wrong.

"Message" field is very small in table "Logs":
Can't write log entry 'insert into Logs ( TimeKey, Component, Pid, Level, Code, Message, File, Line ) values ( 1379059494.570980, 'web_php', 30387, -3, 'FAT', 'SQL-ERR \'Incorrect decimal value: \'\' for column \'MaxFPS\' at row 1\', statement was \'insert into Monitors set LinkedMonitors = \'\', Name = \'test\', Type = \'Remote\', Function = \'Monitor\', Enabled = \'1\', RefBlendPerc = \'12\', MaxFPS = \'\', AlarmMaxFPS = \'\', Device = \'/dev/video0\', Channel = \'0\', Format = \'255\', Palette = \'0\', LabelFormat = \'%N - %d/%m/%y %H:%M:%S\', LabelX = \'0\', LabelY = \'0\', ImageBufferCount = \'50\', WarmupCount = \'25\', PreEventCount = \'25\', PostEventCount = \'25\', StreamReplayBuffer = \'1000\', AlarmFrameCount = \'1\', EventPrefix = \'Event-\', SectionLength = \'600\', FrameSkip = \'0\', FPSReportInterval = \'1000\', DefaultView = \'Events\', DefaultRate = \'100\', DefaultScale = \'100\', WebColour = \'red\', SignalCheckColour = \'#0000c0\', Protocol = \'http\', Method = \'simple\', Host = \'192.168.3.225\', Port = \'80\', Path = \'\', Colours = \'3\', Width = \'320\', Height = \'240\', Orientation = \'0\', Deinterlacing = \'0\', Sequence = 1\'', 'includes/database.php', 78 )': Data too long for column 'Message' at row 1
 2013-09-13 01:34:00 -07:00
Richard Kojedzinszky 0f5c90bbe4 Rewritten the query to allow mysql to use indexes 
On a system with heavy logging, without this the login procedure took
too long.
 2013-09-12 22:46:26 +02:00
Isaac Connor ab1314f250 clean out autogenerated files 2013-09-12 14:43:57 -04:00
Isaac Connor e21a08c4b6 new code to look for update scripts instead of having distinct lines for each 2013-09-12 14:40:02 -04:00
Isaac Connor 304e10e456 $DESTDIR needs to be added to paths to ensure that the changes are made in the chroot when building packages. 2013-09-12 14:00:10 -04:00
Isaac Connor 11d0428a20 add some more lines from iconnor tree to create and set permissions on dirs in /run and /tmp 2013-09-12 13:58:37 -04:00
Isaac Connor f4a7101d82 bump version 2013-09-12 13:58:18 -04:00
Isaac Connor c612977a12 Since this got renamed, have to rename it here too 2013-09-12 13:55:54 -04:00
Isaac Connor fcf7e5b188 Redo the patch that added the <0 test. Since it isn't an actual error there won't be an error message set so I've made it another case entirely. 2013-09-12 13:54:03 -04:00
Isaac Connor 3f4e13dd47 redo the patch that add the < 0 test. Since it isn't technically an error, there won't be an error message set by php. So I've made it it's own separate case and added whcih socket is having the problem to some of the other error messages as well. 2013-09-12 10:51:51 -04:00
Andy Bauer 0dd98ccdd1 Merge pull request #119 from knnniggett/zmupdate_zm.1.26.3 
Update zmupdate.pl.in for 1.26.3 release
 2013-09-10 11:16:10 -07:00
Andy Bauer 1d664f22ac exclude zm_update-1.26.3.sql since it has already been added 2013-09-10 13:14:16 -05:00
Andy Bauer 0bf9aacab2 Update zmupdate.pl.in for 1.26.3 release 2013-09-10 12:46:33 -05:00
Kyle Johnson 57ce1bed8d Adding the db/zm_update file so that the upgrade script works 2013-09-10 13:42:56 -04:00
mastertheknife a44bc63d29 Merge branch 'master' of github.com:ZoneMinder/ZoneMinder into mybranch 2013-09-10 19:23:04 +03:00
Kyle Johnson 219f21a904 Bumping the version numbers. 2013-09-10 11:50:39 -04:00
mastertheknife 2b568906e5 Fixed greyscale four field deinterlacing not processing last line, broken ssse3 color->greyscale conversion and improved error handling when reading\decoding jpegs 2013-09-10 18:37:56 +03:00
Isaac Connor f8c4897031 put this back so we can get on with life 2013-09-10 08:52:59 -04:00
Kyle Johnson 64ec75b7a5 Updated AUTHORS to reflect recent changes to the project 2013-09-09 10:06:36 -04:00
mastertheknife c9cf31b271 Merge branch 'master' of github.com:ZoneMinder/ZoneMinder 2013-09-09 17:04:02 +03:00
Kyle Johnson 45c32951b7 Point to the GitHub issues page for the list of current bugs 2013-09-09 09:45:29 -04:00
mastertheknife caa73f608b Merge remote-tracking branch 'origin/develop' 2013-09-09 16:44:58 +03:00
Isaac Connor 1b2b21d1bb rough in a quick script to help people generate the build files 2013-09-08 15:15:58 -04:00
Kyle Johnson 6c134f9b4b Merge pull request #116 from knnniggett/zmupdate_newrelease 
Add 1.26.1 and 1.26.2 releases to zmupdate
 2013-09-07 19:07:37 -07:00
Knniggett 0268389907 initial upload of files used to build rpm 2013-09-07 16:51:54 -05:00
Knniggett 8f3d95fd38 modify zmupdate.pl.in 2013-09-07 15:11:57 -05:00
Knniggett d4179035de Modify zmupdate for 1.26.1 and 1.26.2 releases 2013-09-07 15:08:09 -05:00