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
|
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 |
|
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
|
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 |
Bernardus Jansen
|
986567839e
|
Additional minor changes
|
2016-12-02 10:08:49 +01:00 |