Isaac Connor
d493ca69a9
Merge branch 'master' into icon_video
2016-04-11 09:31:51 -04:00
Isaac Connor
feb7b36f11
use a local variable to prevent modifying the arguments
2016-04-09 11:23:52 -04:00
Isaac Connor
e90024c0d0
Better Error logging on disk_total_space failure
2016-04-09 09:27:12 -04:00
Isaac Connor
7491aa4381
fix spelling mistake
2016-04-06 10:55:11 -04:00
Isaac Connor
9a795432cf
merge all the commits from the messed up iconnor_video branch
2016-04-05 17:14:46 -04:00
SteveGilvarry
4d7ded5ef0
Merge remote-tracking branch 'upstream/master' into feature-h264-videostorage
...
Conflicts:
configure.ac
src/Makefile.am
web/js/Makefile.am
2016-04-05 22:06:14 +10:00
Isaac Connor
711343a5cc
fix ZM_SERVER_ID instead of ZM_SERVER
2016-04-04 16:34:21 -04:00
Isaac Connor
02eb36040a
fix bad code
2016-04-04 12:01:37 -04:00
Isaac Connor
c8fa0a9b4f
Merge branch 'master' into feature-h264-videostorage
2016-04-04 10:14:15 -04:00
Laercio Motta
ad912a6c6b
Improve test multiserver restart camera. (FIX)
...
Check if the server is correctly before restart cam and multiserver is activate.
2016-03-31 09:45:13 -03:00
Laercio Motta
2f27818e5b
Improve test multiserver restart cam.
...
Test if correct server from camera edit settings.
2016-03-31 09:23:01 -03:00
SteveGilvarry
3ce620eb89
Merge remote-tracking branch 'upstream/master' into feature-h264-videostorage
2016-02-27 19:46:56 +11:00
SteveGilvarry
7301e803ed
Merge remote-tracking branch 'upstream/master' into feature-h264-videostorage
...
Conflicts:
src/zm_monitor.cpp
src/zm_monitor.h
2016-01-30 15:45:08 +11:00
Isaac Connor
4520902dd2
use trim on values when saving.
2016-01-14 09:37:41 -05:00
Isaac Connor
f72260733c
Only do CORSHeaders if there is more than 1 server
2016-01-04 09:38:24 -05:00
Isaac Connor
d256530896
return early if no servers are defined instead of logging a warning
2016-01-04 09:36:45 -05:00
Isaac Connor
b8fb711593
only do CORS if Origin is set
2015-12-02 11:02:47 -05:00
Isaac Connor
62adb756a9
put back CORS validity checking code
2015-12-02 10:12:20 -05:00
Isaac Connor
3f8a45bbbb
Add a function to setup CORS access headers
2015-12-02 10:05:03 -05:00
SteveGilvarry
d8494aba2d
Merge remote-tracking branch 'upstream/master' into feature-h264-videostorage
...
Conflicts:
src/zm_monitor.cpp
src/zm_monitor.h
src/zm_remote_camera_rtsp.h
web/skins/classic/views/monitor.php
2015-10-23 22:07:22 +11:00
Andy Bauer
64299082ad
Send login activity to the zoneminder event log
2015-08-17 17:54:17 -05:00
Michael
d83349cc7f
fix to display thumbnails when only storing snapshot.jpg
2015-07-28 23:43:50 +10:00
SteveGilvarry
79c82ea880
Merge remote-tracking branch 'upstream/master' into Video-Highlander-Branch
2015-02-17 23:16:42 +11:00
Isaac Connor
fed6748c6d
fixes to format date into zero padding and year as 2 digit
2015-02-06 13:00:55 -05:00
Isaac Connor
dbac099223
we don't use EndTime so don't load it
2015-02-06 11:50:23 -05:00
Isaac Connor
9a1e210849
add comment
2015-02-06 11:46:35 -05:00
Isaac Connor
02a6c78182
make deleteEvent take either an event object or an eid.
...
load the relevant event data if passed an eid.
Use the StartTime to get to the event files instead of globbing the entire events path under the monitor.
2015-02-06 11:41:37 -05:00
Günter Grodotzki
8350ddac7c
replace getLoad() / getDiskPercent() with PHP native functions
2015-01-03 19:22:19 +01:00
SteveGilvarry
b79c2c1604
Merge remote-tracking branch 'upstream/master' into Video-Highlander-Branch
...
Conflicts:
web/skins/classic/views/event.php
web/skins/classic/views/timeline.php
Also reapplied required PHP Short Tags fix to a event.php and monitor.php that got impacted in merge.
2014-12-25 08:24:48 +10:00
SteveGilvarry
e87e69fa57
Ran script to replace all Short open tags
2014-12-05 10:44:23 +11:00
Isaac Connor
69090563d5
Merge branch 'master' into video
...
Conflicts:
src/CMakeLists.txt
src/zm_monitor.cpp
2014-11-28 14:23:05 -05:00
Isaac Connor
bec58a6011
fixes WRT to db logging. I believe fixes issue #504
2014-09-26 14:43:58 -04:00
Andrew Bauer
aa3803cb0b
Update functions.php
...
A more efficient check for IE >= 11 than the previous commit
2014-09-13 09:47:22 -05:00
Andrew Bauer
91b99b97a5
Update functions.php
...
Add logic to detect the User Agent string from IE11 (and potentially newer).
2014-09-13 08:19:08 -05:00
Kfir Itzhak
5217bb668a
Merge remote branch 'origin/master' into video
...
Conflicts:
src/zm_monitor.cpp
src/zm_monitor.h
2014-06-06 09:25:05 +03:00
Isaac Connor
5ae3cb8907
merge some security fixes from rogerroger288
2014-06-05 15:14:12 -04:00
Kfir Itzhak
0d7c52dc1f
Merge remote branch 'origin/master' into video
...
Conflicts:
src/CMakeLists.txt
src/zm_monitor.cpp
2014-04-17 13:26:00 +03:00
Maciej Czerniak
50a9055601
fix sql error which prevents remote login from working
2014-04-13 09:54:11 +02:00
m-bene
f22b956b8b
do not quote column names in parse filter
2014-04-08 09:07:59 +02:00
Isaac Connor
ffa952419c
Merge branch 'mysql2PDO'
...
Conflicts:
distros/ubuntu1204/changelog
scripts/ZoneMinder/lib/ZoneMinder/ConfigAdmin.pm
web/includes/actions.php
2014-03-20 16:48:03 -04:00
Kfir Itzhak
e652441996
Merge remote-tracking branch 'origin/master' into video
...
Conflicts:
configure.ac
src/CMakeLists.txt
2013-12-26 21:03:45 +02:00
Isaac Connor
7b26636bcd
Merge pull request #280 from ZoneMinder/zmfixremoval
...
Remove zmfix
2013-12-22 11:22:18 -08:00
Miklos Marton
5de638214b
In the web/includes/functions.php there were some html formatting errors in the outputVideoStream function.
...
These errors were:
- Unclosed object and embed tags
- param tags without closing tags
These errors lead to rendering errors when using the mobile skins with some specific streaming options.
2013-12-22 15:17:21 +01:00
Kfir Itzhak
e9bb632a78
Remove zmfix
2013-12-22 16:08:17 +02:00
Kfir Itzhak
2b79ff2cbd
Initial commit for saving events as videos :)
2013-12-19 18:38:07 +02:00
Philipp Rehs
d4babd23f1
Fix checkJsonError messages
...
The $value string was not set inside checkJsonError, so it was not possible to see the data which caused the error
2013-11-30 18:13:02 +01:00
Isaac Connor
51455b5c85
more updates and removal of escaping and quoting
2013-11-04 12:43:34 -05:00
Isaac Connor
cde89a7144
more quoting removal, some slight optimisations
2013-10-17 21:03:24 -04:00
Isaac Connor
ef765afa2d
Merge branch 'master' into mysql2PDO
2013-10-17 17:02:44 -04:00
Isaac Connor
36c4fad644
remove extra quoets since dbEcape does quoting now
2013-10-17 15:35:23 -04:00
