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
|
f3a807f1f8
|
Merge branch 'master' into storageareas
|
2019-01-07 09:21: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
|
1a75cf333e
|
Merge branch 'master' into storageareas
|
2019-01-05 11:12:38 -05:00 |
|
Isaac Connor
|
e34a5e972a
|
fix missing }
|
2019-01-05 11:12:26 -05:00 |
|
Isaac Connor
|
cf0d55d3db
|
Merge branch 'master' into storageareas
|
2019-01-05 10:59:01 -05:00 |
David Beitey
|
e6ba8e58ef
|
Fix #2391 by defining monitor variable (#2392)
|
2019-01-05 10:20:34 -05:00 |
|
Isaac Connor
|
8eb61b1c11
|
Merge branch 'master' into storageareas
|
2019-01-05 10:16:38 -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
|
ab198bfd75
|
remove master version of actions.php
|
2019-01-04 15:29:21 -05:00 |
|
Isaac Connor
|
52466c398b
|
Merge branch 'split_actions' into storageareas
|
2019-01-04 15:28:55 -05:00 |
|
Isaac Connor
|
b8d065275b
|
Merge branch 'master' into storageareas
|
2019-01-04 15:22:18 -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 |
|
Isaac Connor
|
5060358870
|
Merge branch 'master' into storageareas
|
2018-12-29 09:56:53 -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 |
|
Isaac Connor
|
1a1231fdaa
|
Merge branch 'master' into storageareas
|
2018-12-28 10:47:27 -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 |
|
Isaac Connor
|
3e06bbcef8
|
Merge branch 'master' into storageareas
|
2018-12-27 13:50:29 -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
|
2b8fa653ed
|
Merge branch 'small_groups_fixes' into storageareas
|
2018-12-24 09:48:36 -05:00 |
|
Isaac Connor
|
27826b4aca
|
Merge branch 'master' into storageareas
|
2018-12-24 09:48:29 -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
|
7a8beffdcc
|
Merge branch 'master' into storageareas
|
2018-12-20 15:10:52 -05:00 |
|
Isaac Connor
|
a277f697e9
|
whitespace
|
2018-12-20 14:58:38 -05:00 |
|
Isaac Connor
|
e626049f6b
|
Merge branch 'swresample' into storageareas
|
2018-12-20 14:08:40 -05:00 |
|
Isaac Connor
|
d4fb85a9aa
|
Merge branch 'master' into swresample
|
2018-12-20 09:16:27 -05:00 |
|
Isaac Connor
|
3a068ae6a3
|
Merge branch 'master' into swresample
|
2018-12-16 16:15:28 -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 |
|
Isaac Connor
|
0bfe1007c8
|
Merge branch 'master' into storageareas
|
2018-12-14 10:16:08 -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
|
21a98f3653
|
Merge branch 'remove_default_view' of https://github.com/connortechnology/ZoneMinder into connortechnology-remove_default_view
|
2018-12-11 09:44:13 -06:00 |
|
Isaac Connor
|
278abbc201
|
Merge branch 'master' into remove_default_view
|
2018-12-11 10:37:26 -05:00 |
|
Andrew Bauer
|
3cf6bf1786
|
Merge pull request #2243 from connortechnology/add_archive_filter_to_montagereview
Rough in an archived status filter in montagereview.
|
2018-12-11 09:36:35 -06:00 |
|
Andrew Bauer
|
fe5cb4bfdc
|
Merge pull request #2283 from connortechnology/warn_colour_when_disabled
Use a warning colour when motion detection is disabled.
|
2018-12-11 09:36:07 -06: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 |
|
Andrew Bauer
|
22460f580b
|
Merge pull request #2305 from pliablepixels/save-first-alarm
Save first alarm
|
2018-12-11 09:35:40 -06:00 |
|
Andrew Bauer
|
c530337c50
|
Merge pull request #2331 from connortechnology/fix_ios9
Fix ios9
|
2018-12-11 09:29:50 -06:00 |
|
Isaac Connor
|
c8c34d3f95
|
Merge branch 'master' into storageareas
|
2018-12-11 10:21:22 -05:00 |
|
Isaac Connor
|
b3bed9a28a
|
fix whitespace
|
2018-12-11 10:20:02 -05:00 |
|
Isaac Connor
|
e1ecd47bff
|
Fix missing use of UrlToApi
|
2018-12-11 09:40:40 -05:00 |
|
Isaac Connor
|
1e8c4276bb
|
fix #2319 some more. This is fixing rate sticking across gapless events and reload
|
2018-12-10 17:32:17 -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
|
50017057de
|
Merge branch 'master' into storageareas
|
2018-12-05 09:05:27 -05:00 |
|
Isaac Connor
|
9ffd77428a
|
fix paths to jquery-ui-theme components, thereby upgrading them to the proper version. This fixes the datetime filters not being shown on skins that don't specify a custom theme for jquery-ui
|
2018-12-05 09:05:10 -05:00 |
|
Isaac Connor
|
a9290759a5
|
Merge branch 'fix_ios9' into storageareas
|
2018-12-03 16:25:34 -05:00 |
|
Isaac Connor
|
18ce7c9ea0
|
Old browsers, specifically Safari on IOS9 doesn't support let. Need to use var instead.
|
2018-12-03 15:17:16 -05:00 |
|
Isaac Connor
|
27d4ba9e5f
|
use output of babeljs.io to provide code that works on older browsers. The nice class notation is ES6 upwards.. Safari on IOS9 doesn't like it
|
2018-12-03 15:16:47 -05:00 |
|
Isaac Connor
|
2df6d74a3e
|
Merge branch 'master' into storageareas
|
2018-12-02 17:15:12 -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
|
7d90a56561
|
Merge branch 'master' into storageareas
|
2018-11-30 14:46:42 -05:00 |
|
Isaac Connor
|
9bb4f1804e
|
Merge branch 'server_path_prefix'
|
2018-11-30 14:46:20 -05:00 |
|
Isaac Connor
|
8c626c984b
|
Need to pass port through all Url functions
|
2018-11-30 14:45:58 -05:00 |
|
Isaac Connor
|
fe45e83bb4
|
Fix PathToIndex
|
2018-11-29 15:54:25 -05:00 |
|
Isaac Connor
|
4cf7ff7fe4
|
Merge branch 'server_path_prefix' into storageareas
|
2018-11-29 15:53:58 -05:00 |
|
Isaac Connor
|
945770c819
|
Merge branch 'server_path_prefix'
|
2018-11-29 15:53:35 -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
|
af2bb992e9
|
Merge branch 'server_path_prefix' into storageareas
|
2018-11-29 14:33:46 -05:00 |
|
Isaac Connor
|
17551eacee
|
Merge branch 'server_path_prefix'
|
2018-11-29 14:27:32 -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
|
d83fb2e985
|
Merge branch 'master' of github.com:ZoneMinder/ZoneMinder
|
2018-11-29 14:08:03 -05:00 |
|
Isaac Connor
|
5e0d742e26
|
Use history.go(-1) which works on safari
|
2018-11-29 14:04:35 -05:00 |
|
Andrew Bauer
|
a74a9ae292
|
Merge pull request #2328 from pliablepixels/login-auth-relay
returns user=&pass= in credentials for auth_relay plain and none #2327
|
2018-11-29 09:59:09 -06:00 |