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

3891 Commits

Author SHA1 Message Date
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
Andrew Bauer 3513f87163 Fix for shared data size conflict 2014-07-07 15:56:56 -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
Kyle Johnson 4cb0d7b1cd Use full path to zm_create.sql in bootstrap-zm.sh 2014-06-27 14:13:29 -04:00
Kyle Johnson 78c9ed2a7f Print out debug info in bootstrap-zm.sh 2014-06-27 14:08:57 -04:00
Isaac Connor 6e22278f74 password might be null when auth_relay is none. 2014-06-27 12:47:56 -04:00
Kyle Johnson 13f5bccb7c Try to cd back to the build root 2014-06-27 08:34:15 -04:00
Kyle Johnson 158432a8cf First shot at testing an individual monitor 2014-06-27 08:23:53 -04:00
Kyle Johnson 2e12a5fee7 Fix path to test.monitor.sql in run_tests 2014-06-27 08:06:04 -04:00
Kyle Johnson 5d81f59e3a Moved travis tests to their own script 2014-06-27 08:00:49 -04:00
Kyle Johnson 1ff907ae80 Reorganize the travis file. 2014-06-27 07:19:58 -04:00
Isaac Connor 07dbbd46d3 only do mmap on demand 2014-06-26 14:54:47 -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
Isaac Connor 5fac727c2f Users tab should always be available 2014-06-25 13:40:37 -04:00
Isaac Connor 11718f0559 The users tab should always be available. It is useful to configure users BEFORE turning on auth. 2014-06-25 13:39:31 -04:00
Carlo Landmeter b2323cb36d scripts: BusyBox compatibility 
BusyBox killall does not support long options using short options instead
 2014-06-25 11:19:15 +02:00
Isaac Connor f2eddf0850 Merge branch 'master' of github.com:ZoneMinder/ZoneMinder 2014-06-24 11:22:34 -04:00
Isaac Connor 0592276f53 fix mysql_escape_string calls after referring to docs 2014-06-24 11:22:08 -04:00
Kyle Johnson 229cfcaa5b Find the last occurrence of '@' in the host string. Fixes #443 2014-06-23 14:22:27 -04:00
Kyle Johnson 89209fbe4b Merge branch 'master' of github.com:ZoneMinder/ZoneMinder 2014-06-23 14:21:04 -04:00
Isaac Connor 924e65f42c Merge branch 'master' of github.com:ZoneMinder/ZoneMinder 2014-06-20 12:43:07 -04:00
Isaac Connor 0f4e9eb3e4 add these dependencies, apparently they are required for sftp upload 2014-06-17 10:54:42 -04:00
Isaac Connor 03abd3c936 Merge pull request #442 from Tim-Craig/master 
Fixed issue DateTime handling in filter queries that broke timeline view...
 2014-06-17 10:37:56 -04:00
tim 8ac6ce17bc Fixed issue DateTime handling in filter queries that broke timeline view. 2014-06-15 13:05:25 -07:00
Isaac Connor b48d06b279 change commands to handle if db already has the User and Pass fields 2014-06-13 16:09:01 -04:00