0e74778dda
add find and find_all functions
2016-05-05 14:49:57 -04:00
fe63e4af80
remove extra semi colon
2016-05-02 13:42:42 -04:00
da157f5a1a
Merge remote-tracking branch 'upstream/master' into feature-h264-videostorage
2016-04-30 22:27:10 +10:00
0044161b9c
Merge branch 'fix_zone_edit' into storageareas
2016-04-29 10:46:37 -04:00
be5f0cd4a9
replace OutputVideoStream and OutputImageStream with versions that return a string. Call getStreamHTML before we output the headers because we use streamMode and streamSrc in the header .js.php
2016-04-29 10:44:46 -04:00
af66105c37
Merge branch 'master' into storageareas
2016-04-29 08:28:53 -04:00
5e20831030
Don't return of disk_free_space returns false, just log it.
2016-04-28 09:29:40 -04:00
d847d66e99
handle disk_free_space error
2016-04-26 14:40:40 -04:00
59db5d42e7
include Frame.php
2016-04-25 15:00:27 -04:00
4b4add49bd
Merge /home/iconnor/sandbox/ZoneMinder.connortechnology into storageareas
2016-04-15 13:18:35 -04:00
ccb5ea766d
add the toggle for RecordAudio so that the checkbox works to turn off Audio
2016-04-15 13:16:52 -04:00
61bd60184a
Merge branch 'random_fixes' into storageareas
2016-04-11 11:28:24 -04:00
851a81eff7
Merge pull request #1406 from ZoneMinder/svg_zones
...
replace the static zone image with a stream, and use SVG to draw the zones
2016-04-11 11:14:11 -04:00
d493ca69a9
Merge branch 'master' into icon_video
2016-04-11 09:31:51 -04:00
e5bf2d245c
quit the stream in zones.php when zone.php is called
2016-04-10 15:33:55 -05:00
78c6e14e0c
Merge branch 'master' into storageareas
2016-04-09 14:52:28 -04:00
feb7b36f11
use a local variable to prevent modifying the arguments
2016-04-09 11:23:52 -04:00
ce6f8da098
Use PDO::error_string instead of mysql_error
2016-04-09 11:23:35 -04:00
e90024c0d0
Better Error logging on disk_total_space failure
2016-04-09 09:27:12 -04:00
6bb95beb9a
Merge branch 'svg_zones' into storageareas
2016-04-08 13:20:01 -04:00
3056069f3f
introduce getStreamHTML which returns the required HTML to give you a live image
2016-04-08 11:06:34 -04:00
7491aa4381
fix spelling mistake
2016-04-06 10:55:11 -04:00
b4b622668c
fix merge
2016-04-06 08:39:47 -04:00
9a795432cf
merge all the commits from the messed up iconnor_video branch
2016-04-05 17:14:46 -04:00
60642c1fff
Merge branch 'iconnor_video' into storageareas
2016-04-05 12:32:33 -04:00
238a25a302
Merge branch 'master' into iconnor_video
2016-04-05 09:38:59 -04:00
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
4e9a925933
Merge branch 'Autotools_delete' of https://github.com/SteveGilvarry/ZoneMinder into SteveGilvarry-Autotools_delete
2016-04-04 20:52:49 -05:00
7ff8d36598
Merge branch 'depracation_nation' of https://github.com/SteveGilvarry/ZoneMinder into SteveGilvarry-depracation_nation
2016-04-04 20:44:53 -05:00
868e5a51fa
Rename some of the columns names when laoding Control settings as they conflict with Monitor columns
2016-04-04 16:44:21 -04:00
711343a5cc
fix ZM_SERVER_ID instead of ZM_SERVER
2016-04-04 16:34:21 -04:00
ec6782a663
fix ZM_SERVER_ID instead of ZM_SERVER
2016-04-04 16:33:46 -04:00
bc9760ce79
Merge branch 'master' into storageareas
2016-04-04 16:13:17 -04:00
02eb36040a
fix bad code
2016-04-04 12:01:37 -04:00
faa75bbe39
fix wrong brace and needs quotes
2016-04-04 12:00:29 -04:00
197ae67313
Merge branch 'always_show_ptz' into storageareas
2016-04-04 11:47:29 -04:00
c8fa0a9b4f
Merge branch 'master' into feature-h264-videostorage
2016-04-04 10:14:15 -04:00
8a2605578a
fix type in htmlSelect
2016-04-01 15:43:40 -04:00
d71eaa66ec
use view_video.php as a short-term fix for viewing video
2016-04-01 15:43:31 -04:00
ca96481036
fix thumbnail generation from video file
2016-04-01 13:02:31 -04:00
cbebdfe670
add Time function to get unixtime from StartTime
2016-04-01 13:00:59 -04:00
6ebd71f980
instead of loading and looking at current recording settings, check to see if the images exist. If not, generate them from the video file
2016-04-01 12:51:09 -04:00
6816a4c75b
Merge branch 'iconnor_video' into storageareas
2016-04-01 11:35:38 -04:00
59bf780537
introduce htmlSelect as a better version of buildSelect
2016-04-01 10:35:59 -04:00
c074f6e0bf
Add a set function to take an array of value to set in the Object
2016-04-01 10:34:40 -04:00
c9a1a9020d
Merge h264
2016-03-31 11:03:36 -04:00
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
2f27818e5b
Improve test multiserver restart cam.
...
Test if correct server from camera edit settings.
2016-03-31 09:23:01 -03:00
e5a36c02bd
Merge remote-tracking branch 'origin/master' into video_remote
2016-03-30 16:55:24 -04:00
50f9241c14
When no Id is specified, default to ZM_DIR_EVENTS
2016-03-29 15:38:53 -04:00
cfa11b95dc
Add missing Server and Storage Area filters
2016-03-29 12:27:23 -04:00
d91045319d
Use Event object delete method in deleteEvent
2016-03-29 12:07:13 -04:00
655116eea9
add LinkPath and delete methods
2016-03-29 11:49:15 -04:00
24ebc33ea4
Merge remote-tracking branch 'upstream/master' into feature-h264-videostorage
2016-03-09 20:54:11 +11:00
0d8c63f578
Merge branch 'master' into storageareas
2016-03-02 09:11:55 -05:00
466f2b2ae3
change multi-server error message text
2016-03-01 11:12:54 -06:00
3ce620eb89
Merge remote-tracking branch 'upstream/master' into feature-h264-videostorage
2016-02-27 19:46:56 +11:00
d40bf89b17
Remove Phone BW settings used with mobile skin
2016-02-26 22:43:37 +11:00
5ff427d9e9
Removed Autotools Makefile.am
...
Conflicts:
Makefile.am
misc/Makefile.am
src/Makefile.am
web/includes/Makefile.am
web/js/Makefile.am
web/skins/classic/css/classic/views/Makefile.am
web/skins/classic/css/flat/views/Makefile.am
web/skins/classic/views/Makefile.am
web/skins/classic/views/js/Makefile.am
2016-02-26 22:19:02 +11:00
e2d892961b
use storage area paths in getting analyze images and frame stills
2016-02-19 09:46:56 -05:00
51d814ad46
add concurrent to save filter
2016-02-05 11:58:05 -05:00
0674fa2d7a
Merge branch 'storageareas' of github.com:ZoneMinder/ZoneMinder into storageareas
2016-02-04 12:21:33 -05:00
89cff287cd
Merge branch 'master' into storageareas
2016-02-04 12:14:16 -05:00
ab7b4ab3e6
Merge pull request #1221 from ZoneMinder/rotate_dimensions_when_image_is_rotated
...
implement Width and Height functions, and test for image rotation and…
2016-02-04 10:17:19 -06:00
08858685c5
add find_all function to Storage
2016-02-03 09:43:02 -05:00
9543a8a364
Add Event.php to autoconf build
2016-02-01 13:08:48 -05:00
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
e057d8d722
rough in an Event object.
2016-01-14 13:34:51 -05:00
4520902dd2
use trim on values when saving.
2016-01-14 09:37:41 -05:00
69ddc7d34c
Merge branch 'storageareas' of github.com:ZoneMinder/ZoneMinder into storageareas
2016-01-04 14:38:37 -05:00
b9f17a18d6
Merge branch 'multi-server' into storageareas
2016-01-04 14:09:41 -05:00
f5db14d823
return empty for the non multi-server case
2016-01-04 13:46:05 -05:00
5144d3befb
Merge branch 'rotate_dimensions_when_image_is_rotated' into storageareas
2016-01-04 13:19:09 -05:00
45fc689203
implement Width and Height functions, and test for image rotation and output opposite dimension. Fixes #1220
2016-01-04 13:15:50 -05:00
f72260733c
Only do CORSHeaders if there is more than 1 server
2016-01-04 09:38:24 -05:00
d256530896
return early if no servers are defined instead of logging a warning
2016-01-04 09:36:45 -05:00
33b8405e0d
Merge branch 'multi-server' into storageareas
2016-01-03 11:57:07 -05:00
c639822d62
When Server is not set, us ZM_BASE_PATH
2016-01-03 11:55:53 -05:00
93dbc3f0c1
Merge multi-server updates and bump version
2016-01-01 16:31:02 -05:00
12ee147bc7
Add a find_all function to return an array of Server objects
2015-12-31 10:13:48 -05:00
eccfced6d4
Merge branch 'multi-server' into newpointone
...
Conflicts:
distros/ubuntu1204/apache.conf
2015-12-22 09:54:13 -05:00
6df1425897
Slight update to allow the instantiation with no row or Id
2015-12-22 09:52:33 -05:00
e28e3c2b75
Merge branch 'master' into feature-h264-videostorage
2015-12-20 14:13:30 +11:00
9782204548
include Storage.php
2015-12-18 12:13:26 -05:00
8f141305b7
add default parameter in constuctor
2015-12-15 13:27:57 -05:00
c345d697b2
missed dbServer -> dbStorage
2015-12-15 11:21:52 -05:00
6ce7952acb
Merge branch 'multi-server' into storageareas
2015-12-15 11:20:01 -05:00
aaa9f3bcc9
Handle case where parameter is not passed to constuctor
2015-12-15 11:19:50 -05:00
9ffbaabde5
add save and delete actions for Storage
2015-12-15 11:12:33 -05:00
c07c63cde6
Check for setting of IdOrRow. When loading from db, using FETCH_CLASS, the constructor is called without arguments
2015-12-15 11:12:21 -05:00
6cfd993890
Merge branch 'master' into multi-server
2015-12-09 10:43:38 -05:00
53dec9f26d
check for setting of __REQUEST['object'] to silence php NOTICE
2015-12-09 10:43:23 -05:00
e6c9830728
Use Monitor class instead of old sql
2015-12-09 09:23:36 -05:00
961dc90b0e
add Server function
2015-12-02 11:21:04 -05:00
b8fb711593
only do CORS if Origin is set
2015-12-02 11:02:47 -05:00
62adb756a9
put back CORS validity checking code
2015-12-02 10:12:20 -05:00
3f8a45bbbb
Add a function to setup CORS access headers
2015-12-02 10:05:03 -05:00
a799a1ce79
Make Server constructor take a row or an id
2015-12-02 10:04:47 -05:00
c5d57b5b64
convert monitor hash accesses to function calls
2015-12-01 15:16:43 -05:00
945949ebc0
fix __call to actually return the value
2015-12-01 15:16:18 -05:00
2dfa6d6bae
add Url and __call functions
2015-12-01 15:16:07 -05:00
e85ba683e1
improve constructor to handle numeric as well, and give error when something else
2015-12-01 14:29:57 -05:00
e4f5f76782
rewrite constructor to take a row as well as an Id
2015-12-01 14:03:55 -05:00
220ee5e516
Merge remote-tracking branch 'upstream/master' into feature-h264-videostorage
2015-11-29 13:17:22 +11:00
4d6c4355db
Merge branch 'master' into multi-server
2015-11-20 16:07:50 -05:00
a0d4934b84
Have PDO actually throw exceptions on db errors. Prior to this it would have been just failing silently. Also, fix a . to -> in the exception catcher.
2015-11-11 16:56:28 -05:00
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
2237391876
white spacing, and fix loading of Server objects in monitor
2015-10-15 09:28:35 -04:00
6570a8d855
fix Server->Hostname()
2015-10-02 18:22:19 +00:00
00ef849908
fix line testing for Hostname
2015-10-02 15:29:17 +00:00
e4d51e1819
Merge branch 'master' into multi-server
2015-09-28 10:04:23 -04:00
d751c3ad61
recaptcha now displays translated message if secret is wrong
2015-09-25 11:11:15 -04:00
e5a6889253
fixed conflict
2015-09-24 15:51:16 -04:00
23b549a471
recaptcha fixes to avoid lockout
2015-09-24 15:44:35 -04:00
ae6fd7daea
fixed constant check when not defined
2015-09-24 09:57:43 -04:00
ba1100fc03
continue conversion from array to class of Monitor
2015-09-17 16:06:47 -04:00
01718aaffb
consturctor just takes an id
2015-09-17 15:34:26 -04:00
13327b7651
Load Controls if appropriate
2015-09-17 15:34:09 -04:00
52cdb8a05a
add Monitor class
2015-09-17 15:29:36 -04:00
ac5f42efcf
add a class for Server objects
2015-09-16 15:16:07 -04:00
a8ba32db64
add Server.php to autoconf build
2015-09-16 14:51:59 -04:00
73badd1c2d
check for value of ZM_SERVER_NAME and ZM_SERVER_HOST and include it in the error message
2015-09-16 11:12:04 -04:00
535a760f26
Merge branch 'master' into multi-server
...
Conflicts:
configure.ac
2015-09-16 09:12:55 -04:00
fb872315d1
add an error log entry for unknown action
2015-09-16 08:38:53 -04:00
b680aa41c5
save should be Save
2015-09-15 17:26:31 -04:00
d235733290
Need to include logger if we are going to use Error
2015-09-14 15:57:22 -04:00
04fcc253bd
Merge pull request #1048 from pliablepixels/1046-google-recaptcha
...
Google recaptcha
2015-09-01 08:18:54 -05:00
22a7a1d53d
Handled situation where user enables captcha but forgets to supply keys
2015-08-31 20:39:28 -04:00
bb41ebf776
Merge branch 'master' into multi-server
...
Conflicts:
src/zm_monitor.cpp
2015-08-31 16:03:40 -04:00
feeb890be2
removed recaptcha client dependency
2015-08-29 15:14:20 -04:00
f7fea2fe48
Removed dependency on recaptcha client library
2015-08-29 15:13:15 -04:00
73fa051ef8
Google recaptcha
2015-08-29 13:29:52 -04:00
395e628541
Merge branch 'new_rtsp_describe' of https://github.com/knnniggett/ZoneMinder into knnniggett-new_rtsp_describe
...
Conflicts:
CMakeLists.txt
configure.ac
version
2015-08-29 07:57:18 -05:00
75919c9cd5
Merge branch 'master' into multi-server
...
Conflicts:
docs/installationguide/ubuntu.rst
misc/apache.conf.in
src/zm_monitor.cpp
2015-08-27 10:34:47 -04:00
d68e8e8f68
Restart capture process after deleting a Privacy zone
2015-08-27 10:12:54 +02:00
dc8a3769e7
Make the capture process restart if a Privacy zone got changed
2015-08-27 09:45:12 +02:00
2fbf79674b
Add RTSP Describe checkbox to web console
2015-08-21 10:32:50 -05:00
880e77b096
Merge branch 'master' into multi-server
...
Conflicts:
src/zm_monitor.cpp
src/zm_monitor.h
2015-08-19 13:30:48 -04:00
c78f39c106
Merge pull request #962 from Linwood-F/959-add-exif-date-time-to-images
...
959 add exif date time to images
2015-08-18 13:46:54 -05:00
987db68452
Fix extra image copy; fix options unset of exif toggle
2015-08-18 14:39:55 -04:00
64299082ad
Send login activity to the zoneminder event log
2015-08-17 17:54:17 -05:00
5b2155f551
define Groups permission for the default user
2015-08-15 16:47:07 -05:00
0dc35553ef
modify group delete action
2015-08-15 14:03:11 -05:00
1d688be1a1
propagate canEditGroup permission
2015-08-15 13:22:13 -05:00
2770e752b4
create new permission group "Groups" in php
2015-08-15 11:56:51 -05:00
d83349cc7f
fix to display thumbnails when only storing snapshot.jpg
2015-07-28 23:43:50 +10:00
f09a551d6a
Merge branch 'master' into feature-h264-videostorage
2015-07-28 21:06:52 +10:00
441a82e611
fixup loading SERVER_ID from SERVER_NAME
2015-07-17 10:12:44 -04:00
69e1fd8b18
add code to convert the human readable config entry ZM_SERVER_NAME into ZM_SERVER_ID
2015-07-09 11:45:19 -04:00
04366e752a
add Servers to options, a server editing popup and a server selection to monitors
2015-07-09 11:41:46 -04:00
9b06b1399c
Merge branch 'master' into feature-h264-videostorage
...
Conflicts:
scripts/ZoneMinder/lib/ZoneMinder/ConfigData.pm.in
scripts/ZoneMinder/lib/ZoneMinder/Memory.pm.in
src/zm_ffmpeg_camera.cpp
web/skins/classic/views/event.php
web/skins/classic/views/monitor.php
web/skins/classic/views/timeline.php
2015-06-10 23:09:30 +10:00
3a94712db2
add translate function
2015-05-10 08:10:30 -05:00
b3313edde0
Merge remote-tracking branch 'upstream/master' into Video-Highlander-Branch
...
Conflicts:
web/skins/classic/views/event.php
2015-03-21 23:49:56 +11:00
4182fb3295
Don't show ONVIf probe link when ONVIF support is not enabled
2015-02-21 11:12:07 -06:00
79c82ea880
Merge remote-tracking branch 'upstream/master' into Video-Highlander-Branch
2015-02-17 23:16:42 +11:00
8657d0a243
Merge pull request #696 from ZoneMinder/improve_deleteEvent
...
Improve delete event
2015-02-09 07:15:27 -06:00
4524a61a50
prevent error message in log when Enabled is not checked
2015-02-06 14:15:26 -05:00
fed6748c6d
fixes to format date into zero padding and year as 2 digit
2015-02-06 13:00:55 -05:00
dbac099223
we don't use EndTime so don't load it
2015-02-06 11:50:23 -05:00
bcdac0104f
pass a minimum event hash instead of the event id to deleteEvent
2015-02-06 11:50:07 -05:00
9a1e210849
add comment
2015-02-06 11:46:35 -05:00
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
74929236e3
put the sendControlCommand(quit) into the right place
2015-01-07 16:56:10 -05:00
d0138af00c
use new sendControlCommand function to send normal commands as well as send the quit command on monitor edit.
2015-01-07 16:24:34 -05:00
2e48c2ba3d
add sendControlCommand function to do the heavy work of sending zmcontrol a command
2015-01-07 16:24:07 -05:00
8350ddac7c
replace getLoad() / getDiskPercent() with PHP native functions
2015-01-03 19:22:19 +01:00
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
e87e69fa57
Ran script to replace all Short open tags
2014-12-05 10:44:23 +11:00
69090563d5
Merge branch 'master' into video
...
Conflicts:
src/CMakeLists.txt
src/zm_monitor.cpp
2014-11-28 14:23:05 -05:00
4c864aec35
fix saving groups
2014-11-25 14:29:15 -05:00
9c30b806f2
don't require SystemView to view/select groups.
...
Change the way the groups ine is displayed to give people some idea that it might have something to do with grouping
use _POST instead of _REQUEST
2014-11-13 10:38:20 -05:00
bec58a6011
fixes WRT to db logging. I believe fixes issue #504
2014-09-26 14:43:58 -04:00
aa3803cb0b
Update functions.php
...
A more efficient check for IE >= 11 than the previous commit
2014-09-13 09:47:22 -05:00
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
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
5bf894d263
guard against unsafe monitor name
2014-06-05 15:23:15 -04:00
0689e8453c
guard against dangerous (old or new) monitor names
...
by rogerroger288
2014-06-05 15:21:28 -04:00
baf5da9561
guard against monitor names being dangerous
...
by rogerroger288
2014-06-05 15:20:04 -04:00
5ae3cb8907
merge some security fixes from rogerroger288
2014-06-05 15:14:12 -04:00
28f62c4f8f
remove call of undefined "fixDevices" function
2014-04-26 04:23:36 +02:00
0d7c52dc1f
Merge remote branch 'origin/master' into video
...
Conflicts:
src/CMakeLists.txt
src/zm_monitor.cpp
2014-04-17 13:26:00 +03:00
50a9055601
fix sql error which prevents remote login from working
2014-04-13 09:54:11 +02:00
f22b956b8b
do not quote column names in parse filter
2014-04-08 09:07:59 +02:00
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
f435435481
Merge remote branch 'nagyrobi/patch-17' into nagyrobi
2014-02-26 09:15:05 -06:00
b4679f0a8c
Add the ability to set up the Date and time formats by the language files, according to that language's regionals.
...
The patch allows to set up a global default, in case the language file doesn't contain the date and time definitions.
These definitions are removed from here and added with checking option to the later stage after loading the language files.
2014-02-26 09:14:04 -06:00
e652441996
Merge remote-tracking branch 'origin/master' into video
...
Conflicts:
configure.ac
src/CMakeLists.txt
2013-12-26 21:03:45 +02:00
7b26636bcd
Merge pull request #280 from ZoneMinder/zmfixremoval
...
Remove zmfix
2013-12-22 11:22:18 -08:00
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
e9bb632a78
Remove zmfix
2013-12-22 16:08:17 +02:00
2b79ff2cbd
Initial commit for saving events as videos :)
2013-12-19 18:38:07 +02:00
0c58957e04
fixes
2013-12-17 14:58:06 -05:00
4c348cf159
more updates
2013-12-17 11:16:20 -05:00
a2a3bda2e1
remove unneccessary quoting and escaping
2013-12-06 15:51:36 -05:00
86b04d0e6f
fixup dbFetchMOnitor
2013-12-06 14:22:07 -05:00
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
969918781f
more updates, currently the log updates are not enough. Filtering does not work.
2013-11-13 10:11:16 -05:00
463d8a136f
Merge branch 'master' into mysql2PDO
...
Conflicts:
zm.conf.in
2013-11-08 11:22:09 -05:00
03809cfa0f
improve error reporting
2013-11-07 10:58:27 -05:00
4c6c415f02
fix: wrote dbCon instead of dbConn
2013-11-07 10:03:19 -05:00
be21a882ab
Merge pull request #242 from ZoneMinder/removeversionnumberfromzm.conf
...
Remove ZM_VERSION from zm.conf
2013-11-04 12:27:50 -08:00
51455b5c85
more updates and removal of escaping and quoting
2013-11-04 12:43:34 -05:00
7989e8e980
Merge branch 'master' into mysql2PDO
2013-11-03 16:07:37 -05:00
3fa91a30a3
allow the value side of config lines potentially be empty.
2013-11-03 15:52:37 -05:00
72b80d7417
remake this branch off master instead of off mysql2PDO.
...
Establish an automake substitution of @VERSION@ and use it throughotu to override whatever is in zm.conf
2013-11-01 09:47:28 -04:00
7fdb933d6b
rework dbQuery, dbFetchOne to take a parameters array, and use it
2013-10-18 14:15:24 -04:00
cde89a7144
more quoting removal, some slight optimisations
2013-10-17 21:03:24 -04:00
92591a6835
more removal of quotes
2013-10-17 17:05:50 -04:00
ef765afa2d
Merge branch 'master' into mysql2PDO
2013-10-17 17:02:44 -04:00
60e2703637
fix missing n
2013-10-17 17:01:37 -04:00
09fbdc9e35
forget the updates to this file
2013-10-17 16:57:05 -04:00
0979830b91
more removal of exra quotes
2013-10-17 15:54:17 -04:00
36c4fad644
remove extra quoets since dbEcape does quoting now
2013-10-17 15:35:23 -04:00
870a59bed4
fix missing <?php. The missing full size tag makes the file fail when short tags are turned off
2013-10-17 14:23:25 -04:00
b126c5ae7e
fix typo
2013-10-16 16:55:24 -04:00
9e2d7cfd24
initial convert to PDO with no testing
2013-10-16 16:07:58 -04:00
34f84a4097
Merge branch 'v1.26.4-beta'
2013-10-03 10:14:09 -04:00
6d00540b5d
Improve Chrome browser support & log streaming events
2013-09-21 14:52:41 -05:00
b08a8252c4
Merge branch 'dukess-master' into v1.26.4-beta
...
Conflicts:
scripts/zmupdate.pl.in
2013-09-18 13:03:54 -04:00
c9ad6e661a
Merge branch 'master' of https://github.com/dukess/ZoneMinder into dukess-master
2013-09-18 12:57:26 -04:00
ed9f647dd7
Update actions.php
...
SQL-ERR 'Incorrect integer value: '' for column 'Enabled' at row 1', statement was 'update Monitors set Function = 'Monitor', Enabled = '' where Id = '2''
2013-09-13 03:48:01 -07:00
0f5c90bbe4
Rewritten the query to allow mysql to use indexes
...
On a system with heavy logging, without this the login procedure took
too long.
2013-09-12 22:46:26 +02:00
ab1314f250
clean out autogenerated files
2013-09-12 14:43:57 -04:00
c8ad6ae656
Fixes #107 for real this time.
2013-09-05 20:31:52 -04:00
d47aaec775
Merge pull request #92 from knnniggett/patch-9
...
Update getBrowser() to match IE10
2013-09-03 06:38:13 -07:00
2f92689d7e
Resolving CVE-2013-0232 - this should fix #93 .
2013-08-30 21:53:19 -04:00
de51926434
Update getBrowser() to match IE10
...
Updates the preg_match expression to match Internet Explorer 10. The previous pattern would not detect IE10, and hence zoneminder would not attempt to stream via Cambozola, which leaves IE10 users looking at a broken link.
NOTE: There is another file in the zoneminder source tree, AssetDispatcher.php, that also uses the same pattern match expression. It is part of the Cake folder, which I am not familiar with. Please advise if we should edit that file as well.
2013-08-29 17:41:20 -05:00
60ea6a387d
Update lang.php
...
Add the ability to set up the Date and time formats by the language files, according to that language's regionals.
The patch allows to set up a global default, in case the language file doesn't contain the date and time definitions.
Here we look if the constants are already defined or not, if they are not, define them to the original defaults.
2013-08-16 12:05:33 +02:00
3a8481a591
cleanup
2013-05-10 14:02:22 -04:00
33cbd89212
Migrate svn to git
2013-03-17 00:45:21 +01:00
Isaac Connor
Steve Gilvarry
Isaac Connor
Isaac Connor
Andy Bauer
Laercio Motta
Isaac Connor
Isaac Connor
SteveGilvarry
Pliable Pixels
Robin Daermann
Andrew Bauer
Linwood-F
Michael
Günter Grodotzki
Kfir Itzhak
m-bene
Maciej Czerniak
Miklos Marton
Philipp Rehs
Isaac Connor
Serguei S. Dukachev
Richard Kojedzinszky
Isaac Connor
Kyle Johnson
nagyrobi
nextime