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 |
|
Isaac Connor
|
c5ad62b9fc
|
Merge branch 'storageareas' of github.com:connortechnology/ZoneMinder into storageareas
|
2017-01-15 14:24:58 -05:00 |
|
Isaac Connor
|
29acad163c
|
Add some casts to quiet warnings. The warnings happen because we are doing arithmetic on pointers.
|
2017-01-15 14:24:50 -05:00 |
|
Isaac Connor
|
6be61403f5
|
Merge branch 'storageareas' of github.com:ConnorTechnology/ZoneMinder into storageareas
|
2017-01-15 14:07:55 -05:00 |
|
Isaac Connor
|
f16fdb8b21
|
Merge branch 'update_do_debian_release' into storageareas
|
2017-01-15 14:07:37 -05:00 |
|
Isaac Connor
|
b7ee64ff41
|
Merge branch 'storageareas' of github.com:connortechnology/ZoneMinder into storageareas
|
2017-01-15 13:35:45 -05:00 |
|
Isaac Connor
|
a30af05bcf
|
change parameters to use -o= or --option= and add interactive flag
|
2017-01-15 12:18:51 -05:00 |
|
Andrew Bauer
|
418995df84
|
rpm specfile changes
need to put this back in to maintain compatibility with packpack
|
2017-01-15 09:59:17 -06:00 |
|
Isaac Connor
|
052807aaf5
|
remove extra my
|
2017-01-15 10:57:39 -05:00 |
|
Isaac Connor
|
c79dfb6a16
|
fix typos
|
2017-01-15 10:56:57 -05:00 |
|
Isaac Connor
|
4973d8c74c
|
add support for connect options
|
2017-01-15 10:54:46 -05:00 |
|
Isaac Connor
|
d24d151f53
|
Slurp db update file in and do() it instead of calling mysql
|
2017-01-15 10:54:23 -05:00 |
|
Andrew Bauer
|
b3ee97ad11
|
Merge pull request #1753 from jbehrends/docker_apache_fix
Docker - Fixed broken cgi-bin path in apache site conf.
|
2017-01-14 20:38:33 -06:00 |
Josh Behrends
|
41f5ee5032
|
Fixed broken cgi-bin path
|
2017-01-14 16:35:46 -08:00 |
|
Andy Bauer
|
08d4d0c5c2
|
packpack - auto retrieve zmrepo rpm
|
2017-01-14 16:35:56 -06:00 |
|
Andy Bauer
|
7d91b4cdc7
|
minor changes to packpack patch
|
2017-01-14 16:24:55 -06:00 |
|
Isaac Connor
|
899b1b82b9
|
Merge branch 'filter_by_runstate' into storageareas
|
2017-01-14 17:07:20 -05:00 |
|
Isaac Connor
|
8d02607a90
|
add an update script to add StateId to Events table
|
2017-01-14 16:58:22 -05:00 |
|
Isaac Connor
|
242e5a56d8
|
rough in the ability to filter on RunState
|
2017-01-14 16:55:28 -05:00 |