0d229182f7
add the db updates for the V4L changes
2014-07-24 14:38:51 -04:00
b2f1c2fe68
Merge branch 'v4l_to_monitor'
2014-07-24 14:35:23 -04:00
e065e2b3cc
add V4L
2014-07-24 11:37:10 -04:00
6d2be734d2
add mariadb as a dependency option
2014-07-24 11:24:57 -04:00
5e262f5a67
the var is remSockFile, not remSocketFile
2014-07-24 11:05:35 -04:00
d6a34c0697
Merge branch 'master' of github.com:ZoneMinder/ZoneMinder
2014-07-23 15:47:08 -04:00
b3f078eaa5
add the word disabled after function if the monitor is not enabled.
2014-07-23 15:46:37 -04:00
05cf606337
Merge pull request #485 from florian-asche/patch-1
...
Update FI9821W_Y2k.pm
2014-07-22 12:19:55 -05:00
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
3277c6ceb8
Adding PPA Install
2014-07-16 23:36:10 +10:00
864f68197d
change mysql-server to Recommends
2014-07-15 14:06:32 -04:00
edd794a993
ensure captures_per_frame >0
...
add missing lang entries for MultiBuffer and CapturesPerFrame
2014-07-14 14:07:28 -04:00
8942e2367c
add Makefile to ignores
2014-07-14 13:29:21 -04:00
4f694ee8cf
fix
2014-07-14 13:07:23 -04:00
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
9385471392
move v4l_multibuffer and v4l_captures_per_frame from Config to Monitor and Local Camera
2014-07-13 16:39:27 -04:00
9795967298
Initial attempt to migrate wiki to readthedocs
2014-07-13 22:25:30 +10:00
eb5f299512
increase max_socket_tries to 10 as #470
2014-07-11 10:51:24 -04:00
f33b127e7e
add curl dependencies
2014-07-11 10:51:12 -04:00
29dd521f0f
Merge branch 'master' of github.com:ZoneMinder/ZoneMinder
2014-07-09 11:44:49 -04:00
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
7b156cfb20
Merge pull request #465 from SteveGilvarry/463-chown-chmod-Content-dir
...
Modified zmlinkcontent to chown and chmod content folder. Fixes #463
2014-07-08 14:24:50 -05:00
532615eea8
Modified zmlinkconent.sh.in to chown and chmod content folder. Fixes #463
2014-07-09 00:59:38 +10:00
8f88e2a6c0
Merge branch 'master' of github.com:ZoneMinder/ZoneMinder
2014-07-08 10:54:16 -04:00
2be38d7f32
fix problem editing users, a semi-colon screwed up the if statement.
...
Also change behaviour so that if a user is specified, and doesn't load, generate an error.
This also removes a search for empty user id in the db
2014-07-08 10:52:55 -04:00
371c1bae3d
Merge pull request #359 from knnniggett/eyezm
...
fix eyezm authentication issue
2014-07-07 17:57:48 -05:00
5c8c00c1ab
Fix double login issue with eyezm
2014-07-07 17:48:33 -05:00
3513f87163
Fix for shared data size conflict
2014-07-07 15:56:56 -05:00
70471936a7
get rid of escapeSql and replace it's calls with new PDO-style calls to FetchOne FetchALl,e etc
2014-07-07 10:06:50 -04:00
936783bc41
Merge pull request #459 from whopperg/patch-1
...
Update rules
2014-07-07 09:46:24 -04:00
4a070f93bb
Update rules
...
There was a missing tab-indent. So dpkg-buildpackage under debian didnt work:
Error:
debian/rules:77: *** missing separator. Stop.
2014-07-06 11:48:41 +02:00
691791c647
Merge pull request #458 from knnniggett/arp
...
Determine full path to arp
2014-07-05 11:17:48 -05:00
48d961082c
Determine full path to arp
2014-07-05 11:11:36 -05:00
c2e2a12995
Merge pull request #406 from m-bene/focusPopup
...
focus popup windows
2014-07-04 13:00:45 -05:00
9a0eb63df2
Merge pull request #415 from m-bene/selectSkin
...
make skin selection persistent
2014-07-04 12:57:37 -05:00
5508747afb
Merge pull request #457 from knnniggett/filter
...
Fixes errors when opening Filters (issue #34 )
2014-07-04 11:34:49 -05:00
5aad658262
Fixes errors when opening Filters (issue #34 )
2014-07-04 11:00:00 -05:00
9163536219
Merge pull request #358 from knnniggett/prevbutton
...
Fix prev button while in gapless mode. All buttons tested and working.
2014-07-04 10:33:05 -05:00
841d6c50d8
Merge pull request #456 from SteveGilvarry/455-Flat-Skin-Export-Functions
...
Fixed missing $ on ARRAY(event[id]). Fixes #455
2014-07-02 09:13:57 -05:00
a8d60aa727
Fixed missing $ on ARRAY(event[id]). Fixes #455
2014-07-02 23:58:44 +10:00
471014e28f
Merge pull request #451 from SteveGilvarry/450-log-ajax-load-order
...
Wrap sort order. Fixes #450
2014-06-29 08:01:05 -05:00
61cf067be0
Wrap sort order. Fixes #450
2014-06-29 22:09:59 +10:00
4cb0d7b1cd
Use full path to zm_create.sql in bootstrap-zm.sh
2014-06-27 14:13:29 -04:00
78c9ed2a7f
Print out debug info in bootstrap-zm.sh
2014-06-27 14:08:57 -04:00
6e22278f74
password might be null when auth_relay is none.
2014-06-27 12:47:56 -04:00
13f5bccb7c
Try to cd back to the build root
2014-06-27 08:34:15 -04:00
158432a8cf
First shot at testing an individual monitor
2014-06-27 08:23:53 -04:00
2e12a5fee7
Fix path to test.monitor.sql in run_tests
2014-06-27 08:06:04 -04:00
5d81f59e3a
Moved travis tests to their own script
2014-06-27 08:00:49 -04:00
1ff907ae80
Reorganize the travis file.
2014-06-27 07:19:58 -04:00
Isaac Connor
Andrew Bauer
Florian Asche
SteveGilvarry
stevegilvarry
Isaac Connor
whopperg
Kyle Johnson
Kyle Johnson