Commit Graph

3164 Commits

Author SHA1 Message Date
mastertheknife c526fcedd7 Fix an issue created by commit 2b568906e5: Log flooded with image dimensions differ errors 2013-09-24 07:15:37 +03:00
Kyle Johnson 0b4292237b Upgrade and install preqs quietly 2013-09-23 16:05:56 -04:00
Kyle Johnson 87f0ba6c8e Added travis build status image to readme [ci skip] 2013-09-23 13:21:29 -04:00
Kyle Johnson fa805ac7bd Revert "Removed libtheora, libvorbis, libvpx and libx264 from apt dependencies."
This reverts commit fb43fdf04d.
2013-09-23 13:14:23 -04:00
Kyle Johnson fb43fdf04d Removed libtheora, libvorbis, libvpx and libx264 from apt dependencies.
These libs should be installed from source as part of ffmpeg.
2013-09-23 12:20:43 -04:00
Kyle Johnson 50122f09b1 Split out the zoneminder build options into individual steps 2013-09-23 12:18:17 -04:00
Kyle Johnson 88a9b434ff Split out the ffmpeg build options into individual steps 2013-09-23 12:17:59 -04:00
Isaac Connor 7e91053761 increase the hegiht of the window a bit, the contents are larger 2013-09-23 10:03:33 -04:00
Kyle Johnson f2c58acd94 Added missing build steps to generate build files to .travis.yml 2013-09-23 09:59:47 -04:00
Kyle Johnson aa5290ce3f Found an env variable to put me where I want to be 2013-09-23 09:51:40 -04:00
Kyle Johnson c5eb83c4f7 Use pushd and popd to move between ffmpeg and zoneminder 2013-09-23 09:48:30 -04:00
Kyle Johnson 6f9fa0debf Run as many make jobs as there are CPUs for the ffmpeg build 2013-09-23 09:26:22 -04:00
Kyle Johnson 2dce96f4e7 Trying to find the correct directory where the ZM clone lives 2013-09-23 09:22:44 -04:00
Kyle Johnson df13eb1242 Merge pull request #162 from knnniggett/streaming
Improve Chrome browser support & log streaming events
2013-09-23 06:15:46 -07:00
Kyle Johnson 304065cd51 Merge pull request #163 from knnniggett/fedora
Add fedora rpm development files to zoneminder source tree
2013-09-23 06:10:17 -07:00
Kyle Johnson 3e7f7621c1 cd back into the ZM dir, and run make after config 2013-09-23 08:51:31 -04:00
Kyle Johnson f4311ff13d Added IRC notifications to .travis.yml 2013-09-23 08:33:02 -04:00
Kyle Johnson e438714aea Initial commit of .travis.yml file, hopefully this builds. 2013-09-23 08:28:10 -04:00
Jan Dennis Bungart b428272f42 fixing debian docs file (README -> README.md) 2013-09-22 10:34:11 +08:00
Jan Dennis Bungart 7172930994 Fixing debian control file (libjpeg-turbo8 -> libjpeg8) 2013-09-22 10:21:20 +08:00
Jan Dennis Bungart a3519feffc Fixing postinst script and changelog needed for successful debian build 2013-09-22 10:01:30 +08:00
Knniggett b4da026bdf Add fedora files to zoneminder source tree 2013-09-21 16:36:00 -05:00
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