8ce7719a33
remove extra db call cuz i sredundant
2017-01-18 21:12:54 -05:00
2f3ebd80da
Remove zmf, die..die..die
2017-01-16 13:20:05 -08:00
899b1b82b9
Merge branch 'filter_by_runstate' into storageareas
2017-01-14 17:07:20 -05:00
242e5a56d8
rough in the ability to filter on RunState
2017-01-14 16:55:28 -05:00
d8b8d78576
Fix storagearea lookup. Default to ZM_EVENTS_DIR
2017-01-09 16:35:58 -05:00
03fd964518
fix parsing StorageID
2017-01-09 14:59:14 -05:00
b4bddee337
Merge branch 'master' into improve_filter
2017-01-03 08:49:56 -05:00
5ae34a7561
Merge branch 'master' into storageareas
2017-01-02 09:39:10 -05:00
0d549f1db3
spelling fixes
2016-12-29 10:31:05 +01:00
254fcbcef7
update gpl 2 mailing address in source files
2016-12-26 09:23:16 -06:00
752f0eb40b
Merge branch 'master' into improve_filter
2016-12-20 11:43:02 -05:00
794043cbe9
On successful login, tell php to regenerate the session id
2016-12-14 15:06:18 -05:00
be5b4691da
check for isset of SESSION['username'] instead of just assuming it exists
2016-11-22 15:35:07 -05:00
9312eed17f
Merge branch 'master' into disk_space_in_events
2016-11-22 10:58:24 -05:00
bb6b0c2d49
Merge branch 'master' of github.com:ZoneMinder/ZoneMinder into improve_filter
2016-11-17 12:16:49 -05:00
2bd080a6a6
Merge branch 'master' into storageareas
2016-11-15 08:41:00 -05:00
8f71971209
Show error message upon unsuccessful login. Fixes #1648 ( #1680 )
...
* Add additional post-cmake files to .gitignore
* Add bootstrap 3.3.7
* Load bootstrap css
* Restyle login page, move recaptcha js to <head>
The way it was handled previously resulted in
invalid html, with an extra <head> tag being
inserteed inside the <body>.
* Update doctype to HTML5, add meta tags for mobile browsers
* Move inline Login css to css file
* Remove extra php tag in functions.php
* Show error message upon unsuccessful login. Fixes #1648
* Includes bootstrap glyphicons as they're used in the error message.
* Failure check is done via a simple test in login.js.php and login.js.
The 'view' param will only be set (to 'postlogin') if the login page
has refreshed due to a failed login. Otherwise you're directed to
the console view.
* Only load bootstrap css in specific views.
Bootstrap was causing some styling conflicts with the legacy css.
As such only load bootstrap.css on pages which we have specifically
allowed, which would be pages that have been restyled and verified.
* Test for invalid login via session variable.
The previous method had cases where the error messsage was displayed
when it shouldn't have been, such as when specifying ?view=login
* Fix a few typos in login inputs
* Add new fonts directory to web CMakeLists
2016-11-14 21:24:43 -05:00
3b7723ee8f
Merge branch 'master' into storageareas
2016-11-11 22:40:00 -05:00
49d8e35e56
Show available PATH_MAP percent on console ( #1675 )
...
* Add PATH_SWAP percent to console
* add changes to console.php
* use ZM_PATH_MAP instead of ZM_PATH_SWAP
* show the folder name PATH_MAP points to
* use a dash as the delimiter instead of fwd slash
2016-11-11 08:47:08 -05:00
95d00f70a3
Test for invalid login via session variable.
...
The previous method had cases where the error messsage was displayed
when it shouldn't have been, such as when specifying ?view=login
2016-11-10 23:29:12 -07:00
1e233c0ce5
Merge branch 'master' into improve_filter
2016-11-04 15:20:43 -04:00
4defad1352
Merge branch 'add_scale_to_frame_view' into storageareas
2016-10-26 14:04:43 -04:00
d9a31f7fb6
Merge branch 'master' into storageareas
2016-10-26 13:39:31 -04:00
f9ac601194
fix getOutputHelperStream -> getHelperStream
2016-10-21 12:41:37 -04:00
5ee8a1c0a7
deprecate the contents of getImageSrc since it is now in Event.php
2016-10-20 11:52:01 -04:00
c78a543e8e
Merge pull request #1475 from connortechnology/htmlselect
...
introduce htmlselect as an alternative to buildselect
2016-10-20 05:05:59 +11:00
de9c5a3bed
add in missing break
2016-10-18 10:20:42 -04:00
aaf8f6c98b
add the missing case for ServerId in Filter processing.
2016-10-18 10:14:19 -04:00
85faa7321c
reorder if logic to handle first page load before AuthHash has ever been set.
2016-10-17 13:12:13 -04:00
c2911ae756
better debug in deletePath
2016-10-12 15:38:59 -04:00
68936b9af9
code style, replace with '
2016-10-03 21:58:57 -04:00
d4be5b06ea
Only generate auth hash when logged in.
2016-10-03 21:22:16 -04:00
f4418260e7
Should only generate an auth hash if we are logged in.
2016-10-03 21:18:13 -04:00
16bee2ef55
only generate auth hash if we are logged in
2016-10-02 14:13:54 -04:00
0ab84abe5b
Since we are returning a hash called user, it should really contain all data for that user.
2016-09-29 10:43:07 -04:00
404bbb79f0
must return the generated hash
2016-09-29 10:11:37 -04:00
8bc7b9562f
introduce config option ZM_AUTH_HASH_TTL which is the # of hours to make an auth hash valid for
2016-09-29 10:04:53 -04:00
303a2c6c5f
re-open session if neccessary to save AuthHashGeneratedAt
2016-09-27 11:56:31 -04:00
db8cada380
fix merge
2016-09-13 15:01:02 -04:00
aa78b403a1
zmaControl can take an id #, so need to move the check for local server test down.
2016-08-02 12:33:41 -04:00
cd43d1fa7a
Rough in Event disk space reporting
2016-07-19 17:34:01 -04:00
0d08c50199
change quotes
2016-09-29 12:22:01 -04:00
ab8b58ba48
Merge branch 'fix_auth_timeout' into storageareas
2016-09-29 10:44:30 -04:00
5c867aa5f5
Merge branch 'fix_auth_timeout' into storageareas
2016-09-29 10:10:38 -04:00
07ae6b6aa2
commit authhash to session
2016-09-28 11:49:00 -04:00
9bf48d27b1
implement caching the authhash in the session
2016-09-28 09:08:49 -04:00
e217ca17cd
Merge branch 'fix_auth_timeout' into storageareas
2016-09-27 11:57:53 -04:00
6840031ee3
fix auth timeout and user session[username] when checking auth hash for speedup
2016-09-27 11:51:55 -04:00
fb610ba87d
fix getDiskPercent to take a StorageArea as a param and use it's disk_usage_percent function. When parsing filter, DiskPercent requires a storagearea now, so look for it in the terms
2016-09-20 12:18:20 -04:00
c95e449bbd
Modifications to getDiskPercent():
...
Moved '%' to this function instead of at end of html in skins/classing/include/functions.php
Changed from SQL query to Storage area object model.
2016-09-17 02:11:07 +10:00
181339a2dd
Nearly forgot its possible to have no "default" storage area, have wrapped the defaults space check in an if()
2016-09-15 19:49:58 +10:00
d5337a08a8
Modify getDiskPercent() to report disk space for all storage areas.
2016-09-15 19:41:16 +10:00
944a131142
Merge ../ZoneMinder.master into storageareas
2016-08-22 11:49:50 -04:00
be7683299e
use single quotes instead of double quotes
2016-08-22 11:49:45 -04:00
eafe3d7748
Merge branch 'master' into storageareas
2016-08-17 10:31:55 -04:00
8194876454
always put popup links in a, even if it is disabled
2016-07-22 16:03:57 -04:00
b1d0223c30
implement human_filesize
2016-07-20 15:20:21 -04:00
bce7369984
Merge branch 'disk_space_in_events' into storageareas
2016-07-19 17:36:15 -04:00
eb0ddc4e32
update and use Monitor object to generate the stream html. Also introduce a mode parameter to getStreamHTML to specify stills
2016-07-14 11:55:27 -04:00
c1f30480e3
fix merge
2016-06-23 12:49:27 -04:00
e29a0ebe71
Merge branch 'feature-h264-videostorage' into storageareas
2016-06-21 13:48:32 -04:00
31a5252afa
apply btn and btn-primary styles to remaining buttons on console
2016-06-21 09:22:32 -04:00
1d1cedce95
use rand mofification like when re-establishing the stream instead of an Time(). Drop use of a tempImage as it doesn't seem to be used anywhere. Cleanup use of streamSrc. Introduce a function getStreamMode
2016-06-20 12:40:33 -04:00
26bba58c56
Merge branch 'master' into feature-h264-videostorage
2016-06-17 11:09:47 -04:00
acba5bccf1
Always include the monitor Id in the tag id for the videostream
2016-06-14 12:38:37 -04:00
94174a1fe2
use user= and pass= instead of auth hash
2016-06-07 15:47:59 -04:00
086d435712
send zmcCommand to api on server
2016-06-07 14:39:59 -04:00
8fabeb78d3
Merge branch 'fix_zone_edit' into storageareas
2016-05-24 15:55:49 -04:00
a8e407172a
split out versus get functionality in includes/functions. Fix positioning of svg over image stream
2016-05-24 15:50:22 -04:00
89f58daf89
Merge branch 'master' into fix_zone_edit
2016-05-24 15:30:56 -04:00
ae1eb94f27
fix getStreamHTML when using helper
2016-05-24 15:10:37 -04:00
e62ea454ba
Merge branch 'master' into storageareas
2016-05-17 10:48:52 -04:00
1530096560
whitespace/google code style
2016-05-12 10:17:41 -04:00
aba80f0935
introduce htmlselect as an alternative to buildselect
2016-05-12 09:43:37 -04:00
35783f7dc0
Merge branch 'mysql_fixes' into storageareas
2016-05-09 19:27:42 -04:00
7f9c70d521
when value to be stored is undefined or '', then set the field=NULL
2016-05-09 13:39:40 -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
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
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
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
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
ca96481036
fix thumbnail generation from video file
2016-04-01 13:02:31 -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
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
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
3ce620eb89
Merge remote-tracking branch 'upstream/master' into feature-h264-videostorage
2016-02-27 19:46:56 +11:00
e2d892961b
use storage area paths in getting analyze images and frame stills
2016-02-19 09:46:56 -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
4520902dd2
use trim on values when saving.
2016-01-14 09:37:41 -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
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
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
64299082ad
Send login activity to the zoneminder event log
2015-08-17 17:54:17 -05:00
d83349cc7f
fix to display thumbnails when only storing snapshot.jpg
2015-07-28 23:43:50 +10:00
79c82ea880
Merge remote-tracking branch 'upstream/master' into Video-Highlander-Branch
2015-02-17 23:16:42 +11: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
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
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
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
5ae3cb8907
merge some security fixes from rogerroger288
2014-06-05 15:14:12 -04: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
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
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
51455b5c85
more updates and removal of escaping and quoting
2013-11-04 12:43:34 -05:00
cde89a7144
more quoting removal, some slight optimisations
2013-10-17 21:03:24 -04:00
ef765afa2d
Merge branch 'master' into mysql2PDO
2013-10-17 17:02:44 -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
6d00540b5d
Improve Chrome browser support & log streaming events
2013-09-21 14:52:41 -05: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
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
2c04d0774f
Reverting my web changes in develop - keeping them in modern
2013-05-02 10:20:06 -04:00
1ed6462354
Removed all of the old web files
2013-05-01 06:52:43 -04:00
62df1ba8de
Tidier detainting.
...
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@3494 e3e1d417-86f3-4887-817a-d78f3d33393f
2011-08-03 17:33:58 +00:00
aa0ee13afa
Detaint further dodgy path varieties.
...
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@3488 e3e1d417-86f3-4887-817a-d78f3d33393f
2011-08-03 11:08:40 +00:00
6035ed211a
Detaint some user inputs to avoid malicious file inclusion
...
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@3483 e3e1d417-86f3-4887-817a-d78f3d33393f
2011-07-22 08:37:01 +00:00
a3ef933f2d
Check for json_last_error function existence before invoking.
...
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@3482 e3e1d417-86f3-4887-817a-d78f3d33393f
2011-07-22 08:34:35 +00:00
6ff385e407
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@3459 e3e1d417-86f3-4887-817a-d78f3d33393f
2011-06-21 09:19:10 +00:00
87124001ba
Added error checking to builtin JSON functions
...
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@3351 e3e1d417-86f3-4887-817a-d78f3d33393f
2011-05-23 15:15:37 +00:00
1d84fb8f7d
Added jsonDecode function and stop encoding single quotes in JSON encoder
...
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@3350 e3e1d417-86f3-4887-817a-d78f3d33393f
2011-05-23 13:17:12 +00:00
47e8d6112a
Do not ignore return status of unlink
...
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@3326 e3e1d417-86f3-4887-817a-d78f3d33393f
2011-04-19 11:47:25 +00:00
bf101660b4
Added deletePath function and changed deleteEvent to use it.
...
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@3323 e3e1d417-86f3-4887-817a-d78f3d33393f
2011-04-19 10:54:41 +00:00
6a5f649092
Improved process control options, guesses less.
...
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@3320 e3e1d417-86f3-4887-817a-d78f3d33393f
2011-04-19 09:35:39 +00:00
3b149bf552
Fixed JSON encoding bug
...
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@3292 e3e1d417-86f3-4887-817a-d78f3d33393f
2011-02-11 14:48:03 +00:00
98203e6c2f
Improved stream handling for single image mode, for Chrome etc.
...
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@3281 e3e1d417-86f3-4887-817a-d78f3d33393f
2011-02-06 16:04:11 +00:00
ee3c2f84a4
Removed debug
...
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@3280 e3e1d417-86f3-4887-817a-d78f3d33393f
2011-02-06 15:36:20 +00:00
255cf27e49
Removed support for PHP 4.1.0
...
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@3279 e3e1d417-86f3-4887-817a-d78f3d33393f
2011-02-06 15:31:30 +00:00
5985897a5c
Modified and improved browser checking
...
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@3278 e3e1d417-86f3-4887-817a-d78f3d33393f
2011-02-06 15:29:06 +00:00
6c547aba85
Fixed use of analysis images in getImageSrc function plus fixed implementation of overwrite flag in various functions.
...
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@3207 e3e1d417-86f3-4887-817a-d78f3d33393f
2010-11-28 21:20:02 +00:00
c7e4ebd85d
Updated with new bandwidth based stream config
...
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@3167 e3e1d417-86f3-4887-817a-d78f3d33393f
2010-11-03 16:36:50 +00:00
ac0e0c9ca6
Fixed typo in Quicktime video
...
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@3033 e3e1d417-86f3-4887-817a-d78f3d33393f
2010-02-23 10:41:04 +00:00
9b31bf29e8
Added in image view to allow event root to be able web root
...
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@3031 e3e1d417-86f3-4887-817a-d78f3d33393f
2010-02-23 09:12:12 +00:00
a9c2044669
Changed split and ereg calls to explode and preg_match
...
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@3029 e3e1d417-86f3-4887-817a-d78f3d33393f
2010-02-23 09:00:31 +00:00
6fc7acb378
Changed query separator to & and added CDATA wrapper.
...
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2981 e3e1d417-86f3-4887-817a-d78f3d33393f
2009-10-16 17:04:44 +00:00
9116927ca2
Removed extranrous quote.
...
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2860 e3e1d417-86f3-4887-817a-d78f3d33393f
2009-05-06 09:48:01 +00:00
7b4c0fa926
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2820 e3e1d417-86f3-4887-817a-d78f3d33393f
2009-03-27 16:01:59 +00:00
f512cd91e7
Fixed issue with 'set' values.
...
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2793 e3e1d417-86f3-4887-817a-d78f3d33393f
2009-03-03 17:50:31 +00:00
61089eeeb1
Added authentication hashed logins.
...
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2781 e3e1d417-86f3-4887-817a-d78f3d33393f
2009-02-19 14:06:39 +00:00
847606a200
Fixed further with editng control capabilities
...
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2737 e3e1d417-86f3-4887-817a-d78f3d33393f
2009-01-30 17:43:29 +00:00
69f6270171
Fixed issue with X10 web commands.
...
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2712 e3e1d417-86f3-4887-817a-d78f3d33393f
2009-01-05 14:37:26 +00:00
5d766dde92
Remove decorations from Cambozola applet and escape line endings in json values.
...
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2707 e3e1d417-86f3-4887-817a-d78f3d33393f
2008-12-05 23:44:43 +00:00
59b9f622d8
Strip out cr/lfs from JSON values
...
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2684 e3e1d417-86f3-4887-817a-d78f3d33393f
2008-11-03 13:14:35 +00:00
9201e1319d
Fixed some php warnings.
...
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2677 e3e1d417-86f3-4887-817a-d78f3d33393f
2008-10-28 14:24:46 +00:00
9725a76371
Added default scale to getImagePath
...
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2673 e3e1d417-86f3-4887-817a-d78f3d33393f
2008-10-28 12:49:04 +00:00
81fd3aaa41
Restructured ajax to be consistent.
...
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2668 e3e1d417-86f3-4887-817a-d78f3d33393f
2008-10-16 16:12:23 +00:00
dc25beb8e4
Fixed MIME type issues.
...
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2664 e3e1d417-86f3-4887-817a-d78f3d33393f
2008-10-14 12:55:27 +00:00
1080485c33
Motage and event list issues, fixes.
...
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2642 e3e1d417-86f3-4887-817a-d78f3d33393f
2008-09-30 15:29:14 +00:00
ef8f7b85fd
Continuing development and bugfixes
...
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2632 e3e1d417-86f3-4887-817a-d78f3d33393f
2008-09-26 09:47:20 +00:00
ba788cc001
Fixed issues with creation, editing and deletion of monitors.
...
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2626 e3e1d417-86f3-4887-817a-d78f3d33393f
2008-09-01 16:43:34 +00:00
106882c161
Updated copyright notices
...
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2612 e3e1d417-86f3-4887-817a-d78f3d33393f
2008-07-25 09:48:16 +00:00
0f0a8c004f
Changed skinSeq to skinBase
...
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2596 e3e1d417-86f3-4887-817a-d78f3d33393f
2008-07-23 09:57:11 +00:00
4f67ddd94a
Fixed language selection
...
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2528 e3e1d417-86f3-4887-817a-d78f3d33393f
2008-07-15 21:24:14 +00:00
2824cb7355
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2508 e3e1d417-86f3-4887-817a-d78f3d33393f
2008-07-14 13:54:50 +00:00
Isaac Connor
SteveGilvarry
klemens
Andy Bauer
Isaac Connor
Isaac Connor
Kyle Johnson
bhaal2
Isaac Connor
Laercio Motta
SteveGilvarry
Michael
Günter Grodotzki
Kfir Itzhak
Maciej Czerniak
m-bene
Miklos Marton
Philipp Rehs
Richard Kojedzinszky
stan
viseon