Isaac Connor
|
9ac20999b3
|
rough in
|
2017-05-05 21:11:23 -04:00 |
Isaac Connor
|
e45316dcd1
|
add debugging
|
2017-05-05 17:53:03 -04:00 |
|
Isaac Connor
|
7be2ee0e1b
|
add back videoEvent
|
2017-05-05 17:19:02 -04:00 |
|
Isaac Connor
|
0f5142fa19
|
bring back video popup
|
2017-05-05 17:18:48 -04:00 |
|
Isaac Connor
|
bde887fc9c
|
remove unneeded ;'s
|
2017-05-05 17:17:55 -04:00 |
|
Isaac Connor
|
fe532ac945
|
make args not required
|
2017-05-05 17:17:39 -04:00 |
Isaac Connor
|
1b0a03c723
|
Merge branch 'storageareas' of github.com:connortechnology/ZoneMinder into storageareas
|
2017-05-05 16:52:38 -04:00 |
Isaac Connor
|
fd90de5952
|
if no AuthHashGEneratedAt then generate one instead of outputting an error
|
2017-05-05 16:47:50 -04:00 |
|
Isaac Connor
|
deb1cf653a
|
fix dimensions of ptz box
|
2017-05-05 16:47:21 -04:00 |
|
Isaac Connor
|
f66b606e34
|
use isset
|
2017-05-05 16:40:05 -04:00 |
|
Isaac Connor
|
92854f5cba
|
more debug
|
2017-05-05 16:37:30 -04:00 |
|
Isaac Connor
|
cb99d709c5
|
add debug
|
2017-05-05 16:37:12 -04:00 |
|
Isaac Connor
|
64193c3368
|
turn status ajax calls to gets instead of posts
|
2017-05-05 16:18:12 -04:00 |
|
Isaac Connor
|
1ff367373f
|
use ZM_AUTH_HASH_SECRET for the key, not the secret
|
2017-05-05 16:15:34 -04:00 |
|
Isaac Connor
|
a0e4e6537e
|
prefer key based tokens over session
|
2017-05-05 16:11:40 -04:00 |
|
Isaac Connor
|
0982c9fdec
|
add Debug lines
|
2017-05-05 16:00:52 -04:00 |
|
Isaac Connor
|
19b2de6d28
|
add a Download MP4 button
|
2017-05-05 15:13:25 -04:00 |
|
Isaac Connor
|
355eb1beef
|
when mouseover the thumbnail, stream the video
|
2017-05-05 14:25:25 -04:00 |
|
Isaac Connor
|
3b6cf74ed3
|
add auth_hash to ajax calls
|
2017-05-05 11:53:40 -04:00 |
|
Isaac Connor
|
cccc3df700
|
Merge branch 'master' into storageareas
|
2017-05-03 16:43:44 -04:00 |
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 |
|
Isaac Connor
|
8bd34a982d
|
only use scale if it has a value
|
2017-03-21 15:30:22 -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 |
|
Isaac Connor
|
4df12ae370
|
Merge branch 'montage_width_height' of github.com:ConnorTechnology/ZoneMinder into montage_width_height
|
2017-03-06 17:30:00 -05:00 |
|
Isaac Connor
|
d3f7451736
|
Merge branch 'storageareas' into montage_width_height
|
2017-03-06 16:56:18 -05:00 |
|
Isaac Connor
|
fdcb93eacc
|
Merge branch 'master' into storageareas
|
2017-03-06 16:22:28 -05:00 |
|
Isaac Connor
|
ebafc62b51
|
Must reopen the session so we can generate an auth hash
|
2017-03-01 15:27:42 -05:00 |
|
Isaac Connor
|
4fc0aead70
|
wip
|
2017-03-01 15:26:40 -05:00 |
|
Isaac Connor
|
c4caa9a631
|
convert arguments from an array of strong to a hash and use http_build_query
|
2017-02-27 21:48:08 -05:00 |
Isaac Connor
|
c3a52272d8
|
implement changeWidth, changeHeight and alter getStreamHTML to take an array of options
|
2017-02-27 20:56:14 -05:00 |
|
Isaac Connor
|
a0dd36d869
|
add width and height scale dropdowns
|
2017-02-27 16:40:40 -05:00 |
|
Andy Bauer
|
8759e2bdb4
|
prevent divide by zero, make error messages more descriptive
|
2017-02-21 13:10:41 -06:00 |
|
Andy Bauer
|
27ca8d8674
|
use === operator in getDiskPercent function
|
2017-02-21 12:33:05 -06:00 |
|
Isaac Connor
|
186e5ba866
|
Merge branch 'master' into storageareas
|
2017-02-21 09:48:00 -05:00 |
|
Isaac Connor
|
971c70f540
|
Merge pull request #1793 from mnoorenberghe/api_debug_default
Reduce the default API debug level
|
2017-02-20 21:44:48 -05:00 |
|
Matthew Noorenberghe
|
df4739826b
|
Reduce the default API debug level
|
2017-02-18 23:06:53 -08:00 |
Manojav Sridhar
|
f50c0e2096
|
fix missing isset check, caused number of Undefined Property warnings
|
2017-02-18 11:15:43 -05:00 |
|
Manojav Sridhar
|
11b90e6011
|
fix usage of wrong key
|
2017-02-17 12:37:58 -05:00 |
|
Isaac Connor
|
980b088d57
|
google style and add label tags around Scale
|
2017-02-17 09:19:54 -05:00 |
|
Isaac Connor
|
2bf4b5ad1a
|
use escapeshellarg on inputs to daemonControl and other functions where exec is called
|
2017-02-15 09:45:25 -05:00 |
|
Isaac Connor
|
d135216ac7
|
Merge branch 'master' into storageareas
|
2017-02-15 09:30:35 -05:00 |
|
Isaac Connor
|
aeedfe8d74
|
fix some whitespacing
|
2017-02-14 09:11:54 -05:00 |
|
SteveGilvarry
|
b791504598
|
Wording of help text fixes
|
2017-02-06 08:01:04 +11:00 |
|
SteveGilvarry
|
9716c4ef89
|
Add Option help
|
2017-02-05 18:43:47 +11:00 |
|
SteveGilvarry
|
c72704bf0b
|
Change descriptions for ffmpeg methods and put TCP first.
|
2017-02-05 15:34:06 +11:00 |
Kyle Johnson
|
5804cd2462
|
Merge pull request #2 from connortechnology/fix_sql_injection
Sanitize input parameters
|
2017-02-04 15:05:54 -07:00 |
|
Andrew Bauer
|
c5906a5d4f
|
Merge pull request #6 from connortechnology/log_xss_fixes2
Log xss fixes2
|
2017-02-04 16:05:43 -06:00 |
|
Kyle Johnson
|
6b3a53ec0f
|
Tell PDO to use real prepared statements.
This makes sure the statement and the values aren't
parsed by PHP before sending it to the MySQL server.
See https://stackoverflow.com/questions/60174/how-can-i-prevent-sql-injection-in-php
and https://secure.php.net/manual/en/pdo.setattribute.php
|
2017-02-04 14:59:33 -07:00 |
|
Isaac Connor
|
e3edbf40cf
|
make url full width
|
2017-02-02 12:16:40 -05:00 |
|
Isaac Connor
|
7b73eb350f
|
update to current.
|
2017-02-02 12:15:16 -05:00 |
|
Isaac Connor
|
d8c79cb750
|
fixup header and sidebar layout
|
2017-02-02 11:31:16 -05:00 |
|
Isaac Connor
|
cee05a1bb7
|
fix merge problem
|
2017-02-02 09:21:49 -05:00 |
|
Isaac Connor
|
9135da92ed
|
fix typo fileFields => filterFields
|
2017-01-31 21:33:43 -05:00 |
Isaac Connor
|
7d451e1e41
|
float the scale control right, add css for other skins
|
2017-01-31 11:13:16 -05:00 |
|
Isaac Connor
|
4a4f62f0a7
|
add a scale element to the frame view. Include some bits from StorageAreas to make it work
|
2017-01-31 11:13:16 -05:00 |
|
Isaac Connor
|
568160e5aa
|
add a scale element to the frame view. Include some bits from StorageAreas to make it work
|
2017-01-31 11:13:15 -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
|
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
|
3437f23e8a
|
Merge branch 'master' into fix_sql_injection
|
2017-01-28 14:33:49 -05:00 |
|
Isaac Connor
|
41dab0750e
|
turn whatever gets output into html escaped html so that nothing gets revealed
|
2017-01-27 21:30:22 -05:00 |
|
Isaac Connor
|
a8d1450adf
|
Merge branch 'master' into fix_sql_injection
|
2017-01-27 17:18:34 -05:00 |
|
Kyle Johnson
|
746a096483
|
Merge branch 'master' of github.com:ZoneMinder/ZoneMinder
|
2017-01-27 15:16:33 -07:00 |
|
Isaac Connor
|
c1e05753d6
|
Merge branch 'master' of github.com:ZoneMinder/ZoneMinder-Pro
|
2017-01-27 17:12:46 -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 |
|
Isaac Connor
|
129acb5b8e
|
only show mark column if you have the Monitor Edit ability
|
2017-01-24 09:30:56 -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 |
|
Isaac Connor
|
bb3d47ab45
|
get rid of mapping
|
2017-01-23 21:34:06 -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 |
|
SteveGilvarry
|
2f3ebd80da
|
Remove zmf, die..die..die
|
2017-01-16 13:20:05 -08:00 |
|
Isaac Connor
|
9c8b229c74
|
Fix cutnpaste error
|
2017-01-14 17:08:13 -05:00 |
|
Isaac Connor
|
899b1b82b9
|
Merge branch 'filter_by_runstate' into storageareas
|
2017-01-14 17:07:20 -05:00 |
|
Isaac Connor
|
242e5a56d8
|
rough in the ability to filter on RunState
|
2017-01-14 16:55:28 -05:00 |
|
Isaac Connor
|
2ce4bad39b
|
fix Event being undefined when called by path
|
2017-01-13 14:42:10 -05:00 |
|
Kyle Johnson
|
0e7794f2a7
|
Merge pull request #1 from connortechnology/cookie_http_only
set http_only flag in cookie settings
|
2017-01-12 09:25:36 -07:00 |
|
Isaac Connor
|
16fdac3179
|
fix remSocketFile to remSockFile
|
2017-01-11 11:14:00 -05:00 |
|
Isaac Connor
|
2436e40f5d
|
Merge branch 'master' into storageareas
|
2017-01-11 10:34:27 -05:00 |
|
Andy Bauer
|
7ef7a36f39
|
fix conditional logic in controlcap.js
|
2017-01-10 17:53:05 -06:00 |
|
Isaac Connor
|
3074263e06
|
Merge branch 'control_fixes' into storageareas
|
2017-01-10 12:54:46 -05:00 |
|
Isaac Connor
|
55403219d8
|
fix regexp for direction in control command. Also log if the regexp doesn't match
|
2017-01-10 12:35:38 -05:00 |
|
Isaac Connor
|
fea5fa1b59
|
fix xtell should be -1 for move left
|
2017-01-10 12:35:02 -05:00 |
|
Isaac Connor
|
d8b8d78576
|
Fix storagearea lookup. Default to ZM_EVENTS_DIR
|
2017-01-09 16:35:58 -05:00 |
|
Isaac Connor
|
03fd964518
|
fix parsing StorageID
|
2017-01-09 14:59:14 -05:00 |
|
Isaac Connor
|
7ef0c2c9d3
|
fix deleting filters. We don't need to set fid anymore
|
2017-01-09 14:58:55 -05:00 |
|
Isaac Connor
|
cc724a5542
|
add a question mark to delete confirmation
|
2017-01-09 14:53:13 -05:00 |
|
Isaac Connor
|
84183c819c
|
Merge branch 'master' into storageareas
|
2017-01-03 09:53:09 -05:00 |
|
Isaac Connor
|
b4bddee337
|
Merge branch 'master' into improve_filter
|
2017-01-03 08:49:56 -05:00 |
|
Isaac Connor
|
0a90dbac9f
|
require Event.php and clean up use of object vs db row array. Use newer way of using views/image.php by passing eid and frameid instead of a path.
|
2017-01-02 10:35:51 -05:00 |
|
Isaac Connor
|
30674919c4
|
always include Storage object, because in the end we will be using it everywhere
|
2017-01-02 10:34:45 -05:00 |
|
Isaac Connor
|
f6ea52280a
|
Update Event object to @iconnor's latest which brings us a createListThumbnail function copied from includes/functions
|
2017-01-02 10:34:15 -05:00 |
|
Andrew Bauer
|
b063d8d6aa
|
Merge pull request #1728 from connortechnology/path_zms_message
Path zms message
|
2017-01-02 08:54:32 -06:00 |
|
Isaac Connor
|
5ae34a7561
|
Merge branch 'master' into storageareas
|
2017-01-02 09:39:10 -05:00 |
|
Isaac Connor
|
ef71ae248c
|
fix ramSocketFile to remSocketFile
|
2017-01-02 09:31:26 -05:00 |
|
Isaac Connor
|
d97926c478
|
fix ramSocketFile to remSocketFile
|
2017-01-02 09:31:06 -05:00 |
klemens
|
0d549f1db3
|
spelling fixes
|
2016-12-29 10:31:05 +01:00 |
|
Andy Bauer
|
25ab1bee18
|
more fixed to gpl license text
|
2016-12-26 10:40:09 -06:00 |
|
Andy Bauer
|
2dda2d9e1e
|
remove unneeded, empty files
|
2016-12-26 09:49:14 -06:00 |
|
Andy Bauer
|
254fcbcef7
|
update gpl 2 mailing address in source files
|
2016-12-26 09:23:16 -06:00 |
|
Isaac Connor
|
0f4b78b180
|
increase height of bandwidth popup
|
2016-12-21 10:46:42 -05:00 |
|
Isaac Connor
|
f92edc3456
|
refresh stream url when changing scale
|
2016-12-21 10:40:47 -05:00 |
|
Isaac Connor
|
02a2fdf58f
|
Merge branch 'remove_emptys' into storageareas
|
2016-12-20 16:40:42 -05:00 |
|
Isaac Connor
|
38c0cedecc
|
remove the use of empty which on php < 5.5 only supports variables.
|
2016-12-20 16:37:42 -05:00 |
|
Isaac Connor
|
c27d0270dc
|
Merge branch 'knnniggett-zmMemDetach' into storageareas
|
2016-12-20 15:40:14 -05:00 |
|
Isaac Connor
|
752f0eb40b
|
Merge branch 'master' into improve_filter
|
2016-12-20 11:43:02 -05:00 |
|
Andrew Bauer
|
68a24040ab
|
Merge pull request #1710 from connortechnology/path_zms_message
replace the old socket_sendto error message with something more useful
|
2016-12-20 10:30:35 -06:00 |
|
Isaac Connor
|
8b726996f7
|
FAQ fixes, more text about zms problems in it, and adjust the socket_sendto error message to point to the FAQ entry that is relevant.
|
2016-12-19 21:36:39 -05:00 |
|
Isaac Connor
|
fe3f3d91ce
|
replace the old socket_sendto error message with something more useful so that people stop asking us how to fix it.
|
2016-12-16 09:12:27 -05:00 |
|
Isaac Connor
|
794043cbe9
|
On successful login, tell php to regenerate the session id
|
2016-12-14 15:06:18 -05:00 |
|
Isaac Connor
|
ad157cf21c
|
fix tabs
|
2016-12-14 14:56:54 -05:00 |
|
Isaac Connor
|
69c39f8a23
|
set http_only flag in cookie settings
|
2016-12-14 14:39:44 -05:00 |
|
Isaac Connor
|
87e8f91868
|
Merge branch 'storageareas' of github.com:connortechnology/ZoneMinder into storageareas
|
2016-12-13 15:06:07 -05:00 |
|
Isaac Connor
|
708f52beda
|
Merge branch 'disk_space_in_events' into storageareas
|
2016-12-13 13:36:18 -05:00 |
|
Isaac Connor
|
a9548d3f6b
|
Add a config entry to turn event disk space on/off
|
2016-12-13 13:34:56 -05:00 |
|
Isaac Connor
|
30ec67d4c3
|
Merge branch 'master' into disk_space_in_events
|
2016-12-13 13:28:32 -05:00 |
|
Isaac Connor
|
821f9f8e6e
|
Merge branch 'fix_sql_injection' into storageareas
|
2016-12-08 15:58:10 -05:00 |
|
Isaac Connor
|
b5e4c94682
|
test for integer string as well
|
2016-12-08 15:58:00 -05:00 |
|
Isaac Connor
|
4fa24dcda4
|
Merge branch 'fix_sql_injection' into storageareas
|
2016-12-08 15:53:46 -05:00 |
|
Isaac Connor
|
7c84e2417d
|
remove extra ?
|
2016-12-08 15:53:38 -05:00 |
|
Isaac Connor
|
f68c73b4a8
|
Merge branch 'fix_sql_injection' into storageareas
|
2016-12-08 15:52:52 -05:00 |
|
Isaac Connor
|
08370b010e
|
Merge branch 'log_xss_fixes' into storageareas
|
2016-12-08 15:52:37 -05:00 |
|
Isaac Connor
|
42fdd1fbe9
|
Use htmlentities on the error message when dying because the string will be sent to the browser and if it includes scripts they will be run.
|
2016-12-08 15:52:21 -05:00 |
|
Isaac Connor
|
c8009baf3f
|
fix missing ; and test for integer string in limit
|
2016-12-08 15:46:42 -05:00 |
|
Isaac Connor
|
acbc5bc9e3
|
Merge branch 'cookie_http_only' into storageareas
|
2016-12-08 15:20:54 -05:00 |
|
Isaac Connor
|
772792a1b9
|
remove extra ,
|
2016-12-08 15:20:43 -05:00 |
|
Isaac Connor
|
ced701f56f
|
Merge branch 'fix_sql_injection' into storageareas
|
2016-12-08 14:58:50 -05:00 |
|
Isaac Connor
|
7f2bf04c2f
|
Merge branch 'cookie_http_only' into storageareas
|
2016-12-08 14:26:13 -05:00 |
|
Isaac Connor
|
20793ee822
|
set httpOnly to true on cookie creation. This will override whatever is in php.ini
|
2016-12-08 14:25:29 -05:00 |
|
Isaac Connor
|
d600eb0e8b
|
Merge branch 'master' into fix_sql_injection
|
2016-12-08 13:39:04 -05:00 |
|
Isaac Connor
|
e7d0861530
|
check limit for a valid integer and complain if not.
|
2016-12-08 13:37:23 -05:00 |
|
Isaac Connor
|
587fd16aa6
|
Add testing for limit, sortField and all the filters to ensure that they are valid.
|
2016-12-08 13:31:44 -05:00 |
|
Isaac Connor
|
857b4e8345
|
Merge branch 'master' into improve_filter
|
2016-12-06 11:58:41 -05:00 |
Bernardus Jansen
|
986567839e
|
Additional minor changes
|
2016-12-02 10:08:49 +01:00 |
|
Bernardus Jansen
|
e27639f599
|
Updated dutch translation
|
2016-12-02 09:49:50 +01:00 |
|
Isaac Connor
|
9e5f52a0ae
|
fix MonitorId is part of event, not frame
|
2016-11-29 15:25:51 -05:00 |
|
Isaac Connor
|
2adb17ad90
|
fix type
|
2016-11-29 15:25:24 -05:00 |
|
Isaac Connor
|
c2d6b3d809
|
fix auth
|
2016-11-29 15:25:10 -05:00 |
|
Isaac Connor
|
f9af1e7129
|
put authorized check back after including actions.php where it needs to go
|
2016-11-28 11:34:46 -05:00 |
|
Isaac Connor
|
be5b4691da
|
check for isset of SESSION['username'] instead of just assuming it exists
|
2016-11-22 15:35:07 -05:00 |
|
Isaac Connor
|
9312eed17f
|
Merge branch 'master' into disk_space_in_events
|
2016-11-22 10:58:24 -05:00 |
|
Isaac Connor
|
02cd3e8cba
|
Merge branch 'master' into small_fixes
|
2016-11-22 10:52:07 -05:00 |