a288a54fbe
make form id unique on logout view
2020-08-28 07:42:33 -05:00
065b095880
Merge branch 'master' of github.com:ZoneMinder/zoneminder
2020-08-27 19:56:46 -04:00
0f04f9607a
Fixup Exists as opposed to ExistsInFileSsystem
2020-08-27 19:56:41 -04:00
1e78307735
add navigation buttons to monitor view
2020-08-27 16:30:49 -05:00
b458a7c893
Redirect after save so that a reload doesn't redo the post
2020-08-27 17:20:24 -04:00
f294d099c9
Merge branch 'master' of github.com:ZoneMinder/zoneminder
2020-08-27 17:16:18 -04:00
3d9557c5a4
Implement limit on returned events. Free ram in cache if post_condition fails
2020-08-27 17:16:10 -04:00
10d0ccf0ce
fix use of ->value instead of ->val. Return 1 for the sql for a post-condition term
2020-08-27 17:15:33 -04:00
d0f6f8755c
Implement a remove_from_cache function so we can free mem for objects we are not interested in
2020-08-27 17:14:47 -04:00
a5cef3e6d1
Need to put a 1 in the sql for post-sql conditions due to the cnj term
2020-08-27 17:14:16 -04:00
1f5f964ae3
add navbar to monitor view
2020-08-27 15:53:24 -05:00
948836ed96
enable jump-to feature on frames
2020-08-27 14:58:21 -05:00
9fef228636
remove debug Warning
2020-08-27 13:38:13 -04:00
e9cef72d9f
Use ViewWdith/ViewHeight to get rotated dimensions when calculating thumbnail size
2020-08-27 12:44:56 -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
Andrew Bauer
Isaac Connor
Isaac Connor
Peter Keresztes Schmidt