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

3635 Commits

Author SHA1 Message Date
Jan M. Hochstein c424f5bf45 Events API 2014-08-08 18:56:19 +02:00
Jan M. Hochstein 57498207b2 Analytics API 2014-08-08 18:56:19 +02:00
Jan M. Hochstein e83bdbbef3 Removed references to events 2014-08-08 18:56:18 +02:00
Jan M. Hochstein 69f1a44622 Removed references to analytics 2014-08-08 18:50:24 +02:00
Jan M. Hochstein ca5f83f691 remove temporary and generated files 2014-08-07 18:25:07 +02:00
Jan M. Hochstein 99e794a97b Removed hard coded binary path and perl binary location 2014-08-07 18:25:07 +02:00
Jan M. Hochstein e4155bcfa3 Refactor onvif client code 2014-08-07 18:25:07 +02:00
Jan M. Hochstein 5ab629856c Refactor onvif client code 2014-08-07 18:25:07 +02:00
altaroca 0e1ad0c573 Merge pull request #1 from knnniggett/478-onvif-support 
Add ONVIF files to rpm spec files
 2014-08-04 17:05:13 +02:00
altaroca 233d966daf Merge pull request #2 from knnniggett/onvif-ptz-script 
ptz control package name must match filename
 2014-08-04 06:29:24 +02:00
Andrew Bauer 254dffa633 Move ONVIF control script & add dB entry 2014-08-03 15:52:59 -05:00
Andrew Bauer 448b69f4a1 ptz control package name must match filename 2014-08-03 13:26:20 -05:00
Andrew Bauer cd35eb52d8 Add ONVIF files to rpm spec files 2014-08-03 10:48:56 -05:00
Jan M. Hochstein 64827dccbc CMake support for onvif modules 2014-07-15 17:41:05 +02:00
Jan M. Hochstein 3971e4cb3c Revert unintended changes 2014-07-15 13:42:27 +02:00
Jan M. Hochstein a91331de66 Added basic ONVIF support views 2014-07-14 20:59:36 +02:00
Jan M. Hochstein 0a2515c00e Added basic ONVIF support 2014-07-14 20:36:18 +02: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
Andrew Bauer 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
stevegilvarry 532615eea8 Modified zmlinkconent.sh.in to chown and chmod content folder. Fixes #463 2014-07-09 00:59:38 +10:00
Isaac Connor 8f88e2a6c0 Merge branch 'master' of github.com:ZoneMinder/ZoneMinder 2014-07-08 10:54:16 -04:00
Isaac Connor 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
Andrew Bauer 371c1bae3d Merge pull request #359 from knnniggett/eyezm 
fix eyezm authentication issue
 2014-07-07 17:57:48 -05:00
Andrew Bauer 5c8c00c1ab Fix double login issue with eyezm 2014-07-07 17:48:33 -05:00
Isaac Connor 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
Isaac Connor 936783bc41 Merge pull request #459 from whopperg/patch-1 
Update rules
 2014-07-07 09:46:24 -04:00
whopperg 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
Andrew Bauer 691791c647 Merge pull request #458 from knnniggett/arp 
Determine full path to arp
 2014-07-05 11:17:48 -05:00
Andrew Bauer 48d961082c Determine full path to arp 2014-07-05 11:11:36 -05:00
Andrew Bauer c2e2a12995 Merge pull request #406 from m-bene/focusPopup 
focus popup windows
 2014-07-04 13:00:45 -05:00
Andrew Bauer 9a0eb63df2 Merge pull request #415 from m-bene/selectSkin 
make skin selection persistent
 2014-07-04 12:57:37 -05:00
Andrew Bauer 5508747afb Merge pull request #457 from knnniggett/filter 
Fixes errors when opening Filters (issue #34)
 2014-07-04 11:34:49 -05:00
Andrew Bauer 5aad658262 Fixes errors when opening Filters (issue #34) 2014-07-04 11:00:00 -05:00
Andrew Bauer 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
Andrew Bauer 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
stevegilvarry a8d60aa727 Fixed missing $ on ARRAY(event[id]). Fixes #455 2014-07-02 23:58:44 +10:00
Andrew Bauer 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
stevegilvarry 61cf067be0 Wrap sort order. Fixes #450 2014-06-29 22:09:59 +10:00
Isaac Connor 6e22278f74 password might be null when auth_relay is none. 2014-06-27 12:47:56 -04:00
Isaac Connor 8f4fb8bb64 fix mysql_escape_String call. Must use strlen, not sizeof 2014-06-26 14:44:37 -04:00
Isaac Connor e2987067f4 add avtools instead of ffmpg 2014-06-26 13:09:52 -04:00
Isaac Connor 90b06060af fix missing ExtendAlarmFrames column when add Default ZonePreset 2014-06-26 11:17:09 -04:00
Isaac Connor 20bccdf431 use the size of the username and password when calling mysql_escape_string 2014-06-25 16:23:10 -04:00
Isaac Connor 79b7792466 Merge branch 'master' of github.com:ZoneMinder/ZoneMinder 
Conflicts:
	scripts/zmdc.pl.in
 2014-06-25 15:30:04 -04:00
Isaac Connor c58c4a9720 add the glue to define HOST_OS and use it to detect BSD and use different arguments to killall 2014-06-25 15:28:10 -04:00
Isaac Connor 676c73e26e Merge pull request #445 from clandmeter/busybox-compat 
scripts: BusyBox compatibility
 2014-06-25 15:24:51 -04:00
Isaac Connor 623837115b fix missing ARRAY() around params to dbFetchOne 2014-06-25 14:01:45 -04:00