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

4877 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
a282b487d1 load Help from Config as it is not longer always loaded into ram. 2019-01-11 13:55:03 -05:00
Isaac Connor
b373577589 fix function view after actions cleanup 2019-01-10 12:08:25 -05:00
Isaac Connor
1d54216e80 spacing 2019-01-09 16:23:58 -05:00
Isaac Connor
c1e4fbac6a extend input path and options to the full width of the popup 2019-01-09 12:37:42 -05:00
Isaac Connor
2d03583b78 Merge branch 'master' of github.com:ZoneMinder/ZoneMinder 2019-01-08 13:12:42 -05:00
Isaac Connor
ffa37d8c10 Fix margins on replayControl 2019-01-08 13:12:35 -05:00
Isaac Connor
3f5a2a2aa6 disable delete button when event is archived. 2019-01-07 15:56:23 -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
David Beitey
e6ba8e58ef Fix #2391 by defining monitor variable (#2392) 2019-01-05 10:20:34 -05:00
Isaac Connor
5b5905c83a We always use markEids[] now 2019-01-04 16:29:16 -05:00
Isaac Connor
de0ef6ce43 Merge branch 'master' into split_actions 2019-01-04 15:55:54 -05:00
Isaac Connor
e72e4e7ce4 Spacing, remove some html4 stuff, clean up duplicated hidden form elements. 2019-01-04 15:52:36 -05:00
Isaac Connor
dea64320f0 Fix a + that should be a . 2019-01-04 15:52:14 -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
Andrew Bauer
225fca08e3 Merge pull request #2379 from connortechnology/improve_config_efficiency 
Improve config efficiency
 2019-01-02 19:34:34 -06:00
Isaac Connor
874930d8fc Merge branch 'master' into improve_config_efficiency 2019-01-02 13:07:53 -05:00
Isaac Connor
99471836b7 Use monitor's serverId when loading server object so that images load from recording server. 2019-01-02 11:28:12 -05:00
Isaac Connor
8a1707a615 Add monitorServerId array to provide server info for each monitor so that we can load images from the recording server. 2019-01-02 11:27:46 -05:00
Isaac Connor
79113a6869 Add a default Server object to handle non-multi-server case 2019-01-02 10:56:40 -05:00
Andrew Bauer
d14e9ecf74 force overloadframes and ExtendAlarmFrames to int (#2373) 2018-12-29 09:53:31 -05:00
Andrew Bauer
3258d8e590 remove ZM_DIR_IMAGES (#2374) 2018-12-29 09:52:58 -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
Isaac Connor
101f24feb5 Update area when editing x and y coords (#2366) 2018-12-27 14:28:14 -05:00
Andrew Bauer
5f9a113da1 redirect to montage rather than montagereview 2018-12-26 10:34:01 -06:00
Andrew Bauer
27dd8166ea Merge pull request #2362 from connortechnology/small_groups_fixes 
Small groups fixes
 2018-12-24 11:30:57 -06:00
Isaac Connor
e0a9c4a21e fix event popup detection 2018-12-24 11:23:58 -05:00
Isaac Connor
68adc289fe Fix colspan count now that depth is zero-based 2018-12-24 09:40:23 -05: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
0cce0a642b Update chosen library to 1.8.7 2018-12-24 09:37:49 -05:00
Andrew Bauer
153877b9c0 Merge pull request #2359 from connortechnology/fix_2353 
Update permissions checking for Groups to not use session. Fixes #2353
 2018-12-21 15:16:49 -06:00
Isaac Connor
1130d6650a Fix spacing and pass popup to previous/next event so that popups stay as popups 2018-12-21 10:50:19 -05:00
Isaac Connor
47465260d1 Update permissions checking for Groups to not use session. Fixes #2353 2018-12-21 10:01:48 -05:00
Isaac Connor
a277f697e9 whitespace 2018-12-20 14:58:38 -05:00
Pliable Pixels
622c17f628 make sure auth is regenerated each time we call this API (#2347) 2018-12-16 11:02:07 -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