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

5786 Commits

Author SHA1 Message Date
Isaac Connor 74c0d40b19 Merge pull request #1240 from knnniggett/zmtrigger 
zmtrigger - process off+time delay condition
 2016-01-18 10:37:26 -05:00
Andy Bauer 66c66106f5 Process off+time delay condition 2016-01-15 20:31:31 -06:00
Isaac Connor ebbecd5cc4 add php5-gd to depends. We use it for image scaling 2016-01-14 13:41:09 -05:00
Isaac Connor baa805ae60 alternatively, accept and eid and fid to specify the frame 2016-01-14 13:35:30 -05:00
Isaac Connor e057d8d722 rough in an Event object. 2016-01-14 13:34:51 -05:00
Isaac Connor f16fb5c5f6 use eid and fid instead of specifying the path to the image 2016-01-14 13:34:12 -05:00
Isaac Connor 02f8fb80da Put the monitor Id in the title so that it appears on mouseover. 2016-01-14 11:05:05 -05:00
Isaac Connor 7ce049dad1 add a title to each monitor with the name so that the mouseover will show it 2016-01-14 10:50:42 -05:00
Isaac Connor f1c7ada216 Merge branch 'storageareas' of github.com:ZoneMinder/ZoneMinder into storageareas 2016-01-14 09:42:18 -05:00
Isaac Connor cdda33f492 Merge branch 'storageareas' of github.com:ZoneMinder/ZoneMinder into storageareas 2016-01-14 09:42:31 -05:00
Isaac Connor ddf7b1ad43 Merge branch 'master' into storageareas 
Conflicts:
	web/skins/classic/js/dark.js
	web/skins/classic/js/flat.js
 2016-01-14 09:41:24 -05:00
Isaac Connor 4520902dd2 use trim on values when saving. 2016-01-14 09:37:41 -05:00
Isaac Connor 7700623b16 Move SQL debug to Execute 2016-01-13 09:02:37 -05:00
Isaac Connor 3ebeaec8ab Merge branch 'master' of github.com:ZoneMinder/ZoneMinder 2016-01-10 20:59:01 -05:00
Isaac Connor 47d4331d62 Add Hostname Column to create script, to match update 2016-01-10 20:58:45 -05:00
Isaac Connor 2d86e7713d increase height of logout popup to fit content 2016-01-08 12:14:01 -05:00
Andrew Bauer 7e4a12e7f7 Merge pull request #1233 from ZoneMinder/multi-server 
Multi server
 2016-01-08 10:11:49 -06:00
Isaac Connor f1831383da add a check for valid event link. Ignore anything that doesn't look right 2016-01-08 10:36:38 -05:00
Isaac Connor 818cd614eb Merge branch 'multi-server' into storageareas 2016-01-08 10:17:37 -05:00
Isaac Connor 574d94e9b6 Merge branch 'master' into multi-server 2016-01-08 10:16:26 -05:00
Isaac Connor d48ec1cfbe Add AddNewServer and Hostname entries 2016-01-08 10:15:41 -05:00
Isaac Connor 99dfaa97fa User Name instead of ServerName and Hostname instead of ServerHostname 2016-01-08 10:15:21 -05:00
Isaac Connor d13829c6f3 Add Hostname to list of servers, since we have the space for it. 2016-01-08 10:15:06 -05:00
Isaac Connor 5ce26ac4df Change logrotate defaults to daily/rotate 7, which works better with logcheck 2016-01-08 09:59:03 -05:00
Isaac Connor 53bd342f85 remove Google open Sans external import 2016-01-08 09:46:14 -05:00
Isaac Connor bc6ab974c9 Merge branch 'master' into storageareas 2016-01-06 17:46:06 -05:00
Andy Bauer d96757ba13 update changelog 2016-01-06 12:46:01 -06:00
Isaac Connor 5cdf352674 don't use sphinx 2016-01-05 15:36:44 -05:00
Isaac Connor b39c0dd292 Merge branch 'master' into storageareas 2016-01-05 15:35:48 -05:00
Isaac Connor 3066f66f25 add sphinx-rtd-theme 2016-01-05 13:21:54 -05:00
Isaac Connor 5c3c8b68a3 Add sphinx rtd theme as a dependency 2016-01-05 09:40:31 -05:00
Isaac Connor 270c737f40 Merge branch 'master' into storageareas 2016-01-05 09:36:36 -05:00
Isaac Connor 99c5af6036 Merge branch 'master' of github.com:ZoneMinder/ZoneMinder 2016-01-05 09:04:21 -05:00
Isaac Connor 41a8249ed9 update my package building script 2016-01-05 09:04:04 -05:00
Andrew Bauer 3a19c3c6e3 Merge pull request #1223 from ZoneMinder/multi-server 
Multi server
 2016-01-05 07:04:49 -06:00
Isaac Connor f0486e5b5e fix dumb mistake, undefing ZM_SERVBER_ID after setting it. 2016-01-04 22:07:07 -05:00
Isaac Connor 455f6d5b7b have to use ->Path() as {Path} might not be filled in 2016-01-04 15:57:35 -05:00
Simpler1 0d5d43251f Added lines to db/zm_create.sql.in for two cameras 2016-01-04 15:51:11 -05:00
Isaac Connor 88f902ea20 Merge branch 'storageareas' of github.com:ZoneMinder/ZoneMinder into storageareas 2016-01-04 15:29:10 -05:00
Isaac Connor 17adc2b4e5 Rough in a Monitor class 2016-01-04 15:27:42 -05:00
Isaac Connor 1504b368db Warning to Debug for Storage class with no Id 2016-01-04 15:21:23 -05:00
Isaac Connor 196339b48b Add new object classes to autoconf 2016-01-04 15:19:46 -05:00
Isaac Connor 1819f8ecad Merge branch 'storageareas' of github.com:ZoneMinder/ZoneMinder into storageareas 2016-01-04 15:17:43 -05:00
Isaac Connor 6e685ec8c8 add Monitor object class and use it in zmaudit.pl to print out path where monitor should have been 2016-01-04 15:13:01 -05:00
Isaac Connor f04ba9c87e linefeed when saying that a db monitor doesn't exist in fs 2016-01-04 15:05:49 -05:00
Isaac Connor 44f3b99d24 change logic to show server column if any servers are defined. Reason is that once you have setup 1, you want to know which cameras have not been assigned a server yet 2016-01-04 14:59:04 -05:00
Isaac Connor 75f6da3526 Merge branch 'multi-server' into storageareas 2016-01-04 14:53:52 -05:00
Isaac Connor 6ae1597671 Merge branch 'multi-server' of github.com:ZoneMinder/ZoneMinder into multi-server 2016-01-04 14:51:47 -05:00
Isaac Connor 273ab6c5c6 Only show Server column when more than 1 Servers are defined 2016-01-04 14:51:24 -05:00
Isaac Connor 1918b9b576 bump 2016-01-04 14:44:36 -05:00