mirror/zoneminder
1
0
Fork 0
mirror of https://github.com/ZoneMinder/zoneminder.git synced 2026-03-17 13:27:46 -04:00
Code Issues Packages Projects Releases Wiki Activity
12,349 Commits 80 Branches 104 Tags
84c812725e5322c87a0428fec83704580098e52d
Commit Graph

881 Commits

Author SHA1 Message Date
Isaac Connor
f726666f54 Merge branch 'master' into h265 2019-01-14 12:36:11 -05:00
Isaac Connor
c834fbe462 the filter action should singular filter, not filters 2019-01-13 14:52:39 -05:00
Isaac Connor
b373577589 fix function view after actions cleanup 2019-01-10 12:08:25 -05:00
Isaac Connor
b4f8500cb5 Merge branch 'split_actions' 2019-01-05 18:33:04 -05:00
Isaac Connor
3f10553464 Fix include path to Monitors.php 2019-01-05 18:32:53 -05:00
Isaac Connor
e34a5e972a fix missing } 2019-01-05 11:12:26 -05:00
Isaac Connor
5b5905c83a We always use markEids[] now 2019-01-04 16:29:16 -05:00
Isaac Connor
0e20666992 fix eventdetail actions being in events 2019-01-04 15:43:31 -05:00
Isaac Connor
e2f32ab091 Upgrade config saving 2019-01-04 09:43:36 -05:00
Isaac Connor
7ec96655c3 fix missing ! when testing for permission on editing config 2019-01-04 09:37:26 -05:00
Isaac Connor
5b9bf48945 Merge branch 'master' into split_actions 2019-01-04 09:35:54 -05:00
Isaac Connor
46adcbb66b Merge branch 'master' of github.com:ZoneMinder/ZoneMinder 2019-01-04 09:34:51 -05:00
Isaac Connor
edeaa07c12 Fix no quotes around Id 2019-01-04 09:34:42 -05:00
Isaac Connor
6cad852e11 fix path to MontageLayout 2019-01-04 09:34:18 -05:00
Isaac Connor
dbe9817bc8 Split actions.php into individual files per view 2019-01-04 09:26:34 -05:00
Isaac Connor
874930d8fc Merge branch 'master' into improve_config_efficiency 2019-01-02 13:07:53 -05:00
Andrew Bauer
d14e9ecf74 force overloadframes and ExtendAlarmFrames to int (#2373) 2018-12-29 09:53:31 -05:00
Andrew Bauer
a029909972 fix path to thumb and anal images (#2367) 2018-12-28 10:46:13 -05:00
Andrew Bauer
fb37fc48e1 update viewImagePatch (#2370) 2018-12-28 10:38:39 -05:00
Andrew Bauer
5f9a113da1 redirect to montage rather than montagereview 2018-12-26 10:34:01 -06:00
Isaac Connor
e0cae5709f Group::find is now more powerful so we can just use it to return all Groups to be deleted 2018-12-24 09:39:40 -05:00
Isaac Connor
63199289ad Change depth function to be 0-based. 2018-12-24 09:38:55 -05:00
Isaac Connor
a277f697e9 whitespace 2018-12-20 14:58:38 -05:00
Mike Rosack
567b60ffa7 support for forwarded proto/port in Server.php (#2343) 2018-12-13 10:24:32 -05:00
Andrew Bauer
8d74354fcb Merge pull request #2242 from connortechnology/cleanup_auth 
Cleanup auth
 2018-12-12 20:53:24 -06:00
Isaac Connor
eba8b3327d Merge branch 'master' into cleanup_auth 2018-12-11 16:04:42 -05:00
Andrew Bauer
4d7e98475f Merge pull request #2297 from connortechnology/introduce_getBodyTopHTML 
Introduce get body top html
 2018-12-11 09:35:54 -06:00
Isaac Connor
e1ecd47bff Fix missing use of UrlToApi 2018-12-11 09:40:40 -05:00
Isaac Connor
a1141d2dc4 remove second use of HTTP_HOST and use a better method of stripping off port from HTTP_HOST 2018-12-07 08:39:23 -05:00
Isaac Connor
757e538550 strip port from HTTP_HOST 2018-12-06 17:12:03 -05:00
Isaac Connor
bc5f8d0d8d rework pts/dts of audio stream. Spacing. Fix crash 2018-12-04 18:23:08 -05:00
Andrew Bauer
e327ad100e fix WebSite camera startup issue 2018-12-01 17:03:50 -06:00
Andrew Bauer
cae6ffd5a3 use HTTP_HOST instead of SERVER_NAME 2018-12-01 13:27:08 -06:00
Isaac Connor
4272225a17 Merge branch 'master' into h265 2018-11-30 16:42:16 -05:00
Isaac Connor
8c626c984b Need to pass port through all Url functions 2018-11-30 14:45:58 -05:00
Isaac Connor
3bd5774ea1 Default to PathToIndex should have the index.php in it 2018-11-29 15:53:19 -05:00
Isaac Connor
1c17f334d3 fix missing bits. Implement UrlToIndex in Monitor and fix use of Url(). Implement PathToApi as well 2018-11-29 14:26:30 -05:00
Isaac Connor
1e915e9567 Merge branch 'master' into server_path_prefix 2018-11-28 10:45:36 -05:00
Isaac Connor
f8b2ff5c77 rework from Url() to PathToIndex(), PathToZMS(), UrlToIndex() and UrlToZMS() 2018-11-27 17:35:25 -05:00
Isaac Connor
17c1933913 remove an extra l 2018-11-26 16:20:15 -05:00
Isaac Connor
c5f7fb7b18 Merge branch 'master' into server_path_prefix 2018-11-22 10:04:33 -05:00
Isaac Connor
62e511cfd1 Merge branch 'master' into h265 2018-11-17 10:41:20 -05:00
Isaac Connor
415d43fafb Include Server Name when testing for CORS. Also be case insensitive. 2018-11-15 12:23:52 -05:00
Isaac Connor
e24a308481 Merge branch 'master' into h265 2018-11-14 17:15:37 -05:00
Isaac Connor
ec09a71ba0 Include defaults for all the missing Monitor Columns 2018-11-07 13:18:53 -05:00
Isaac Connor
702143e51b Create a function called getBodyTopHTML that outputs the body tag and anything else that should go at the top. 
Things like the we require javascript message, and any other messages like error messages.
Use this on the monitor and console view to stick an error message at the top when saving a monitor fails.

This is a pretty quick, crude implementation.
 2018-11-07 12:33:54 -05:00
Isaac Connor
a066968aca fix dbError and cause it to return the error string instead of just logging it. Add error logging of db errors that don't throw exceptions. 2018-11-07 12:33:18 -05:00
Isaac Connor
bdb50567df fix disk_event_space to event_disk_space 2018-10-31 11:56:08 -04:00
Isaac Connor
6691b5fb52 Include CORS headers when there is a Server defined, instead of requiring there to be more than 1 2018-10-29 12:50:50 -04:00
Isaac Connor
95a6d0666a Improve behaviour and reduce extra logging when db goes away 2018-10-29 09:59:26 -04:00