Commit Graph

4041 Commits

Author SHA1 Message Date
Isaac Connor 5a7c989ccd remove some crap that I pushed 2014-08-21 11:52:35 -04:00
Isaac Connor 6564c4359b adjust monitor popup height 2014-08-21 11:15:35 -04:00
Isaac Connor 707f2e84db increase monitor popup height to fit v4l settings in 2014-08-21 11:14:48 -04:00
Isaac Connor c6d19b3ecf whitespace issue 2014-08-21 11:14:38 -04:00
Isaac Connor f93a28f2be fixup multibuffering so it can have a null value which makes it fall back to config table 2014-08-21 11:13:38 -04:00
Isaac Connor 980a7a83bf Add some text referencing the settings on the monitor settings page 2014-08-21 10:04:08 -04:00
Isaac Connor 3d8ad2c906 fall back to Config table setting for v4l MultiBUgger and captures per frame. 2014-08-21 09:59:08 -04:00
Andrew Bauer ad364d090a rename and process zmsystemctl.pl.in 2014-08-19 17:19:44 -05:00
Isaac Connor 92d110859d Merge branch 'master' of github.com:ZoneMinder/ZoneMinder 2014-08-19 09:12:45 -04:00
Isaac Connor 5bc7242582 spaces vs tabs are important in rules, debian is more picky than ubuntu
fix placement of an if to prevent accessing unmapped mem_ptr
2014-08-19 09:11:49 -04:00
Kyle Johnson cda96c7ad9 Merge branch 'master' of github.com:ZoneMinder/ZoneMinder 2014-08-17 21:34:40 -04:00
Andrew Bauer 411d77dc7f remove obsoleted code 2014-08-13 19:02:59 -05:00
Kyle Johnson 6d92299d46 Merge pull request #440 from kylejohnson/master
Cleaning up the Contribution section of the README
2014-08-12 11:13:46 -04:00
Andrew Bauer 1e8e710f5a full systemd support 2014-08-10 08:47:11 -05:00
David Wilcox bde7fc8476 Minor corrections to README.OpenSuse
A few typos and a correction to a web link
2014-08-07 15:31:13 +01:00
Isaac Connor 7cbb079370 revert size check for now 2014-08-04 11:26:33 -04:00
Isaac Connor 56b4d8b230 Merge pull request #493 from cosmedd/master
Allow use other webservers than apache.
2014-08-04 11:16:43 -04:00
Cosme Domínguez Díaz 786f6518fa Allow use webservers other than apache. 2014-08-04 00:23:47 +02:00
Isaac Connor f0437c6ce4 sync to ubuntu version 2014-08-01 13:53:59 -04:00
Isaac Connor f48f2dbf30 update to same as ubuntu 2014-08-01 13:28:04 -04:00
Isaac Connor a87f75eee0 any size discrepancy is caused for bailing 2014-08-01 11:27:51 -04:00
root cca01dc357 connect to the monitor, because instantiating the object no longer does that 2014-07-30 14:20:48 -04:00
stevegilvarry bf1fd272df Turning on sticky sidebar 2014-07-30 21:55:57 +10:00
Isaac Connor 0834e1b61d I see no reason for these to be posts. They retrieve info, that's it. 2014-07-29 16:15:31 -04:00
Isaac Connor 96322dd59c remove v4l tab that I never used 2014-07-29 14:45:02 -04:00
Isaac Connor 2087780ec1 tweaks to make debian build with support for mariadb, update version and start using a fourth version digit set 2014-07-29 14:43:13 -04:00
Isaac Connor d5a7a1849a make zmupdate re-run the most recent update. 2014-07-29 09:47:22 -04:00
Isaac Connor 7147d47a76 Improve error messages when empty mmap file to reduce FAQ 2014-07-29 09:45:19 -04:00
Isaac Connor 585a1c50a1 Merge branch 'nommap' 2014-07-24 14:40:37 -04:00
Isaac Connor 0d229182f7 add the db updates for the V4L changes 2014-07-24 14:38:51 -04:00
Isaac Connor b2f1c2fe68 Merge branch 'v4l_to_monitor' 2014-07-24 14:35:23 -04:00
Isaac Connor e065e2b3cc add V4L 2014-07-24 11:37:10 -04:00
Isaac Connor 6d2be734d2 add mariadb as a dependency option 2014-07-24 11:24:57 -04:00
Isaac Connor 5e262f5a67 the var is remSockFile, not remSocketFile 2014-07-24 11:05:35 -04:00
Isaac Connor d6a34c0697 Merge branch 'master' of github.com:ZoneMinder/ZoneMinder 2014-07-23 15:47:08 -04:00
Isaac Connor b3f078eaa5 add the word disabled after function if the monitor is not enabled. 2014-07-23 15:46:37 -04:00
Andrew Bauer 05cf606337 Merge pull request #485 from florian-asche/patch-1
Update FI9821W_Y2k.pm
2014-07-22 12:19:55 -05:00
Florian Asche fa67e21c07 Update FI9821W_Y2k.pm
Fixed this issue:
"my" variable $cmd masks earlier declaration in same scope at FI9821W_Y2k.pm line 138.
"my" variable $cmd masks earlier declaration in same scope at FI9821W_Y2k.pm line 141.
"my" variable $cmd masks earlier declaration in same scope at FI9821W_Y2k.pm line 144.
"my" variable $cmd masks earlier declaration in same scope at FI9821W_Y2k.pm line 154.
"my" variable $cmd masks earlier declaration in same scope at FI9821W_Y2k.pm line 156.
"my" variable $cmd masks earlier declaration in same scope at FI9821W_Y2k.pm line 195.
"my" variable $cmd masks earlier declaration in same scope at FI9821W_Y2k.pm line 222.
"my" variable $cmd masks earlier declaration in same scope at FI9821W_Y2k.pm line 247.
"my" variable $cmd masks earlier declaration in same scope at FI9821W_Y2k.pm line 275.
"my" variable $cmd masks earlier declaration in same scope at FI9821W_Y2k.pm line 302.
"my" variable $cmd masks earlier declaration in same scope at FI9821W_Y2k.pm line 329.
"my" variable $cmd masks earlier declaration in same scope at FI9821W_Y2k.pm line 356.
"my" variable $cmd masks earlier declaration in same scope at FI9821W_Y2k.pm line 383.
"my" variable $cmd masks earlier declaration in same scope at FI9821W_Y2k.pm line 399.
"my" variable $cmd masks earlier declaration in same scope at FI9821W_Y2k.pm line 414.
"my" variable $cmd masks earlier declaration in same scope at FI9821W_Y2k.pm line 448.
"my" variable $cmd masks earlier declaration in same scope at FI9821W_Y2k.pm line 671.
"my" variable $cmd masks earlier declaration in same scope at FI9821W_Y2k.pm line 690.
2014-07-22 19:06:04 +02:00
SteveGilvarry 3277c6ceb8 Adding PPA Install 2014-07-16 23:36:10 +10:00
Isaac Connor 864f68197d change mysql-server to Recommends 2014-07-15 14:06:32 -04:00
Isaac Connor edd794a993 ensure captures_per_frame >0
add missing lang entries for MultiBuffer and CapturesPerFrame
2014-07-14 14:07:28 -04:00
Isaac Connor 8942e2367c add Makefile to ignores 2014-07-14 13:29:21 -04:00
Isaac Connor 4f694ee8cf fix 2014-07-14 13:07:23 -04:00
Isaac Connor 99a3684fb5 change the way v4l_multi_buffer is loaded. Since t's a bool, it theoretically is 1 byte, so can't use atoi 2014-07-14 12:53:48 -04:00
Isaac Connor 9385471392 move v4l_multibuffer and v4l_captures_per_frame from Config to Monitor and Local Camera 2014-07-13 16:39:27 -04:00
SteveGilvarry 9795967298 Initial attempt to migrate wiki to readthedocs 2014-07-13 22:25:30 +10:00
Isaac Connor eb5f299512 increase max_socket_tries to 10 as #470 2014-07-11 10:51:24 -04:00
Isaac Connor f33b127e7e add curl dependencies 2014-07-11 10:51:12 -04:00
Isaac Connor 29dd521f0f Merge branch 'master' of github.com:ZoneMinder/ZoneMinder 2014-07-09 11:44:49 -04:00
Isaac Connor 5c27ba8b1f I don't know why this never has the right # of coumns, so let's be specific 2014-07-09 11:44:07 -04:00