69be26213a
Merge branch 'master' of github.com:zoneminder/ZoneMinder
2020-08-27 11:55:26 -04:00
dc15663030
Fix scales after applying layout
2020-08-27 10:55:14 -04:00
ccaea26928
Fix logic on MonitorFlip Cookie value
2020-08-27 10:54:54 -04:00
6173890a45
Merge branch 'master' of github.com:ZoneMinder/zoneminder
2020-08-27 10:34:00 -04:00
702ea365c2
Remove cruft and fix the filter bar toggle
2020-08-27 10:33:52 -04:00
4c1446d856
Fixes to scale selection and remove code that altered width&height in zms url. zms doesn't honour them. Calculate new scale and alter that parameter.
2020-08-27 10:33:08 -04:00
62eddfdf2b
reorganize code a bit for better logical grouping
2020-08-27 10:31:27 -04:00
c0d543cd47
Add code to handle monitorsfilterbar on montage
2020-08-27 10:31:06 -04:00
dd3d315964
A a.flip float right and put a clear:both after the contents of #header so that it has space after content has been toggled
2020-08-27 10:30:27 -04:00
11f165a99f
remove width and height from zms url. zms doesn't support them and having them in the url is confusing
2020-08-27 10:29:50 -04:00
4bacb136c9
enable page-jump-to table extension
2020-08-27 07:46:52 -05:00
e8a2bbf6e0
continue to fix corrupted merge conflict
2020-08-27 07:42:39 -05:00
9b69eb5762
fix corrupted merge conflict
2020-08-27 07:35:05 -05:00
43b4177a5b
fix crash due to incomplete code
2020-08-27 08:14:45 -04:00
b451c323e9
remove debug code at Warning level
2020-08-26 18:40:31 -04:00
367c060790
remove unwanted patch files
2020-08-26 17:07:58 -05:00
280964f33f
reapply commit d3cc4d5
2020-08-26 17:06:01 -05:00
8ba91db1fb
make logout view a modal
2020-08-26 16:28:11 -05:00
4d5d2ecd5d
Merge pull request #3030 from Carbenium/nullptr
...
Convert NULL/0 to nullptr
2020-08-26 16:54:28 -04:00
8d202aeef0
eslint
2020-08-26 15:36:38 -05:00
8f980a1168
Convert NULL/0 to nullptr
...
The 0 -> nullptr changes should definitely improve readability.
2020-08-26 22:03:40 +02:00
ab68bef39a
Merge branch 'master' into filter_pre_post
2020-08-26 15:28:48 -04:00
99472242af
Merge branch 'master' of github.com:ZoneMinder/zoneminder
2020-08-26 15:16:36 -04:00
0ced21dda7
Persist video volume in a cookie so that subsequent events remember the volume level.
...
Fixes #3013
2020-08-26 15:15:57 -04:00
67fe9d0cb4
un-popup the users views
2020-08-26 13:52:10 -05:00
8c4f89c099
requested dark skin changes
2020-08-26 13:31:58 -05:00
bb6218a1ba
Merge pull request #3028 from Carbenium/config-split
...
Extract generated part of zm_config.h into zm_config_data.h
2020-08-26 13:42:54 -04:00
24d1ba3a00
fix eslint
2020-08-26 13:41:40 -04:00
b4fbe84f6b
Merge branch 'master' of github.com:ZoneMinder/zoneminder
2020-08-26 13:31:36 -04:00
abebc74e1e
sphinx-build is in python3-sphinx
2020-08-26 13:31:32 -04:00
1c7bddf96e
monitor config no longer a popup
2020-08-26 12:22:19 -05:00
ac7867eab3
make function view a modal
2020-08-26 11:39:48 -05:00
f003dd7782
remove zoneinder-upload folder from cmakelists
2020-08-25 16:57:06 -05:00
06dfe9b987
Extract generated part of zm_config.h into zm_config_data.h
...
With this change IDEs have it easier to correctly reference the
variable/class declarations. Additionally one does not have to
regenerate the zm_config.h file when changing the code.
2020-08-25 23:33:56 +02:00
9cc71900ba
Merge pull request #3027 from Carbenium/config-warning
...
zm_config: Fix a -Wwrite-string warning
2020-08-25 15:37:06 -04:00
394426cca2
zm_config: Fix a -Wwrite-string warning
...
For reference:
/home/peterke/DEV/zoneminder/build/src/zm_config.h:31:26: warning: ISO C++ forbids converting a string constant to ‘char*’ [-Wwrite-strings]
2020-08-25 20:51:42 +02:00
06942746d6
Merge branch 'release-1.34'
2020-08-25 12:41:33 -04:00
b5ef7b08b9
settings popup has to come from the server hosting the v4l device, so use monitor->UrlToIndex and include auth.
2020-08-25 12:40:22 -04:00
6587cdd3de
Handle failure to get v4l settings. Fix assignment of values to monitor object.
2020-08-25 12:39:44 -04:00
b0f5f3617a
Always set auth_hash and always set auth_relay, using our handy new get_auth_relay function
2020-08-25 12:39:14 -04:00
f1fab6361f
fix dimensions of v4l settings popup
2020-08-25 12:38:46 -04:00
98dce06d6b
Introduce get_auth_relay to return an auth string to use in urls.
2020-08-25 12:38:31 -04:00
e3a48c2db4
Handle the case where the layout has invalid json
2020-08-25 12:07:45 -04:00
cb02b8e147
Merge branch 'master' of github.com:ZoneMinder/zoneminder
2020-08-25 11:48:00 -04:00
6fbe7457ff
Add missing globals
2020-08-25 11:47:49 -04:00
626e892b33
add global
2020-08-25 11:43:55 -04:00
3d3dde22c4
Use zm_session_start
2020-08-25 11:31:06 -04:00
278be59c86
Use zm_session_start
2020-08-25 11:30:51 -04:00
3c29228df5
Use zm_session_start
2020-08-25 11:30:22 -04:00
586f9f3e52
Use zm_session_start
2020-08-25 11:27:25 -04:00
Isaac Connor
Andrew Bauer
Isaac Connor
Peter Keresztes Schmidt