Isaac Connor
|
aae4a1f83b
|
remove extraneous setting of NULL to videowriter which is already NULL
|
2017-02-04 11:20:21 -05: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
|
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
|
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 |
|
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 |
|
Isaac Connor
|
2829b146d5
|
drop the not null from EncoderParameters
|
2017-01-23 10:30:46 -05:00 |
|
Isaac Connor
|
e937b4099b
|
add an ajax file for console to do sorting
|
2017-01-23 10:13:16 -05:00 |
|
Isaac Connor
|
fdd71a826a
|
implement dragndrop sorting
|
2017-01-23 10:12:57 -05:00 |
|
Isaac Connor
|
35148008b6
|
make img an inline-block so that it continues having space, even when is a broken link
|
2017-01-18 21:14:15 -05:00 |
|
Isaac Connor
|
8ce7719a33
|
remove extra db call cuz i sredundant
|
2017-01-18 21:12:54 -05:00 |
|
Isaac Connor
|
61827fec0c
|
remove redundant mkdir eventdir.
|
2017-01-18 09:31:08 -05:00 |
|
Isaac Connor
|
ff1b369a99
|
add in the required updated file
|
2017-01-17 12:10:00 -05:00 |
|
Isaac Connor
|
d63972ac3b
|
need to bump version due to runstate stuff
|
2017-01-17 09:21:23 -05:00 |
|
Isaac Connor
|
7116d66500
|
use the correct pointer casts
|
2017-01-16 21:57:21 -05:00 |
|
Isaac Connor
|
ab34127d62
|
bump version too
|
2017-01-16 21:31:45 -05:00 |
|
Isaac Connor
|
0e64ff9b24
|
Merge pull request #1754 from pliablepixels/1716-doc-img-typo
1716 doc img typo
|
2017-01-16 21:30:37 -05:00 |
|
Isaac Connor
|
1f3644f6bd
|
Merge branch 'storageareas' of github.com:ConnorTechnology/ZoneMinder into storageareas
|
2017-01-16 21:14:39 -05:00 |
|
Isaac Connor
|
0a660040d5
|
Merge branch 'update_do_debian_release' into storageareas
|
2017-01-16 21:14:18 -05:00 |
|
Isaac Connor
|
0e8d1baebb
|
add an urgency flag
|
2017-01-16 21:13:56 -05:00 |
|
Isaac Connor
|
19bc79a5ec
|
move nRet into the block where it is used. Add a comment.
|
2017-01-16 21:11:28 -05:00 |
|
Isaac Connor
|
9afec3f78b
|
Merge branch 'storageareas' of github.com:connortechnology/ZoneMinder into storageareas
|
2017-01-16 21:08:25 -05:00 |
|
Isaac Connor
|
f6d1707382
|
fix event insert
|
2017-01-16 21:08:13 -05:00 |
|
Andrew Bauer
|
9fd52c231a
|
remove packpack build files
|
2017-01-16 08:39:54 -06:00 |
|
Andrew Bauer
|
5833196a84
|
packpack - change error code handling
|
2017-01-16 08:36:46 -06:00 |
|
Andrew Bauer
|
000ba2300a
|
packpack - initial support for debian distros
|
2017-01-15 20:43:03 -06:00 |
Pliable Pixels
|
0f3642adf4
|
added uncompressed xml
|
2017-01-15 21:40:25 -05:00 |
|
Andy Bauer
|
3882b74766
|
rpm specfile - el6 buildrequires epel-rpm-macros
|
2017-01-15 16:39:38 -06:00 |
|
Pliable Pixels
|
d5d9a3a8e9
|
reminder message for website used to draw XML source images
|
2017-01-15 17:35:34 -05:00 |
|
Pliable Pixels
|
9bf83a409b
|
fixed image type
|
2017-01-15 17:35:12 -05:00 |
|
Isaac Connor
|
b2435e3000
|
Merge branch 'storageareas' of github.com:connortechnology/ZoneMinder into storageareas
|
2017-01-15 17:20:56 -05:00 |
|
Isaac Connor
|
5db6e8cbb3
|
add auto-uploading to zmrepo for jessie
|
2017-01-15 17:20:40 -05:00 |
|
Andy Bauer
|
4325e8f7ea
|
Merge branch 'master' of https://github.com/ZoneMinder/ZoneMinder
|
2017-01-15 15:49:46 -06:00 |
|
Andy Bauer
|
49c35d5733
|
packpack - f24,f25,el7 confirmed working
|
2017-01-15 15:48:57 -06:00 |