Andrew Bauer
|
895f5cc7c4
|
Update CMakeLists.txt
install the other bootstrap.php file under lib/cake
|
2017-05-03 13:25:11 -05:00 |
|
Andrew Bauer
|
752959f3fc
|
Update CMakeLists.txt
typo - remove extra "/"
|
2017-05-03 12:35:54 -05:00 |
Joergen Edelbo
|
fb5668c9ef
|
Fix spelling of remSocketFile
|
2017-04-29 09:02:35 +02:00 |
Isaac Connor
|
1253fb1723
|
update whitespacing/braces. Add a warning when dbFetchOne is used with a column that isn't in the returned row
|
2017-04-28 14:17:36 -04:00 |
|
Isaac Connor
|
9482114f95
|
add db connections to the header
|
2017-04-28 14:17:09 -04:00 |
|
Isaac Connor
|
20c699366e
|
scale is a percentage, so use the rescale function
|
2017-04-28 11:10:43 -04:00 |
|
Isaac Connor
|
df7161a4ea
|
merge some stuff I did in vueip
|
2017-04-28 10:54:20 -04:00 |
|
Isaac Connor
|
dce39bb2a9
|
Merge branch 'master' into storageareas
|
2017-04-26 15:58:17 -04:00 |
Andrew Bauer
|
1a565a47f2
|
fix skin path in export_functions
|
2017-04-26 12:17:01 -05:00 |
|
Isaac Connor
|
088fa0192b
|
Merge branch 'master' into storageareas
|
2017-04-25 10:00:14 -04:00 |
Joshua Ruehlig
|
05a141bf78
|
Update database.php
|
2017-04-24 23:40:52 -07:00 |
|
Joshua Ruehlig
|
ca1e8a13fe
|
Update database.php.default
|
2017-04-24 23:40:21 -07:00 |
|
Isaac Connor
|
4b264251ac
|
Merge branch 'zones_on_montage' into storageareas
|
2017-04-24 14:47:38 -04:00 |
|
Isaac Connor
|
5a2ef571ef
|
fix scaling, zones now work. Add a Show/Hide Zones at the top
|
2017-04-24 14:47:30 -04:00 |
|
Isaac Connor
|
23f384407e
|
blah
|
2017-04-24 14:00:47 -04:00 |
|
Isaac Connor
|
12ffa60023
|
fix applying sorting to MOnitors.
|
2017-04-24 11:13:08 -04:00 |
|
Isaac Connor
|
83ba74ad66
|
work in progress, rough in adding the svg zones to montage
|
2017-04-24 11:11:54 -04:00 |
|
Isaac Connor
|
ef6c675c6a
|
work in progress, rough in adding the svg zones to montage
|
2017-04-24 11:11:44 -04:00 |
|
Isaac Connor
|
bafbdc28ed
|
update to whats in master
|
2017-04-21 14:46:40 -04:00 |
|
Isaac Connor
|
a29ec6af62
|
revert to master
|
2017-04-21 14:44:36 -04:00 |
|
Isaac Connor
|
c8855c03fc
|
don't use a submodule for video.js
|
2017-04-20 10:50:42 -04:00 |
|
Isaac Connor
|
035b464b97
|
Revert "don't use external hosted video.js or moment.js"
This reverts commit fb2f8022a7.
|
2017-04-20 10:45:51 -04:00 |
|
Isaac Connor
|
dd4b93f130
|
add submodule video.js, using release tag v5.18.4
|
2017-04-20 10:35:32 -04:00 |
|
Isaac Connor
|
fb2f8022a7
|
don't use external hosted video.js or moment.js
|
2017-04-20 10:12:47 -04:00 |
|
Isaac Connor
|
3db38eb474
|
limit points to the limits of the monitor
|
2017-04-19 16:12:12 -04:00 |
|
Isaac Connor
|
fbbe748bc8
|
Restore old behaviour for events that don't have a video
|
2017-04-19 14:15:32 -04:00 |
|
Isaac Connor
|
dd4ea635e8
|
remove rotate, as the video file itself has the rotate set
|
2017-04-19 13:12:15 -04:00 |
|
Isaac Connor
|
8fbe765a7d
|
Set filename so that save as gives the correct filename
|
2017-04-19 13:11:15 -04:00 |
|
Isaac Connor
|
b87839f785
|
turn off csrf on view=view_video
|
2017-04-19 10:12:51 -04:00 |
|
Isaac Connor
|
7697b8c7be
|
" to '
|
2017-04-19 10:09:27 -04:00 |
|
Isaac Connor
|
71a9763c32
|
add a comment
|
2017-04-19 10:02:31 -04:00 |
|
Isaac Connor
|
d1d4fa7b8f
|
fix the redirect location
|
2017-04-19 10:02:07 -04:00 |
|
Isaac Connor
|
b71d021ae1
|
Merge branch 'fix_1849' into storageareas
|
2017-04-18 12:43:04 -04:00 |
|
Isaac Connor
|
f2920c37e0
|
escapeshellarg adds quotes, which is bad. Use escapeshellcmd on the whole string instead.
|
2017-04-18 12:31:20 -04:00 |
|
Andrew Bauer
|
008624451f
|
Merge pull request #1856 from connortechnology/remove_BOM
use dos2unix to remove BOM
|
2017-04-17 08:32:17 -05:00 |
|
Isaac Connor
|
a164118ad3
|
Merge branch 'storageareas' of github.com:ConnorTechnology/ZoneMinder into storageareas
|
2017-04-16 11:26:30 -04:00 |
|
Isaac Connor
|
273229858f
|
Merge branch 'master' into storageareas
|
2017-04-16 11:26:18 -04:00 |
Isaac Connor
|
f1f54205fb
|
Merge branch 'remove_BOM' into storageareas
|
2017-04-16 09:28:35 -04:00 |
|
Isaac Connor
|
5e0012569f
|
use dos2unix to remove BOM
|
2017-04-16 09:22:37 -04:00 |
|
Isaac Connor
|
0efca38d68
|
Merge pull request #1854 from knnniggett/caketmp
make cake tmp = zoneminder tmp
|
2017-04-15 10:23:03 -04:00 |
|
Isaac Connor
|
ab4b5e6b69
|
Merge pull request #1853 from knnniggett/cakecache
change cake cache engine from File -> Apc
|
2017-04-14 21:10:23 -04:00 |
|
Andrew Bauer
|
0b729cf295
|
modify cmakelists.txt
|
2017-04-14 15:15:29 -05:00 |
|
Andrew Bauer
|
d2490cf7e3
|
make cake tmp = zoneminder tmp
|
2017-04-14 15:11:41 -05:00 |
|
Andrew Bauer
|
48a73f7e78
|
change cache engine from File -> Apc
|
2017-04-14 14:31:42 -05:00 |
|
Andrew Bauer
|
3cbd32cd41
|
move cake log to zoneminder log folder
|
2017-04-14 14:24:29 -05:00 |
|
Isaac Connor
|
a5e7db0f7c
|
use faster ffmpeg method to generate frame image
|
2017-04-13 12:35:14 -04:00 |
|
Isaac Connor
|
7d6505f015
|
use Delta to grab frame from video, using -ss for speed
|
2017-04-12 16:17:19 -04:00 |
|
Isaac Connor
|
f97e074393
|
braces fixes
|
2017-04-12 16:16:56 -04:00 |
|
Isaac Connor
|
d039227f79
|
Merge branch 'master' into storageareas
|
2017-04-12 13:51:10 -04:00 |
|
Isaac Connor
|
d462dfdb77
|
fix error message when fid not specified
|
2017-04-07 13:20:54 -04:00 |
|
Isaac Connor
|
92a2d6f4f2
|
hide the video, let's stick with jpeg's, which will be auto-generated
|
2017-04-07 13:20:28 -04:00 |
|
Isaac Connor
|
8f51331472
|
fix timeline view by using view=image instead of direct path
|
2017-04-07 13:20:04 -04:00 |
|
Isaac Connor
|
2b9a0f96d3
|
remove and break over multiple lines
|
2017-04-05 16:10:06 -04:00 |
|
Isaac Connor
|
d611840750
|
whitespace, handle NaN in limitArea
|
2017-04-05 16:09:40 -04:00 |
|
Isaac Connor
|
c5ff45922f
|
fix zone edit height
|
2017-04-05 16:09:06 -04:00 |
|
Isaac Connor
|
7815f1c539
|
introduce a redirect flag global variable to allow us to redirect. Which allows to redirect on successful login so we don't get repost popups
|
2017-04-05 10:05:21 -04:00 |
|
Andrew Bauer
|
a10d52a3e1
|
Merge pull request #1844 from connortechnology/fix_1812
fix Monitors filtering SQL
|
2017-04-03 20:06:39 -05:00 |
|
Isaac Connor
|
08766b7546
|
decrease wait time in order to achieve greater throughput. flush after every print so that we don't buffer the whole file
|
2017-03-31 14:33:00 -04:00 |
|
Isaac Connor
|
58d119d9ed
|
Merge branch 'fix_1762' into storageareas
|
2017-03-31 13:38:59 -04:00 |
|
Isaac Connor
|
514c83d3e9
|
whitespace and add a test for ->Triggers being an array
|
2017-03-31 12:01:37 -04:00 |
|
Isaac Connor
|
d1a60dedc8
|
Fix the overzealous use of escapeshellcmd that breaks restarting monitors
|
2017-03-31 11:59:55 -04:00 |
|
Isaac Connor
|
d3f6ab3d29
|
fix Monitors filtering SQL
|
2017-03-30 13:06:54 -04:00 |
|
Isaac Connor
|
56476a7774
|
uppercase SQL
|
2017-03-30 13:05:10 -04:00 |
|
Isaac Connor
|
4f2dcdacb4
|
update, remove styles and fix the sql for limiting monitors
|
2017-03-30 13:04:16 -04:00 |
|
Isaac Connor
|
dd4550406f
|
remove styles from montagereview and stick them in a view-specific css
|
2017-03-30 13:03:46 -04:00 |
|
Isaac Connor
|
7e3b27a130
|
Test for Controllable as well as ControlId
|
2017-03-30 10:49:02 -04:00 |
|
Isaac Connor
|
b2db0888ae
|
add a warning if csrf_check returns false
|
2017-03-30 10:46:13 -04:00 |
|
Isaac Connor
|
5ea77f0781
|
Make zones a link to zones_overview
|
2017-03-30 10:45:55 -04:00 |
|
Isaac Connor
|
538658403c
|
Merge pull request #1822 from knnniggett/csrf
Implement CSRF Mitigation
|
2017-03-30 10:39:55 -04:00 |
|
Isaac Connor
|
fe223e3b29
|
remove a warning when adding users when not logged in (could happen if OPT_AUTH isn't turned on yet
|
2017-03-29 10:38:29 -04:00 |
|
Isaac Connor
|
35067211e0
|
more the csrf to before actions.php
|
2017-03-29 10:19:00 -04:00 |
|
Isaac Connor
|
3cd9e46df9
|
Merge branch 'knnniggett-csrf' into storageareas
|
2017-03-28 20:44:38 -04:00 |
|
Isaac Connor
|
d006ebfc3c
|
Merge branch 'csrf' of https://github.com/knnniggett/ZoneMinder into knnniggett-csrf
|
2017-03-28 20:10:59 -04:00 |
|
Isaac Connor
|
769af661e9
|
Merge branch 'fix_x10' into storageareas
|
2017-03-28 20:05:52 -04:00 |
|
Isaac Connor
|
589b369109
|
fix inserting x10 record with missing ,
|
2017-03-28 20:03:46 -04:00 |
Andy Bauer
|
eb55a6bb9b
|
set action,view, and/or request to NULL if there are not defined
|
2017-03-28 17:52:31 -05:00 |
|
Andy Bauer
|
4e16ae6d19
|
add ZM_ENABLE_CSRF_MAGIC toggle
|
2017-03-28 17:29:36 -05:00 |
|
Isaac Connor
|
4d2fb6b7f8
|
don't need to reload when deleting. The row will no longer be in there
|
2017-03-27 13:13:48 -04:00 |
|
Isaac Connor
|
7b63461517
|
attempt to support redirecting to the given url instead of just refreshing
|
2017-03-27 13:13:08 -04:00 |
|
Isaac Connor
|
8ef7a708bd
|
updates in filters, try to get the new filter loaded when saving with a new name
|
2017-03-27 13:12:37 -04:00 |
|
Isaac Connor
|
7360619941
|
Merge branch 'master' into storageareas
|
2017-03-24 11:53:45 -04:00 |
IDDQDesnik
|
6081374ace
|
Updated Russian translation
|
2017-03-21 17:39:22 +03:00 |
|
Isaac Connor
|
eaca58bb7c
|
Merge pull request #1815 from mnoorenberghe/postlogin
Properly escape postLoginQuery. Fixes #1797
|
2017-03-21 10:27:13 -04:00 |
|
Isaac Connor
|
670c1a3c7c
|
pass NULL for ['width']
|
2017-03-21 09:47:07 -04:00 |
Matthew Noorenberghe
|
ea558c79a0
|
Fix check that API user is enabled
|
2017-03-20 17:16:24 -07:00 |
|
Isaac Connor
|
badbf1c74c
|
Merge pull request #1816 from mnoorenberghe/flat_window_sizes
Increase default window sizes for the flat theme. Fixes #1059
|
2017-03-20 13:10:13 -04:00 |
|
Isaac Connor
|
70246ce55a
|
whitespace corrections and ensure that options[width] and options[height] are defined
|
2017-03-20 12:10:28 -04:00 |
|
Andrew Bauer
|
2dcd95bc7f
|
Merge pull request #1504 from ZoneMinder/improve_filter
Improve filter
|
2017-03-18 21:12:58 -05:00 |
|
Andrew Bauer
|
d38bae72ae
|
integrate csrf-magic library
|
2017-03-18 20:12:06 -05:00 |
SteveGilvarry
|
a16ea554a3
|
Swap to PNG
|
2017-03-18 22:34:13 +11:00 |
|
Matthew Noorenberghe
|
c7955cd1b6
|
Add eslint configuration files extending Google's rules
|
2017-03-18 00:02:17 -07:00 |
|
Matthew Noorenberghe
|
91ad6afffb
|
Increase default window sizes for the flat theme. Fixes #1059
Used the computed height of <html> and rounded up the nearest multiple of 5.
|
2017-03-17 22:24:42 -07:00 |
|
Matthew Noorenberghe
|
ea5342abd2
|
Properly escape postLoginQuery. Fixes #1797
|
2017-03-17 21:05:28 -07:00 |
|
Isaac Connor
|
8834109812
|
code style and whitespace changes
|
2017-03-17 09:59:23 -04:00 |
|
Isaac Connor
|
d9c665b021
|
Merge branch 'fix_crash_with_invalid_zones' into storageareas
|
2017-03-17 09:35:11 -04:00 |
|
Andrew Bauer
|
9681a444b4
|
Merge pull request #1765 from SteveGilvarry/ffmpeg_url
Align Method description to what it is actually doing
|
2017-03-16 09:32:30 -05:00 |
|
Andrew Bauer
|
7e0ac4b239
|
Merge pull request #1780 from connortechnology/fix_1775
use escapeshellarg on inputs to daemonControl and other functions
|
2017-03-16 09:27:04 -05:00 |
|
Isaac Connor
|
5bccd92b68
|
fix scoping of scale var
|
2017-03-16 09:53:53 -04:00 |
|
Isaac Connor
|
9f99d34807
|
fix calls to getStreamHTML
|
2017-03-13 14:22:33 -04:00 |
|
Isaac Connor
|
14c4a156c6
|
set img.src='' first so that Chrome closes the old stream.
|
2017-03-06 20:21:12 -05:00 |