Isaac Connor
|
aae4a1f83b
|
remove extraneous setting of NULL to videowriter which is already NULL
|
2017-02-04 11:20:21 -05:00 |
abishai
|
8d5a8f5512
|
make clang happy
|
2017-02-03 14:53:53 +03:00 |
Isaac Connor
|
f73bf0aee0
|
add a cast to fix compilation with clang
|
2017-02-02 12:43:13 -05:00 |
|
Isaac Connor
|
e3edbf40cf
|
make url full width
|
2017-02-02 12:16:40 -05:00 |
|
Isaac Connor
|
7b73eb350f
|
update to current.
|
2017-02-02 12:15:16 -05:00 |
|
Isaac Connor
|
d8c79cb750
|
fixup header and sidebar layout
|
2017-02-02 11:31:16 -05:00 |
|
Isaac Connor
|
1102f449aa
|
don't do extra copy of classString
|
2017-02-02 09:22:13 -05:00 |
|
Isaac Connor
|
cee05a1bb7
|
fix merge problem
|
2017-02-02 09:21:49 -05:00 |
|
Isaac Connor
|
9135da92ed
|
fix typo fileFields => filterFields
|
2017-01-31 21:33:43 -05:00 |
|
Isaac Connor
|
acd1d96a06
|
revert change to zoneminder-config.cmake
|
2017-01-31 11:13:16 -05:00 |
|
Isaac Connor
|
dc778058f5
|
fix detection of LIBSWRESAMPLE
|
2017-01-31 11:13:16 -05:00 |
Isaac Connor
|
7d451e1e41
|
float the scale control right, add css for other skins
|
2017-01-31 11:13:16 -05:00 |
|
Isaac Connor
|
4a4f62f0a7
|
add a scale element to the frame view. Include some bits from StorageAreas to make it work
|
2017-01-31 11:13:16 -05:00 |
|
Isaac Connor
|
568160e5aa
|
add a scale element to the frame view. Include some bits from StorageAreas to make it work
|
2017-01-31 11:13:15 -05:00 |
|
abishai
|
1687217d18
|
switch to POSIX basename()
|
2017-01-31 11:10:25 +03:00 |
|
abishai
|
0f23809b35
|
rc.d is not require polkit
provide alternate path for mysql headers
|
2017-01-31 10:59:22 +03:00 |
|
abishai
|
97380f009b
|
implement platform-agnostic comparison without abs()
|
2017-01-31 10:42:57 +03:00 |
|
Isaac Connor
|
6f6eacaa72
|
fixup classic and dark skins
|
2017-01-30 21:45:48 -05:00 |
|
Isaac Connor
|
89022fff0c
|
Merge branch 'storageareas' of github.com:ConnorTechnology/ZoneMinder into storageareas
|
2017-01-30 21:16:26 -05:00 |
|
Isaac Connor
|
f3378207c0
|
make navbar static instead of fixed, sync up dark theme, and improve storage editing styles
|
2017-01-30 21:16:21 -05:00 |
|
Isaac Connor
|
ad2e00166a
|
use isset
|
2017-01-30 19:53:08 -05:00 |
|
Isaac Connor
|
4543b3e1b1
|
include jquery-ui instead of using a cdn version
|
2017-01-30 19:17:14 -05:00 |
|
Isaac Connor
|
19aed3f860
|
dont check ZM_DIR_EVENTS if it already exists in storageareas
|
2017-01-30 17:29:15 -05:00 |
|
Isaac Connor
|
85727dbe2b
|
bump version and set Path to allow NULLS
|
2017-01-30 17:25:07 -05:00 |
|
Isaac Connor
|
9fd9c5de20
|
test for empty and non-existent path
|
2017-01-30 17:24:41 -05:00 |
|
Isaac Connor
|
fda115bebe
|
tell zmc and zma to stop before updating db
|
2017-01-30 16:37:53 -05:00 |
|
Isaac Connor
|
3437f23e8a
|
Merge branch 'master' into fix_sql_injection
|
2017-01-28 14:33:49 -05:00 |
|
Isaac Connor
|
41dab0750e
|
turn whatever gets output into html escaped html so that nothing gets revealed
|
2017-01-27 21:30:22 -05:00 |
|
Isaac Connor
|
b5e995712e
|
Merge branch 'master' of github.com:ConnorTechnology/ZoneMinder-Pro
|
2017-01-27 17:43:58 -05:00 |
|
Isaac Connor
|
a8d1450adf
|
Merge branch 'master' into fix_sql_injection
|
2017-01-27 17:18:34 -05:00 |
Kyle Johnson
|
746a096483
|
Merge branch 'master' of github.com:ZoneMinder/ZoneMinder
|
2017-01-27 15:16:33 -07:00 |
|
Isaac Connor
|
c1e05753d6
|
Merge branch 'master' of github.com:ZoneMinder/ZoneMinder-Pro
|
2017-01-27 17:12:46 -05:00 |
|
Isaac Connor
|
05f3944cc6
|
Merge branch 'master' into feature-h264-videostorage
|
2017-01-27 09:58:18 -05:00 |
|
Isaac Connor
|
9e9b1a3a35
|
Merge pull request #1758 from knnniggett/sanitize_image_path
sanitize the image path before processing
|
2017-01-27 09:41:54 -05:00 |
|
Isaac Connor
|
20f31ce804
|
Merge pull request #1759 from knnniggett/packpack_crud
check if crud plugin exists before unpacking
|
2017-01-27 09:37:05 -05:00 |
|
Isaac Connor
|
7ab6818fa0
|
Merge branch 'sanitize_image_path' of https://github.com/knnniggett/ZoneMinder into storageareas_sanitize
|
2017-01-25 17:14:30 -05:00 |
Andrew Bauer
|
fbb8375a1a
|
check if crud plugin exists before unpacking
|
2017-01-25 10:49:58 -06:00 |
|
Andrew Bauer
|
dbd73690b2
|
use !== false rather than === true
|
2017-01-25 09:26:07 -06:00 |
|
Andrew Bauer
|
6189d2670c
|
ZM_DIR_EVENTS can be, and often is, a symlink
|
2017-01-25 09:05:34 -06:00 |
|
Isaac Connor
|
14bb8acc82
|
Merge branch 'feature-h264-videostorage' of github.com:ZoneMinder/ZoneMinder into feature-h264-videostorage
|
2017-01-25 09:46:33 -05:00 |
|
Isaac Connor
|
41b6369c36
|
Merge branch 'master' into feature-h264-videostorage
|
2017-01-25 09:46:06 -05:00 |
|
Andrew Bauer
|
8b19fca992
|
sanitize the image path before processing
|
2017-01-25 08:30:19 -06:00 |
Andrew Bauer
|
13dc11bdf5
|
Merge pull request #1717 from connortechnology/fix_mmap_leak
must call zmMemInvalidate before next
|
2017-01-24 19:39:51 -06:00 |
|
Isaac Connor
|
fe3328a87a
|
Merge branch 'storageareas_dragndrop' into storageareas
|
2017-01-24 09:35:14 -05:00 |
|
Isaac Connor
|
129acb5b8e
|
only show mark column if you have the Monitor Edit ability
|
2017-01-24 09:30:56 -05:00 |
|
Isaac Connor
|
046e04e8df
|
Merge branch 'storageareas_dragndrop' into storageareas
|
2017-01-23 21:51:48 -05:00 |
|
Isaac Connor
|
5b598fe90d
|
cleanup and use cleaned up monitor_id
|
2017-01-23 21:51:38 -05:00 |
|
Isaac Connor
|
7cd2f6c69e
|
use glyphicon for sort
|
2017-01-23 21:51:17 -05:00 |
|
Andrew Bauer
|
af728388d0
|
Merge pull request #1734 from connortechnology/fix_1720
Fix 1720
|
2017-01-23 20:35:10 -06:00 |
|
Isaac Connor
|
bb3d47ab45
|
get rid of mapping
|
2017-01-23 21:34:06 -05:00 |