Isaac Connor
|
be77269acb
|
fix merge messup
|
2017-06-04 17:40:54 -04:00 |
|
Isaac Connor
|
90c3c40f55
|
Merge branch 'master' of github.com:ZoneMinder/ZoneMinder
|
2017-06-04 17:33:30 -04:00 |
|
Isaac Connor
|
07835969f1
|
get rid of viewport line that prevents zooming in and out
|
2017-06-04 17:31:17 -04:00 |
|
Isaac Connor
|
07704dd5d6
|
coments
|
2017-06-04 17:30:39 -04:00 |
Isaac Connor
|
7ae0b4a546
|
handle older versions of ffmpeg
|
2017-06-03 10:13:39 -04:00 |
Andrew Bauer
|
c1ecbae946
|
Update startpackpack.sh
add an entry to the debian changelog before calling packpack
|
2017-06-02 21:01:59 -05:00 |
|
Isaac Connor
|
44eba78e40
|
put back empty files
|
2017-06-02 20:42:55 -04:00 |
|
Isaac Connor
|
7d6f85f9ea
|
Merge ../ZoneMinder.connortechnology
|
2017-06-02 20:18:16 -04:00 |
|
Isaac Connor
|
d910bcf121
|
fix quoting on config
|
2017-06-02 20:18:05 -04:00 |
|
Isaac Connor
|
7b8222f73b
|
fix type for WEB_EVENT_DISK_SPACE to boolean.
|
2017-06-02 20:17:08 -04:00 |
|
Isaac Connor
|
5fb32d7168
|
Merge branch 'master' of github.com:ZoneMinder/ZoneMinder
|
2017-06-02 16:53:35 -04:00 |
|
Isaac Connor
|
6d1a8e73e8
|
Merge ../ZoneMinder.connortechnology
|
2017-06-02 16:53:24 -04:00 |
|
Isaac Connor
|
eeefb2c8e2
|
need previous_pts and dts for both video and audio. I don't think they can share
|
2017-06-02 16:53:14 -04:00 |
|
Isaac Connor
|
0ac26277e3
|
debug, fix deprecations, fix audio
|
2017-06-02 16:52:52 -04:00 |
|
Isaac Connor
|
b5c0a0eae2
|
the contents of these are not being maintained and should be generated by scripts
|
2017-06-02 12:40:32 -04:00 |
|
Isaac Connor
|
dd029164eb
|
Merge ../ZoneMinder.connortechnology
|
2017-06-02 12:39:34 -04:00 |
|
Isaac Connor
|
9c9eaa6851
|
move test for MIN_AGE up. Don't need to constantly check for it because it won't change.
|
2017-06-02 12:35:01 -04:00 |
|
Isaac Connor
|
8b91403c25
|
remove references to Storage object
|
2017-06-02 12:32:02 -04:00 |
|
Isaac Connor
|
b6b4738b9f
|
fix quotes
|
2017-06-02 12:31:54 -04:00 |
|
Isaac Connor
|
71b9ca97c6
|
no need to store filters as an array ref
|
2017-06-02 12:25:26 -04:00 |
|
Isaac Connor
|
a9268d10e3
|
fix the use of ZM_OPT constants in javascript. Instead, check for existence of the element in the form.
|
2017-06-02 12:21:12 -04:00 |
|
Isaac Connor
|
555a667035
|
fix filter button
|
2017-06-02 12:12:59 -04:00 |
|
Isaac Connor
|
352ea6b6ae
|
spacing
|
2017-06-02 12:12:41 -04:00 |
|
Isaac Connor
|
5228b9d008
|
move command line option parsing up, so if we are just getting the version we exit quick before doing a bunch of other things.
|
2017-06-02 11:54:40 -04:00 |
|
Isaac Connor
|
be5b93a64e
|
whitespace, braces, quotes
|
2017-06-02 11:39:35 -04:00 |
Jørgen Edelbo
|
cbc1636b11
|
Update danish translation file
|
2017-06-02 13:26:30 +02:00 |
|
Isaac Connor
|
915450de13
|
spacing and comments
|
2017-06-01 17:48:52 -04:00 |
|
Andrew Bauer
|
8f9a373825
|
Update startpackpack.sh
Remove packpack debug output, add a sanity check for the version & release vars
|
2017-06-01 12:30:32 -05:00 |
|
Andrew Bauer
|
590dd13be5
|
Update .travis.yml
Travis environment sets git depth to 50 commits, which is too low for our project. This commit increases the limit per: https://github.com/travis-ci/travis-ci/issues/3412
|
2017-06-01 12:09:22 -05:00 |
|
Isaac Connor
|
c93e13868e
|
change to quilt frmo native. Remove patches. We are upstream.
|
2017-06-01 12:41:10 -04:00 |
|
Andrew Bauer
|
12026aba78
|
Update startpackpack.sh
continue to add debug output packpack for troubleshooting git/packpack
|
2017-06-01 10:46:45 -05:00 |
|
Isaac Connor
|
41f77cc51f
|
Merge branch 'master' of github.com:ZoneMinder/ZoneMinder
|
2017-06-01 09:36:21 -04:00 |
|
Isaac Connor
|
e47adcf6cc
|
the tfoot has to come after the tbody
|
2017-06-01 09:36:00 -04:00 |
|
Isaac Connor
|
a1af422d29
|
the [filter][terms] etc part needs to be urlencoded as well. Becase [] are not valid in urls.
|
2017-06-01 09:35:38 -04:00 |
|
Isaac Connor
|
73ca07792b
|
double quotes to single quotes
|
2017-05-31 22:11:54 -04:00 |
|
Isaac Connor
|
5c67c87147
|
remove deprecated cellspacing attr on table
|
2017-05-31 22:08:44 -04:00 |
|
Isaac Connor
|
a940fe429c
|
deprecate the use of the center tag, and only put in the development h3 if it has contents
|
2017-05-31 22:08:05 -04:00 |
|
Isaac Connor
|
1df147e183
|
adjust spacing
|
2017-05-31 22:01:35 -04:00 |
|
Isaac Connor
|
502cb6a7d8
|
fix spacing
|
2017-05-31 21:34:38 -04:00 |
|
Isaac Connor
|
83da2dfa05
|
double to single quotes
|
2017-05-31 21:30:19 -04:00 |
|
Isaac Connor
|
98b49fb64d
|
quotes, spacing
|
2017-05-31 21:28:40 -04:00 |
|
Andrew Bauer
|
618d606a88
|
Update startpackpack.sh
add additional debug output
|
2017-05-31 20:12:49 -05:00 |
|
Isaac Connor
|
17c8224733
|
begin to ahndle imageData not being populated
|
2017-05-31 20:55:10 -04:00 |
|
Isaac Connor
|
4889f3d0e8
|
rework logic in GetStreamImg a bit. If no frame is specified, then we can use snapshot...otherwise it should do the frame image!
|
2017-05-31 20:54:34 -04:00 |
|
Isaac Connor
|
ce59c9e16c
|
Merge branch 'master' of github.com:ZoneMinder/ZoneMinder
|
2017-05-31 20:45:50 -04:00 |
|
Isaac Connor
|
dbeb000505
|
Merge ../ZoneMinder.connortechnology
|
2017-05-31 20:45:37 -04:00 |
|
Isaac Connor
|
2b9134512f
|
remove leftover
|
2017-05-31 20:45:21 -04:00 |
|
Isaac Connor
|
98b3621681
|
add Debug, and fix logic deleting frames before the appropriate keyframe
|
2017-05-31 20:44:43 -04:00 |
|
Isaac Connor
|
a6421a9126
|
handle deprecations
|
2017-05-31 20:44:23 -04:00 |
|
Isaac Connor
|
2eabf13eaf
|
handle deprecations, make some logic more clear
|
2017-05-31 20:44:13 -04:00 |