Isaac Connor
|
415d43fafb
|
Include Server Name when testing for CORS. Also be case insensitive.
|
2018-11-15 12:23:52 -05:00 |
Isaac Connor
|
f72651da5a
|
Add auth hash to ajax fps and status calls in zone edit
|
2018-11-15 12:22:35 -05:00 |
Andrew Bauer
|
9b46c92ac5
|
rpm pkg - add note to zm php-fpm config file
|
2018-11-15 09:19:26 -06:00 |
Andrew Bauer
|
2f8c0654d5
|
rpm pkg - fix for zm php-fpm config path
|
2018-11-15 08:31:04 -06:00 |
Andrew Bauer
|
f2fc234880
|
rpm pkg - install zm php-fpm config in all cases for future nginx support
|
2018-11-15 08:26:54 -06:00 |
Isaac Connor
|
aa8ac9c31c
|
spaces and quotes
|
2018-11-14 15:54:45 -05:00 |
Isaac Connor
|
3a409b26aa
|
Use buttons instead of anchor tags for Prev/Next/FIrst/Last buttons
|
2018-11-14 15:54:34 -05:00 |
Isaac Connor
|
3be31020b7
|
Automatically add width to frames view when thumbnails are turned on.
|
2018-11-14 15:54:01 -05:00 |
Isaac Connor
|
35b439629c
|
Merge branch 'master' of github.com:ZoneMinder/ZoneMinder
|
2018-11-13 18:14:35 -05:00 |
Isaac Connor
|
5120c6f540
|
remove compile warning by assigning AV_CODEC_NONE to the codec_id.
|
2018-11-13 18:13:55 -05:00 |
Andrew Bauer
|
8b50c87aab
|
Merge pull request #2307 from connortechnology/fix_32bit_alignment
remove epadding2, to restore the 64bit alignment of startup_time.
|
2018-11-13 13:38:53 -06:00 |
Isaac Connor
|
ca87936cd7
|
add function time_of_youngest_file to determine the youngest file in an event dir, so as to guess the starttime of the event.
|
2018-11-13 14:13:41 -05:00 |
Isaac Connor
|
798bf68df1
|
add function time_of_youngest_file to determine the youngest file in an event dir, so as to guess the starttime of the event.
|
2018-11-13 14:13:32 -05:00 |
Isaac Connor
|
31b0ed107d
|
remove epadding2, to restore the 64bit alignment of startup_time. A proper fix instead of #2258
|
2018-11-13 14:02:44 -05:00 |
Isaac Connor
|
07d6d799ce
|
Merge branch 'master' of github.com:ZoneMinder/ZoneMinder
|
2018-11-13 10:30:58 -05:00 |
Isaac Connor
|
993da131f1
|
tidy up and use Error instead of Carp::croak
|
2018-11-13 10:29:19 -05:00 |
Isaac Connor
|
abeafe9ba6
|
fix log export. minTime and maxTime were being cleared by the regexp to detect sub second time. Also use ZM_DIR_EXPORTS instead of ZM_PATH_SWAP
|
2018-11-12 15:43:03 -05:00 |
Isaac Connor
|
d76d6bb9d1
|
include overlay.js when viewing the log, so that export works
|
2018-11-12 15:09:15 -05:00 |
Isaac Connor
|
2cc9c6bab1
|
Merge branch 'master' of github.com:ZoneMinder/ZoneMinder
|
2018-11-12 11:56:30 -05:00 |
Isaac Connor
|
a95a012fa5
|
fix #2302
|
2018-11-12 11:56:18 -05:00 |
rafidashab
|
4a56a405b7
|
Fix typos in README file (#2301)
* Fix typos in README file
* Improve clarity in introduction doc
* Improved word selection
* Revision of the README file
* Finish editing introduction documentation
|
2018-11-12 09:18:13 -05:00 |
Isaac Connor
|
246765ced9
|
Add tooltip for sorting monitors
|
2018-11-11 16:23:19 -05:00 |
Isaac Connor
|
967fe14b22
|
Add ability to update incorrect starttime.
|
2018-11-11 10:17:32 -05:00 |
Isaac Connor
|
1e98ecb595
|
Sort keys in to_string
|
2018-11-09 12:14:39 -05:00 |
Isaac Connor
|
5f81e9111f
|
Add Scheme and SaveJPEGs to Event fields, and fix setting Scheme
|
2018-11-09 12:14:05 -05:00 |
Isaac Connor
|
abada5c95c
|
Merge branch 'master' of github.com:ZoneMinder/ZoneMinder
|
2018-11-09 10:47:00 -05:00 |
Isaac Connor
|
4ddd328c61
|
Check and Fix Scheme and StorageArea
|
2018-11-09 10:39:57 -05:00 |
Aktarus
|
1844a7eb29
|
Update definemonitor.rst (#2299)
|
2018-11-09 07:59:06 -05:00 |
Andrew Bauer
|
d6877b763d
|
Merge pull request #2298 from connortechnology/log_use_global_dbh
Use the global dbh in ZoneMinder::Database instead of keeping our own…
|
2018-11-07 12:29:11 -06:00 |
Isaac Connor
|
82abd04f36
|
Add type=button to buttons so they don't act like submit buttons
|
2018-11-07 13:19:42 -05:00 |
Isaac Connor
|
ec09a71ba0
|
Include defaults for all the missing Monitor Columns
|
2018-11-07 13:18:53 -05:00 |
Isaac Connor
|
a066968aca
|
fix dbError and cause it to return the error string instead of just logging it. Add error logging of db errors that don't throw exceptions.
|
2018-11-07 12:33:18 -05:00 |
Isaac Connor
|
230ce61dc4
|
fix #2296 by prepending bind with ::
|
2018-11-07 11:54:18 -05:00 |
Isaac Connor
|
0e3eb0df17
|
remove extra quotes, google code style, update pod docs
|
2018-11-07 11:26:48 -05:00 |
Isaac Connor
|
4107082845
|
Don't delete default states if there are none
|
2018-11-07 11:01:49 -05:00 |
Isaac Connor
|
0ebcef7324
|
in poddoc and over needs a =back
|
2018-11-07 11:01:12 -05:00 |
Isaac Connor
|
4993894b27
|
Merge branch 'master' of github.com:ZoneMinder/ZoneMinder
|
2018-11-07 10:43:41 -05:00 |
Isaac Connor
|
56bdd53757
|
Use the global dbh in ZoneMinder::Database instead of keeping our own copy of it in Logger
|
2018-11-07 10:40:44 -05:00 |
Isaac Connor
|
c0c1247fa0
|
bump verion to 1.32.2
|
2018-11-07 10:33:55 -05:00 |
Andrew Bauer
|
ec95163810
|
Add fedora 29 support to buildsystem
|
2018-11-05 19:35:05 -06:00 |
Andrew Bauer
|
d3064e4402
|
Update zoneminder.spec
|
2018-11-05 07:06:34 -06:00 |
Andrew Bauer
|
b8066e66ed
|
Update zoneminder.spec
|
2018-11-05 06:51:08 -06:00 |
Andrew Bauer
|
720505cbea
|
spelling
|
2018-11-04 17:14:46 -06:00 |
Andrew Bauer
|
e6e7069ec0
|
Merge pull request #2293 from knight-of-ni/rpm-nginx
update nginx support on redhat
|
2018-11-04 17:13:11 -06:00 |
Andy Bauer
|
3aee902a96
|
update nginx support on redhat
|
2018-11-04 17:11:19 -06:00 |
Andrew Bauer
|
6360b84e15
|
Merge pull request #2288 from connortechnology/add_monitor_status_to_api
rough in adding Monitor_Status to Monitors
|
2018-11-03 20:46:11 -05:00 |
Andrew Bauer
|
cac049e2c9
|
Merge pull request #2291 from pliablepixels/api-updates
updated API - streaming/server/storage/other edits
|
2018-11-03 20:45:52 -05:00 |
Andrew Bauer
|
0e6fbe2213
|
Merge pull request #2286 from ratmole/api-php-notice-fix
API - Disable E_NOTICE from php error reporting in cake debug
|
2018-11-03 20:41:52 -05:00 |
Andrew Bauer
|
a50c2bae35
|
Merge pull request #2289 from connortechnology/audio_only_with_ffmpeg
Audio only with ffmpeg
|
2018-11-03 20:39:18 -05:00 |
Isaac Connor
|
4b24bf4e36
|
merge from storageareas, fully specify Module for zmDbDisconnect as we havn't 'used' it
|
2018-11-02 11:48:35 -04:00 |