74da3e9c02
fix auth requirement by checking for user when AUTH is on
2014-12-11 17:09:18 -05:00
fafef86298
Merge branch 'control_improvements'
2014-12-08 16:52:52 -05:00
27b9001eb4
default MoveRoot to empty to quiet an error in logs
2014-12-08 16:52:10 -05:00
5abc58ea14
Merge pull request #620 from SteveGilvarry/11-php-short-tags
...
Replace PHP Short Open Tags - Fixes #11
Works for me too.
2014-12-08 14:39:24 -05:00
2c1e4a9965
fix the paths so that the ptzControls are visible
2014-12-08 10:34:25 -05:00
e87e69fa57
Ran script to replace all Short open tags
2014-12-05 10:44:23 +11:00
bf33eab17c
Merge branch 'video' into feature-h264-videostorage
...
Conflicts:
src/CMakeLists.txt
src/Makefile.am
src/zm_event.cpp
web/skins/classic/views/js/event.js
2014-12-02 20:58:35 +11:00
cc85424999
Merge remote-tracking branch 'upstream/master' into feature-h264-videostorage
...
Conflicts:
src/zm_ffmpeg_camera.cpp
2014-12-02 20:18:24 +11:00
f57f903aa6
Add views subdir
2014-12-01 16:10:01 -05:00
af0d9a1065
bug fix for listing the css options.
...
use SELECTED="SELECTED" instead of just SELECTED
2014-12-01 15:58:00 -05:00
fed12291be
add flat to the subdirs
2014-12-01 15:57:44 -05:00
9f7d31949d
remove the flat subdir
2014-12-01 15:55:22 -05:00
82c01479c6
move flat css files into the classic skin.
...
remove autotools references to the flat skin, add the classic/flat css dirs
remove the flat skin
2014-12-01 15:44:01 -05:00
d7e08559d6
Merge pull request #582 from hanzese/patch-1
...
Update et_ee.php
2014-12-01 15:34:53 -05:00
b04099b96c
Missed mkv in timeline.js
2014-12-01 21:55:43 +11:00
2de8dae172
Make timeline open event.mp4 instead of mkv
2014-12-01 13:33:18 +11:00
617179b649
spaces to tabs, hide video stuff if video writer is turned off
2014-11-28 16:47:16 -05:00
69090563d5
Merge branch 'master' into video
...
Conflicts:
src/CMakeLists.txt
src/zm_monitor.cpp
2014-11-28 14:23:05 -05:00
e60919f19a
Update et_ee.php
...
Translating some code comments.
2014-11-27 03:51:40 +02:00
92b65c553e
Update et_ee.php
...
Changing back charset-utf-8.
2014-11-27 03:43:59 +02:00
ebe602616b
needs this one too
2014-11-26 14:30:53 -05:00
593f0781d6
this css directory was moved under /web/skins/classic/css/views so we don't need to have it in the SUBDIRS
2014-11-26 11:57:35 -05:00
641c94d5be
add CSSDescription which is used on the options tab for skin
2014-11-26 11:57:01 -05:00
193cb71b71
Add option for setting css to use with the skin. Also happens to add missing elements of the table for the skins tab and cleans up some spacing. Also, use a variable to tell whether to reload the page or not, which is required after you change the skin or css.
2014-11-26 11:55:53 -05:00
a412799003
Move the skins/classic/views/css dir under skins/classic/css/classic/views and update Makefile.am's to match
2014-11-26 11:29:04 -05:00
5bf34de07b
Add lines to parse url ?css= commands and set a global variable to be used to determine which set of css files to use.
2014-11-26 11:26:29 -05:00
bf3ec7b490
Since the css files are in subdirectories now, thise just needs to reference them
2014-11-26 11:24:55 -05:00
ebb31f12d2
Add lines to parse url ?css= commands and set a global variable to be used to determine which set of css files to use.
2014-11-26 11:23:06 -05:00
53b70d27fb
Use the global variable which gets setup in web/index.php to look in a subdirectory of web/skins/classic/css to find the css files.
2014-11-26 11:18:03 -05:00
4c864aec35
fix saving groups
2014-11-25 14:29:15 -05:00
4e9c3494b8
Convert french lang file to UTF-8
2014-11-20 20:51:49 +01:00
993a186d06
Update et_ee.php
...
ZoneMinder Estonian Translation by Hannes
2014-11-19 10:25:35 +02:00
db86ac7b40
Update et_ee.php
...
ZoneMinder Estonian Translation by Hannes
2014-11-17 18:06:37 +02:00
79ca3dd736
Update et_ee.php
...
ZoneMinder Estonian Translation
2014-11-17 02:53:50 +02:00
35530c627a
Initial commit of Logs MVC
2014-11-15 19:03:40 +00:00
0129ca5f74
Rework the ConfigParser component.
2014-11-15 19:03:10 +00:00
e7d726bf75
Don't print out the Config string to the file system.
2014-11-15 19:02:54 +00:00
fcaa67e3c3
Slight refactor of ConfigParser Component. Needs more work.
2014-11-15 19:02:18 +00:00
cf3d0f962c
Add view for Configs Edit
2014-11-15 19:02:03 +00:00
9f80a7d5f5
Show a list of Config Key:Value pairs
2014-11-15 19:01:32 +00:00
9268c503af
Do not display the "hidden" config category
2014-11-15 19:01:19 +00:00
b9f54056da
Add component for dumping Config table as HTML
2014-11-15 18:59:58 +00:00
de631075d3
Return possible source types ni DB via API
2014-11-15 18:59:24 +00:00
0d57306790
Find category configs only when $category is not null. API
2014-11-15 18:58:58 +00:00
9f150c4e46
Revert "Find category configs only when $category is not null. API"
...
This reverts commit efbbcadc7dad9aa52a7aab0483546eab48840ae6.
2014-11-15 18:58:51 +00:00
b88febeaee
Find category configs only when $category is not null. API
2014-11-15 18:58:43 +00:00
0a7ba112ab
API support for querying config categories.
...
Either return a list of distinct categories, or all configs under a
certain category
2014-11-15 18:55:20 +00: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
ebe35c2135
handle empty [file] to prevent logzilla
2014-11-13 09:17:54 -05:00
26c9a77590
Update skin.js
...
Fix issue caused by a previous merge
2014-11-10 12:12:54 -06:00
8d71d4de03
Swap to mp4 container
2014-11-09 18:15:43 +11:00
2712da614e
Merge remote-tracking branch 'upstream/master' into feature-h264-videostorage
2014-11-05 19:51:15 +11:00
2f32c3895b
Merge branch 'release-1.28'
...
Conflicts:
web/skins/flat/js/skin.js
2014-10-22 15:10:19 -04:00
c5a1d9ffa9
fix console refresh in this skin too
2014-10-22 10:58:06 -04:00
23ebbf3887
Update skin.js
...
Move this line down to mitigate the problem where the console doesn't refresh.
2014-10-21 17:22:33 -05:00
8d225566b1
Move this line down to mitigate the problem where the console doesn't refresh.
2014-10-20 15:32:30 -04:00
4245928b35
Merge remote-tracking branch 'upstream/master' into feature-h264-videostorage
...
Conflicts:
src/CMakeLists.txt
src/zm_monitor.cpp
web/skins/classic/js/skin.js
2014-10-12 20:10:36 +11:00
7ea003441d
Merge pull request #371 from m-bene/resizeWindows
...
Reduce window size to exclude task bar area
2014-10-09 14:46:46 -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
f1b2ba091c
Update meta makefiles
2014-09-12 16:06:19 +02:00
2018228daf
fix V inputs
2014-08-21 11:58:51 -04:00
6564c4359b
adjust monitor popup height
2014-08-21 11:15:35 -04:00
707f2e84db
increase monitor popup height to fit v4l settings in
2014-08-21 11:14:48 -04:00
f93a28f2be
fixup multibuffering so it can have a null value which makes it fall back to config table
2014-08-21 11:13:38 -04:00
5f1fda43a0
Basic support for SOAP 1.1 and 1.2
2014-08-17 21:24:27 +02:00
99e794a97b
Removed hard coded binary path and perl binary location
2014-08-07 18:25:07 +02:00
0834e1b61d
I see no reason for these to be posts. They retrieve info, that's it.
2014-07-29 16:15:31 -04:00
96322dd59c
remove v4l tab that I never used
2014-07-29 14:45:02 -04:00
b2f1c2fe68
Merge branch 'v4l_to_monitor'
2014-07-24 14:35:23 -04:00
e065e2b3cc
add V4L
2014-07-24 11:37:10 -04:00
5e262f5a67
the var is remSockFile, not remSocketFile
2014-07-24 11:05:35 -04:00
b3f078eaa5
add the word disabled after function if the monitor is not enabled.
2014-07-23 15:46:37 -04:00
a91331de66
Added basic ONVIF support views
2014-07-14 20:59:36 +02:00
0a2515c00e
Added basic ONVIF support
2014-07-14 20:36:18 +02:00
edd794a993
ensure captures_per_frame >0
...
add missing lang entries for MultiBuffer and CapturesPerFrame
2014-07-14 14:07:28 -04:00
9385471392
move v4l_multibuffer and v4l_captures_per_frame from Config to Monitor and Local Camera
2014-07-13 16:39:27 -04:00
eb5f299512
increase max_socket_tries to 10 as #470
2014-07-11 10:51:24 -04:00
8f88e2a6c0
Merge branch 'master' of github.com:ZoneMinder/ZoneMinder
2014-07-08 10:54:16 -04:00
2be38d7f32
fix problem editing users, a semi-colon screwed up the if statement.
...
Also change behaviour so that if a user is specified, and doesn't load, generate an error.
This also removes a search for empty user id in the db
2014-07-08 10:52:55 -04:00
371c1bae3d
Merge pull request #359 from knnniggett/eyezm
...
fix eyezm authentication issue
2014-07-07 17:57:48 -05:00
5c8c00c1ab
Fix double login issue with eyezm
2014-07-07 17:48:33 -05:00
70471936a7
get rid of escapeSql and replace it's calls with new PDO-style calls to FetchOne FetchALl,e etc
2014-07-07 10:06:50 -04:00
48d961082c
Determine full path to arp
2014-07-05 11:11:36 -05:00
c2e2a12995
Merge pull request #406 from m-bene/focusPopup
...
focus popup windows
2014-07-04 13:00:45 -05:00
9a0eb63df2
Merge pull request #415 from m-bene/selectSkin
...
make skin selection persistent
2014-07-04 12:57:37 -05:00
5aad658262
Fixes errors when opening Filters (issue #34 )
2014-07-04 11:00:00 -05:00
a8d60aa727
Fixed missing $ on ARRAY(event[id]). Fixes #455
2014-07-02 23:58:44 +10:00
61cf067be0
Wrap sort order. Fixes #450
2014-06-29 22:09:59 +10:00
17d7404c93
Merging master again
2014-06-28 22:50:28 +10:00
623837115b
fix missing ARRAY() around params to dbFetchOne
2014-06-25 14:01:45 -04:00
5fac727c2f
Users tab should always be available
2014-06-25 13:40:37 -04:00
11718f0559
The users tab should always be available. It is useful to configure users BEFORE turning on auth.
2014-06-25 13:39:31 -04:00
8ac6ce17bc
Fixed issue DateTime handling in filter queries that broke timeline view.
2014-06-15 13:05:25 -07: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
755a2c9618
Remove Modern Branch for now
2014-05-31 06:12:44 +10:00
3267b59cb5
Add html5 video control to timeline and event to support mkv playback
2014-05-30 12:40:33 +10:00
5051c26d31
Audio support including fixes for dts/pts, split on keyframe and update to mkv extension to prevent ffmpeg problems writing rtsp audio to mp4 containter (header problem)
2014-05-30 02:05:20 +10:00
33090f2264
Merge branch 'master' into feature-h264-videostorage
...
Conflicts:
configure.ac
src/zm_config_defines.h
src/zm_ffmpeg.h
web/index.php
2014-05-30 01:55:24 +10:00
df3ab025f8
Imported missing files from master to feature-h264-videostorage
2014-05-30 01:47:52 +10:00
5fea101294
Merge pull request #421 from m-bene/ffmpegoptions
...
Add optional options field for ffmpeg and VLC source types
2014-05-18 18:07:42 +03:00
82447ebb27
remove unwanted comment change
2014-05-17 22:05:57 +02:00
a81b9b8ce2
change examples for options
2014-05-17 21:48:08 +02:00
f62afdb8cc
add select list for rtsp method for ffmpeg and libvlc
2014-05-17 20:41:22 +02:00
de107f77ba
fix option help text for overlooked languages
2014-05-17 04:51:01 +02:00
9a71a0068a
add help window for ffmpeg/libvlc options
2014-05-17 04:33:33 +02:00
ceff5a98ea
add generic Option field to ffmpeg and libvlc cameras
2014-05-05 13:29:12 +02:00
b197f985e0
make expiry date relative (~10years)
2014-05-01 09:53:45 +02:00
ed7ca66045
make skin selection cookie persistent
2014-05-01 09:37:39 +02:00
8da9383d5d
use PDO style
2014-04-30 10:09:27 -04:00
e94fca2778
Merge branch 'master' of github.com:ZoneMinder/ZoneMinder
2014-04-30 10:01:29 -04:00
b3226223f8
remove uses of dbEscape
2014-04-30 10:01:10 -04:00
ec5784abe2
Fix wrong install path for core.php and database.php
2014-04-30 12:25:42 +03:00
afd4e451fd
Add the web/api folder to cmake
2014-04-30 12:16:46 +03:00
40e929e7a6
Changed the API readme to be ZoneMinder-relevant
2014-04-29 20:49:54 +00:00
f1f3de6d7d
Moved the api to underneath the web directory
2014-04-29 20:41:04 +00:00
28f62c4f8f
remove call of undefined "fixDevices" function
2014-04-26 04:23:36 +02:00
2881e6b643
focus popup windows
2014-04-26 04:07:33 +02:00
1f29aa432a
Minor corrections to the cURL source type in the web interface
2014-04-23 12:12:41 +03:00
3cee6a133d
Merge remote-tracking branch 'Sune1337/motion/FrameSkip'
...
Conflicts:
db/zm_update-1.27.1.sql
web/lang/nl_nl.php
2014-04-22 20:13:11 +03:00
fd4f77b145
Merge pull request #381 from m-bene/flatLayout2
...
Fix window sizes and input field sizes for flat skin
2014-04-18 09:40:00 -04:00
4b7f1896b9
Merge pull request #385 from maciekczwa/master
...
fix sql error which prevents remote login from working
2014-04-18 09:39:09 -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
b56093a637
Fix window sizes and input field sizes for flat skin
2014-04-11 09:53:46 +02:00
f737af15b9
Fix reload loop on switching skins
2014-04-11 09:40:23 +02:00
6c637947e2
Ability to skip frames in motion detection.
...
The reason for this is to make it possible to reduce CPU-load if split-second motion detection is not required.
2014-04-10 14:59:34 +02:00
db5a8fe194
Merge pull request #375 from m-bene/flatLayout
...
Fix small / cropped DRV controls in event view. Fixes #356
2014-04-09 16:45:15 -04:00
bd5e25644e
same dvr controlls in event as in monitor
2014-04-09 20:19:23 +02:00
35468af815
Merge pull request #338 from m-bene/extendPreclusive
...
add feature to extend preclusive zone alarm state by x frames
2014-04-08 08:04:37 -05:00
f22b956b8b
do not quote column names in parse filter
2014-04-08 09:07:59 +02:00
9a714f8d6d
Fix 'Undefined index: filter' php warnings for filter view when called without filter arguments
2014-04-07 16:11:48 +02:00
9edb55d9af
Modify window size to exclude task bar area
2014-04-07 12:07:29 +02:00
fec72f05d0
fix eyezm authentication issue
2014-03-25 18:48:20 -05:00
d6a27b31e8
fix extra }
2014-03-24 13:44:06 -04:00
957d6f123f
remaining conversions
2014-03-22 14:16:56 -04:00
bfb52ab9aa
fix groups
2014-03-21 23:10:13 -04:00
967dda737c
more copying mysql2PDO from classic. Also, some fixes in classic
2014-03-21 17:16:56 -04:00
c7a8c0601b
wip
2014-03-21 16:51:09 -04: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
2784b3d1f5
Merge master
2014-03-20 10:26:12 +01:00
2345889d64
include ExtendAlarmFrames in Presets and enable input for preclusive zones only
2014-03-20 09:53:47 +01:00
a9c83b5e71
Merge pull request #342 from knnniggett/nagyrobi
...
Mostly Translation related changes
2014-03-15 08:08:09 -05:00
26777487dc
add feature to extend preclusive zone alarm state by x frames
2014-03-09 17:05:39 +01:00
5a2009a143
Fix popup sizes in flat skins. Fixes #331
2014-03-03 21:26:18 -05:00
03ded1edd0
Merge remote branch 'nagyrobi/patch-2' into nagyrobi
...
Conflicts:
web/lang/hu_hu.php
2014-02-26 09:37:41 -06:00
c2b93c3caf
Merge remote branch 'nagyrobi/patch-26' into nagyrobi
2014-02-26 09:32:58 -06:00
9a298a2af2
Copy nagyrobi's localization changes from en_gb verbatim to the other language files.
2014-02-26 09:30:57 -06:00
c119c49cd9
Merge remote branch 'nagyrobi/patch-25' into nagyrobi
2014-02-26 09:21:38 -06:00
fb698a6755
Merge remote branch 'nagyrobi/patch-23' into nagyrobi
2014-02-26 09:17:14 -06:00
5b1c79e3d0
Merge remote branch 'nagyrobi/patch-22' into nagyrobi
2014-02-26 09:16:51 -06:00
1dd8dc4aa6
Merge remote branch 'nagyrobi/patch-21' into nagyrobi
2014-02-26 09:15:47 -06: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
805981e06a
Merge remote branch 'nagyrobi/patch-4' into nagyrobi
...
Conflicts:
web/skins/classic/js/skin.js
2014-02-26 09:04:19 -06:00
18d56e20aa
Merge remote branch 'nagyrobi/patch-13' into nagyrobi
2014-02-26 08:46:21 -06:00
dee44c8f8d
Merge remote branch 'nagyrobi/patch-12' into nagyrobi
2014-02-26 08:45:57 -06:00
5ac8a5cc99
New localization strings from Nagyrobi copied verbatim from en_gb
2014-02-26 08:38:47 -06:00
0258579ef3
Merge remote branch 'nagyrobi/patch-10' into nagyrobi
2014-02-26 08:25:16 -06:00
4196783d97
Increased table width just a little bit, to prevent the longer foreign language translated strings to break window layouts.
2014-02-26 07:56:31 -06:00
c899de65a4
Merge remote branch 'nagyrobi/patch-5' into nagyrobi
2014-02-26 07:55:36 -06:00
26be1bd041
Fix builtin authentication issue caused by commit 6e5d927
2014-02-14 18:56:27 -06:00
d20e0ee2e7
Temporary workaround to show all ptz control types regardless of monitor source type.
2014-02-13 08:43:19 -06:00
6e9da046b8
Fixed additional Makefile.am pointing to classic skin in flat skin
2014-01-27 14:26:03 -05:00
6f5c9182ce
Add paths to flat skin in configure.ac and Makefile.am
2014-01-24 13:58:51 -05:00
4fe4a028f6
Update Makefile.am
...
Add flat skin to makefile
2014-01-23 14:29:35 -06:00
e8f831c055
Flat theme: rename new theme from classic copy to flat
2014-01-22 16:33:40 +02:00
23f69de826
Flat theme: css changes
2014-01-22 16:32:14 +02:00
ce825067a8
Flat theme
2014-01-22 16:24:06 +02:00
b2a65dc343
cURL minor corrections and improvements
2014-01-10 09:17:12 +02:00
9901ce9e84
Merge remote branch 'origin/master' into curl
2014-01-05 10:16:01 +02:00
f9c8b4760b
Merge remote branch 'origin/master' into video
2014-01-05 09:02:11 +02:00
a962815624
Change default alarm blend percent to 6 and make upgrades smooth by copying the existing blend percent to the alarm one
2014-01-05 08:59:09 +02:00
6e5d9272e0
supposed to fix #296
2014-01-03 18:33:01 -05:00
b3af313370
Merge pull request #282 from scottgrobinson/master
...
Add zmMontageScale so montage scale is also 'saved'
2014-01-02 11:18:39 -08:00
e6b9b8218b
Enclose value of the Notes attribute with quotes.
2013-12-31 17:32:20 -06:00
ff9a26273c
cURL is now working!
2013-12-27 18:02:32 +02:00
bf708a8373
Merge branch 'master' into curl
...
Conflicts:
CMakeLists.txt
src/CMakeLists.txt
src/zm_camera.h
src/zm_monitor.cpp
web/skins/classic/views/console.php
web/skins/classic/views/monitor.php
2013-12-27 14:21:12 +02:00
e652441996
Merge remote-tracking branch 'origin/master' into video
...
Conflicts:
configure.ac
src/CMakeLists.txt
2013-12-26 21:03:45 +02:00
89cfb96855
Merge pull request #277 from ebarnard/libvlc
...
Add libVLC source type
2013-12-22 13:01:19 -08:00
375d67cdf2
Update montage.php
...
Make use of new zmMontageScale cookie
2013-12-22 20:56:18 +00:00
db41693fd6
Update montage.js
...
save montage scale % as cookie
2013-12-22 20:53:09 +00: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
8ae387e376
Few minor code improvements
2013-12-22 15:19:55 +02:00
14024451e5
Monitor link now displays for all valid libvlc paths.
2013-12-22 01:29:40 +00:00
3201e5a431
Adds web ui support for libvlc camera.
2013-12-19 21:51:39 +00: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
003b8c9868
more removal of escaping
2013-12-17 14:38:08 -05:00
9f5b8bb03b
Merge branch 'mysql2PDO' of github.com:ZoneMinder/ZoneMinder into mysql2PDO
2013-12-17 14:33:46 -05:00
20f1b460ee
fix
2013-12-17 14:30:56 -05:00
cad33ddb96
Removed embedded jquery, instead include by <script>. Fixes #274
2013-12-17 13:41:55 -05:00
1a744ebed6
Added jquery 1.4.2.min.js to the classic skin's js dir
2013-12-17 13:41:36 -05:00
3393a63525
more updates
2013-12-17 12:53:15 -05:00
4c348cf159
more updates
2013-12-17 11:16:20 -05:00
ceca805b48
more updates
2013-12-17 11:07:19 -05:00
1c028e5806
use parameter passing and remove extra escsaping
2013-12-16 16:52:30 -05:00
f39f2fab66
Merge pull request #241 from ZoneMinder/alarmrefblendoption
...
Add alarm reference image blend percentage option and replace the text field if fast blends are enabled
2013-12-13 10:13:34 -08:00
529c124a9c
Detection Support for WansView Cams
...
Support for detection of Wansview Cams which are connected by lan
2013-12-11 11:29:30 +01:00
e9f4479171
Added support for UYVY capture palette (required for some Bluecherry cards)
2013-12-10 15:13:48 +02:00
00e2b05130
Merge branch 'mysql2PDO' of github.com:ZoneMinder/ZoneMinder into mysql2PDO
2013-12-06 15:52:43 -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
5a256eb96f
Merge pull request #256 from Phhere/patch-1
...
Fix checkJsonError messages
2013-12-04 04:58:39 -08:00
219ada85c0
Merge pull request #257 from Phhere/patch-2
...
Network Detection Support for Wansview
2013-12-01 16:04:56 -08:00
23ff4023bd
Removed installation of web/README.md from cmake
2013-12-02 01:53:21 +02:00
783bf4b8ab
Fixed web/skins/*/includes/config.php not being installed
2013-12-02 01:52:26 +02:00
55dadcf758
Network Detection Support for Wansview
...
Basis support for Wansview Cams
Tested with NC541W
2013-11-30 20:46:59 +01: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
55ea6745f1
Revert "Correctly fix mootools symlinks being installed twice in cmake this time"
...
This reverts commit 89689d8f3f
2013-11-22 23:50:59 +02:00
89689d8f3f
Correctly fix mootools symlinks being installed twice in cmake this time
2013-11-22 20:23:58 +02:00
17129cf078
Fix minor bug introduced by commit cfc9a73851: Do not install mootools symlinks twice for out-of-source installations
2013-11-17 15:15:54 +02:00
e4ea12a5ca
Merge branch 'mysql2PDO' of github.com:ZoneMinder/ZoneMinder into mysql2PDO
2013-11-13 10:13:42 -05:00
1519db78ce
add ServerHost filter
2013-11-13 10:13:09 -05:00
969918781f
more updates, currently the log updates are not enough. Filtering does not work.
2013-11-13 10:11:16 -05:00
91d42a86cf
Merge branch 'cmakemootoolsfix'
2013-11-13 16:59:46 +02:00
47179f793d
Fix make install failing to install mootools symlinks in an out-of-source build
2013-11-13 16:52:01 +02:00
a155082997
use parameter passing instead of esacping
2013-11-12 15:39:29 -05:00
cfc9a73851
Fixed not installing mootools symlinks in an out-of-source build
2013-11-08 18:54:46 +02:00
b8f075499b
fix for debian bug #725840 Javascript errors in updateButtons function of filter.js
...
Also a slight optimisation using else's instead of continuing to evaluate after the true value has been set.
2013-11-08 11:47:19 -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
f73585dbaa
Few web interface corrections regarding cURL
2013-11-04 17:28:15 +02:00
8e96df7643
Initial work on adding cURL to zoneminder
2013-11-04 16:52:21 +02:00
fd656c55cf
Changed default blend percentages and the dropdown list for alarm reference image blend
2013-11-04 12:10:53 +02:00
9d5ac7ae8c
Fix cmake installing wrong files in an out-of-source build
2013-11-04 09:56:40 +02:00
4565068093
Merge pull request #233 from fastolfe/zone-marker-overflow
...
Fix marker-out-of-bounds crash when defining zone points
2013-11-03 13:10:07 -08:00
7989e8e980
Merge branch 'master' into mysql2PDO
2013-11-03 16:07:37 -05:00
2d0f4dffd1
Fix a missing NULL second paramter to dbFetchAll
2013-11-03 16:06:31 -05:00
6c6da67427
Merge branch 'master' into mysql2PDO
2013-11-03 15:57:45 -05:00
3fa91a30a3
allow the value side of config lines potentially be empty.
2013-11-03 15:52:37 -05:00
59b841958d
use parameter passing instead of explicit exscaping
2013-11-03 15:40:00 -05:00
833705b613
Added alarm blend percent (useful for controlling how long an alarm lasts) and a dropdown list is used now if ZM_FAST_IMAGE_BLENDS is enabled
2013-11-03 10:26:04 +02:00
b368d306b9
Fix marker-out-of-bounds crash when defining zone points
2013-11-02 15:56:42 -07:00
93560652f1
make sortorder be asc or desc, not something arbitrary which needs to be escaped
...
other fixes to use parameter passing to PDO instead of escaping them ourselves
2013-11-01 12:30:07 -04: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
c2bd7c97ec
First attempt at enabling out-of-source building for zm with cmake
2013-10-31 18:10:00 +02:00
ae51ac5519
redo changes to use new dbFetch functions with parameter arrays
2013-10-18 14:24:08 -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
355c10c3a4
fix error when strict modes is on.
2013-10-17 17:02:17 -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
2a45506bff
more quoting removal
2013-10-17 16:15:04 -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
92d22b5202
Merge branch 'master' into mysql2PDO
2013-10-16 16:58:33 -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
7bf4de37de
Merge pull request #211 from kylejohnson/master
...
ZoneMinder Dutch Translation updates by Alco (a.k. nightcrawler)
2013-10-15 13:23:57 -07:00
dff5b3aeb0
ZoneMinder Dutch Translation updates by Alco (a.k. nightcrawler)
2013-10-14 09:27:01 -04:00
d4654f63ae
merge modern into feature-h264-videostorage
2013-10-04 10:52:53 +13:00
d3d3460f21
merge master into modern
2013-10-04 10:40:30 +13:00
34f84a4097
Merge branch 'v1.26.4-beta'
2013-10-03 10:14:09 -04:00
64f28a8b97
Merge pull request #193 from kylejohnson/191
...
Moved writing of configure options from Controller to Model. Fixes #191 .
2013-10-02 05:28:57 -07:00
60bebadecf
Merge pull request #190 from kylejohnson/modern
...
Moved zmBandwidth option from cookie to Configure:: option. Might fix #175
2013-10-02 05:28:33 -07:00
d1c19036ec
Moved writing of configure options from Controller to Model. Fixes #191 .
2013-10-02 08:25:48 -04:00
19e5aec9ba
Use the global zmBandwidth variable from Configure::read in the layout
2013-10-02 08:18:17 -04:00
e3db6e0edc
Moved the zmBandwidth option from a cookie to global Configure:: option
...
In addition I'm no longer passing this option around, instead calling it
where needed. This _might_ fix #175 as the variable is being set very early on
in bootstrap.php
2013-10-02 08:09:30 -04:00
b0b0d8a521
Merge pull request #185 from kylejohnson/modern
...
Moved the Config tabs to the sidebar
2013-10-01 06:42:12 -07:00
38944fb994
Merge pull request #179 from WDKevin/modern
...
Added datetime picker support and implemented on events sidebar
2013-10-01 06:28:29 -07:00
83c744c7b7
Removed tooltips from jQuery UI
2013-10-01 08:39:16 -04:00
e61fbc4ba8
Bumped jQuery from 2.0.1 to 2.0.3
2013-10-01 08:39:02 -04:00
d3c221135d
Moved the Config tabs to the sidebar
2013-09-30 10:28:45 -04:00
84cd245462
Fixed full screen toggle so it stays in place when the page is scrolled
2013-09-29 14:08:58 -04:00
348399d61b
Tweaked the appearence of the filter by monitor panel on the Events page
2013-09-29 14:05:25 -04:00
de99655196
Fixed select all bug after performing a search
2013-09-29 13:59:19 -04:00
f8ea2a777c
Improved the loading animation
2013-09-29 12:51:59 -04:00
33c0dff8a4
Fixed the search by date functionality
2013-09-29 11:36:23 -04:00
76c8190e8b
Update web frontend to correctly display video events
2013-09-29 12:23:28 +13:00
7e90d0f373
Added datetime picker support and implemented on events sidebar
2013-09-28 18:52:25 -04:00
48f11a8064
Add cmake to zoneminder
2013-09-28 12:59:50 +03:00
366a7c2541
Use a layout without a sidebar for the Config page
2013-09-27 20:51:34 -04:00
983aece616
Consolidate the sidebar for Monitors and Events index.
2013-09-27 20:45:25 -04:00
a852dee7bb
Initial commit of expanding and collapsing error log messages
2013-09-27 19:58:01 -04:00
0630478404
Cleaned up date and time formatting on events page
2013-09-27 18:52:26 -04:00
ef66285fa5
Added universal support for select all checkboxes and added one to the events page
2013-09-27 18:32:00 -04:00
516733a50e
Fixes a small bug with a second border on each monitor panel
2013-09-27 17:50:24 -04:00
a37e2fc168
Adds fullscreen button to hide and show header, sidebar and footer
2013-09-27 17:45:52 -04:00
73d9cfd3d9
Removed fullscreen CSS to be recomitted later
2013-09-27 17:39:24 -04:00
01b2617dd8
Fixes the fixed width bootstrap bug for containers
2013-09-27 17:37:48 -04:00
1f02255413
Put the sidebar into a panel
2013-09-27 09:17:54 -04:00
1887987841
Make the monitors index sidebar a little more terse
2013-09-27 08:42:46 -04:00
e4a05f0ae0
Don't load the masonry JS
2013-09-27 08:42:06 -04:00
8dc161d47a
Use css float, width and margin to position the monitors in the index view.
2013-09-27 08:40:52 -04:00
6e06a35982
Added bootstrap glyphicons
2013-09-27 08:21:19 -04:00
9566bfd31a
Display the monitors as "panels"
2013-09-26 13:46:58 -04:00
6b4e703388
Added help text to the Monitors General tab
2013-09-25 10:09:36 -04:00
5ae657d6b0
Added help text to the Monitors Buffers tab
2013-09-25 10:09:14 -04:00
47336fee15
Don't apply default classes to the Monitors edit and add checkboxes
2013-09-24 21:40:21 -04:00
7c32525c9a
Don't put the default div around the Monitors form close button
2013-09-24 21:35:47 -04:00
8fc599240e
Set the class of the default divs to form-group
2013-09-24 21:32:38 -04:00
ae895ad8b7
Set the width of the tab-content to 400px
2013-09-24 21:32:07 -04:00
11983ab039
Don't add a fieldset to the timestamp tab
2013-09-24 21:26:31 -04:00
3994378dd9
Don't use a horizontal form for Monitors add and edit views
2013-09-24 21:23:35 -04:00
29abee74ad
Included the create element instead of the end element
2013-09-24 21:16:44 -04:00
d8108fc6cd
Moved common Monitors add and edit form code to elements.
2013-09-24 21:14:56 -04:00
f3c235544d
Moved the common Monitors add and edit nav code to an element.
2013-09-24 20:43:48 -04:00
186f763a4c
Moved vars for Monitors edit and add views to appropriate elements.
...
This saves a bunch of redundant code, while putting the code in the
'right place'.
2013-09-24 20:34:36 -04:00
f385db2d80
Moved the scaling of streams from JS to PHP
...
The Monitor model is now smart enough to change the stream's scale.
It also has the option of not scaling at all (in the case of the
single monitor view).
2013-09-24 12:54:37 -04:00
5f103b35a4
Load masonry on all pages
2013-09-24 11:21:27 -04:00
87fe605435
Updated masonry from 3.0.0 to 3.1.2
2013-09-24 10:58:23 -04:00
88dbd8db1d
Removed the LiveStreamHelper completely.
...
No longer needed as of 2fa0d3a284
2013-09-24 09:18:01 -04:00
9ccf5c72ce
Forgot to remove debug() from a view
2013-09-24 09:12:42 -04:00
2fa0d3a284
Rewrote the way that monitor streams are created.
...
No longer need LiveStreamHelper, and the logic of which image to
display (live or placeholder) has been moved to the Moniors model.
This way should be much easier to understand and support. This also
fixes my 'ugly hack' in commit eed6c81287
2013-09-24 08:56:04 -04:00
22f9ba5c38
Write the daemon status to Configure
2013-09-24 08:55:46 -04:00
eed6c81287
An ugly hack to make the liveStreams display in both index and view views.
2013-09-23 21:51:02 -04:00
172d7a52d1
Revert "Wrapping the main content in a container to fix #169"
...
This reverts commit 8a9f9a8ab5
2013-09-23 15:22:07 -04:00
3f70f6714f
Removed an old </table> tag
2013-09-23 15:09:58 -04:00
8a9f9a8ab5
Wrapping the main content in a container to fix #169
2013-09-23 15:04:23 -04:00
7e91053761
increase the hegiht of the window a bit, the contents are larger
2013-09-23 10:03:33 -04:00
6d00540b5d
Improve Chrome browser support & log streaming events
2013-09-21 14:52:41 -05:00
2e8e3d55ad
Removed green version label and changed to red when a new version is available
2013-09-20 10:49:12 -04:00
0de88e7d68
Fixed small bug left over from testing
2013-09-20 10:49:12 -04:00
d78315de50
Polls the update check every 5 minutes and if an update is available it adds a message beside the version number in the footer. This should fix issue #130
2013-09-20 10:49:11 -04:00
99bae6386e
Merge branch 'monitorSize' of git://github.com/chriswiggins/ZoneMinder into modern
2013-09-20 17:49:04 +12:00
f8db56b308
Have the Events view view (not index) use the popup layout
2013-09-19 11:31:54 -04:00
0223aeb3ab
Set all event links to be colorboxes
2013-09-19 11:31:05 -04:00
9e782ed407
Adding the colorbox css and js to the default template
2013-09-19 11:30:25 -04:00
e0a7418d24
Adding the colorbot js
2013-09-19 11:29:42 -04:00
afa281a750
Adding the colorbox css
2013-09-19 11:29:29 -04:00
e936df0f0d
A minimum layout file for use with popups
2013-09-19 11:29:12 -04:00
ca8cc028ef
Display an HTML5 <video> for each event
2013-09-19 09:12:05 -04:00
8aec78258b
Create a video for each event view.
...
This determines the appropriate video format based on the user agent,
creates the video, and then returns the video path to the view.
2013-09-19 09:10:57 -04:00
5844a1cc89
Added a function which creates videos from event jpgs
2013-09-19 08:57:54 -04:00
a49e66889d
Move JS to main.js
2013-09-19 21:10:41 +12:00
133b061179
Add code for dynamically scaling monitor images on home screen. Add new no-image image
2013-09-19 20:56:09 +12:00
5178d4fa37
Added "Function" column to the $monitors array to fix issue 140
2013-09-18 17:24:52 -04:00
d7fd5566a7
Fixes issue 129 - Bandwidth is now updated in the UI after changing it
2013-09-18 17:10:17 -04:00
bf8f799c4c
Moved delete button to the sidebar
2013-09-18 16:46:44 -04:00
0cf11adb99
Removed logging line from deleteSelected function
2013-09-18 15:55:50 -04:00
c6bbdac0d7
Added ability to delete multiple events at once
2013-09-18 15:53:35 -04:00
0f25bec1d6
Fixes to monitor sorting and reordering
2013-09-18 13:23:16 -04:00
bcaa0ac36c
Added missing jquery-2.0.1.min.map file
2013-09-18 13:16:10 -04: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
4430399b1e
Removed logging of post data
2013-09-18 12:37:01 -04:00
6dfdba7023
Added ability to reorder monitors on the dashboard
2013-09-18 12:22:14 -04:00
f716fbb237
Open the Config Option tab by default
2013-09-17 12:48:38 -04:00
f7b7a49616
shoNoImage was always being called as the $mon variable was incorrect
2013-09-17 09:43:48 -04:00
ddec9a0dd8
Fixes 147 - there were unescaped quotes
2013-09-17 09:28:42 -04:00
17b60bf25f
Merge branch 'modern' of github.com:ZoneMinder/ZoneMinder into modern
2013-09-17 09:13:03 -04:00
e694616702
Reworked the Config view to display options in rows using bootstrap.
...
This commit fixes #134
2013-09-17 09:07:35 -04:00
064b86c95f
Added my events dir to the gitignore list
2013-09-17 08:54:53 -04:00
e0423570bd
Added classes to take care of smaller and larger displays
2013-09-17 08:50:46 -04:00
dc316b0aee
Add static image when the monitor/system is not enabled/running
2013-09-16 22:00:27 +12:00
6c60813a6f
Merge branch 'modern' of github.com:ZoneMinder/ZoneMinder into modern
2013-09-16 13:13:07 +12:00
7f1589a74e
Search for a different string in zmdc.pl to correctly determine if ZM is running or not
2013-09-16 13:11:01 +12:00
c6d1715948
Removed an unneeded div in the Events view.
2013-09-14 22:10:49 -04:00
3738c3866d
Added a link to each event row to delete that event.
...
This fixes #126 however that issue was not specific enough. This
commit allows a user to delete individual events. There is currently
no way to delete multiple events.
2013-09-14 22:09:28 -04:00
bf2e46f512
Added a function to delete events.
...
Currently this only allows single events to be deleted.
2013-09-14 22:05:08 -04:00
0b5a215dca
Use the HtmlHelper::tableHeaders helper to display the table headers
2013-09-14 21:03:31 -04:00
9ccf5c4ee8
Added a horizontal rule to the footer to help it stand out.
...
This isn't ideal (the footer should have css to make it stand out,
instead of an extra element).
2013-09-13 09:13:07 -04:00
16994dbdb2
Add some styling to the version number in the footer.
...
If there is an upgrade available, the label-info (blue) class is
applied.
If there is not an upgrade avaiable, the label-success (green)
class is applied.
2013-09-13 09:07:19 -04:00
b2ab1cea09
Initial commit of Version Controller and View
2013-09-13 08:55:46 -04:00
2f99274c0a
Initial commit of Version model
2013-09-13 08:44:21 -04:00
180d879894
Display the ZM version in the footer of all pages.
2013-09-13 08:43:11 -04:00
0437e6e5b6
Pass the zmVersion variable to all views
2013-09-13 08:42:55 -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
f0231a7d5f
Added some styling to the logs table
2013-09-12 20:10:51 -04:00
34b4ec0b94
Display elements properly for bootstrap. Also fixed element id's
2013-09-12 20:03:41 -04:00
d32bab4248
Use the Html, Form and Paginator helpers from BoostCake
2013-09-12 20:02:33 -04:00
e42afcd76a
Load all available CakePHP plugins
2013-09-12 20:01:31 -04:00
e1ce213f04
Adding the BoostCake plugin
2013-09-12 20:00:57 -04: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
fcf7e5b188
Redo the patch that added the <0 test. Since it isn't an actual error there won't be an error message set so I've made it another case entirely.
2013-09-12 13:54:03 -04:00
75acaea36e
Open the monitor edit general tab by default
2013-09-11 15:29:18 -04:00
6dbd10621d
Reworked to use Bootstrap tabs
2013-09-11 15:24:51 -04:00
e27a065039
Add the necessary class to allow these elements to display in tabs
2013-09-11 15:24:28 -04:00
cbf48a1d8f
Use bootstrap tabs instead of jquery tabs
2013-09-11 15:09:43 -04:00
b18b38c486
Apply bootstrap theme to the events table
2013-09-11 15:08:41 -04:00
9dfa3eb5af
Rework the config index view to use bootstrap tabs
2013-09-11 15:08:07 -04:00
d33f32f6ce
Moved the config indev view form to not enclose the tab list
2013-09-11 15:07:03 -04:00
c03c21895c
Display a red or green alert, depending on daemon status
2013-09-11 10:37:18 -04:00
62679e3ff1
Display monitors as bootstrap thumbnails in a grid view
...
This will need to be reworked to dynamically determine the number
of rows
2013-09-11 10:17:47 -04:00
dfa2d37c4d
Moved the daemonStatus to the header, from the footer
2013-09-11 10:17:10 -04:00
735f85a255
Renamed the thumb_width variable to be width as that is what my helper expects
2013-09-11 10:14:04 -04:00
6a65bef736
Display the system load and free disk space in the nav bar
2013-09-11 09:23:55 -04:00
dbba80fcbf
Added a function in AppModel to check the free disk space in the events directory
2013-09-11 09:23:13 -04:00
646b511cd4
Added a function in AppModel to check the System Load
2013-09-11 09:22:53 -04:00
c41810bbf1
Reworked the paginator number display to play nice with Bootstrap
2013-09-10 20:27:30 -04:00
fa3725d377
Put the sidebar into the Bootstrap sidebar
2013-09-10 20:19:03 -04:00
d9b6140bf8
Convert the Logs index view to use a bootstrap sidebar
2013-09-10 20:18:25 -04:00
09a3b9e353
Convert the default layout to use Bootstrap
2013-09-10 20:17:44 -04:00
88b8534efb
Adding bootstrap CSS and JS files
2013-09-10 19:06:10 -04:00
2a0613a370
Bunch of updates to css
2013-09-06 15:39:37 -04:00
5c857029ce
Merged the JS from config.js and events.js into main.js
2013-09-06 15:07:08 -04:00
9b22dae624
Adding the loading AJAX image to the header
2013-09-06 15:02:43 -04:00
c4283ad72e
Adding some base HTML to make the ajax view work
2013-09-06 15:01:59 -04:00
48d162d432
Adding a function to control the daemons (start, stop, etc)
2013-09-06 15:01:05 -04:00
6a9ce02870
Moving some of the monitor options to the controller
2013-09-06 15:00:01 -04:00
0a9e63ca2c
remove autogenerated files
2013-09-06 14:40:55 -04:00
c8ad6ae656
Fixes #107 for real this time.
2013-09-05 20:31:52 -04:00
c02d496d23
More CakePHP cleanup - missed it in 2c04d0774f
2013-09-05 10:52:55 -04:00
d47aaec775
Merge pull request #92 from knnniggett/patch-9
...
Update getBrowser() to match IE10
2013-09-03 06:38:13 -07:00
c5196407a9
Moved all of the Monitors HTML to elements
2013-09-01 17:50:26 -04: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
9f1268df38
Update hu_hu.php
...
This one contains updates related to all the earlier pull requests.
Had to change the entire file due to charset encoding reasons.
2013-08-16 15:40:50 +02:00
bd4aae4c1e
Update console.php
...
Fix the bandwidth status sentence on the top of the console window, the last word is different than the universal 'bandwidth' word in many other languages.
2013-08-16 14:08:38 +02:00
8a3850ac11
Update en_gb.php
...
Enable localization of the monitor function names in the console, function window and monitor settings window.
Fix the bandwidth status sentence on the top of the console window, the last word is different than the universal 'bandwidth' word in many other languages.
2013-08-16 14:06:40 +02:00
a186981278
Update monitor.php
...
Enable localization of the monitor function names in the monitor settings window.
2013-08-16 13:48:25 +02:00
0c098e2b0f
Update function.php
...
Enable localization of the monitor function names in the function window.
2013-08-16 13:41:33 +02:00
ff9cbeff6b
Update console.php
...
Enable localization of the monitor function names in the console.
2013-08-16 13:39:42 +02: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
bc18a27072
Update skin.js
...
Increased popup window sizes just a little bit, to prevent the longer foreign language translated strings to break window layouts.
Fine-tuned again, I hope that's the final one :-)
2013-08-16 10:13:35 +02:00
9c7653ca68
Update timeline.php
...
Enable localization of the usage instructions in the Timeline window.
2013-08-15 18:58:08 +02:00
8ce4d302dd
Update montage.php
...
Enable localization of the dropdown box items in the montage window.
2013-08-15 18:56:01 +02:00
150cf5ae80
Update en_gb.php
...
Added a couple of localized strings.
These need to be added to each language file too!
2013-08-15 18:52:14 +02:00
4d6b9f7276
More updates to the Hungarian translation. #Fixes #45
2013-08-15 09:39:45 -04:00
2b0647a52c
Update skin.css
...
Increased table width just a little bit, to prevent the longer foreign language translated strings to break window layouts.
2013-08-15 12:48:04 +02:00
1fa04cc104
Update hu_hu.php
2013-08-14 22:38:37 +02:00
ee251b3c02
Removing lingering references to UsedPl
2013-08-13 12:34:59 -04:00
266b67d0bd
Support for control when monitor source is ffmpeg. This should fix #16 .
2013-08-13 08:34:37 -04:00
3a305522c4
Merge branch 'develop' of github.com:ZoneMinder/ZoneMinder into develop
2013-07-25 11:50:24 -04:00
cdac403fb1
Merge ../zum into develop
...
Conflicts:
AUTHORS
configure.ac
db/zm_create.sql.in
scripts/ZoneMinder/lib/ZoneMinder/ConfigData.pm.in
scripts/zmupdate.pl.in
src/Makefile.am
src/zm_buffer.cpp
src/zm_config_defines.h
src/zm_event.cpp
src/zm_ffmpeg.h
src/zm_ffmpeg_camera.cpp
src/zm_image.cpp
src/zm_jpeg.h
src/zm_local_camera.cpp
src/zm_logger.cpp
src/zm_mem_utils.h
src/zm_monitor.cpp
src/zm_monitor.h
src/zm_mpeg.cpp
src/zm_remote_camera_http.cpp
src/zm_remote_camera_rtsp.cpp
src/zm_rtsp.cpp
src/zm_sdp.cpp
src/zm_sdp.h
src/zm_stream.cpp
src/zm_thread.cpp
src/zm_thread.h
src/zm_threaddata.cpp
src/zm_user.cpp
src/zm_user.h
src/zm_utils.cpp
src/zm_zone.cpp
src/zm_zone.h
web/includes/actions.php
web/lang/big5_big5.php
web/lang/cn_zh.php
web/lang/cs_cz.php
web/lang/de_de.php
web/lang/dk_dk.php
web/lang/en_gb.php
web/lang/es_ar.php
web/lang/et_ee.php
web/lang/fr_fr.php
web/lang/he_il.php
web/lang/hu_hu.php
web/lang/it_it.php
web/lang/ja_jp.php
web/lang/nl_nl.php
web/lang/pl_pl.php
web/lang/pt_br.php
web/lang/ro_ro.php
web/lang/ru_ru.php
web/lang/se_se.php
web/skins/classic/js/skin.js
web/skins/classic/views/js/monitor.js.php
web/skins/classic/views/monitor.php
web/skins/classic/views/zone.php
2013-07-25 11:49:55 -04:00
f1d9de75b0
Point root to the Monitors index action
2013-07-19 09:30:08 -04:00
46deb93f74
Events index view is now at a semi-usable state, similar to the original skin.
...
In the interest of releasing something, I am not going to use ajax here
for now. Goal is to have this view behave similar to the original Events
view in the original skin. Currently you can:
* Paginate events
* Filter events using the sidebar
Bug: Filter elements are unset when paginating.
2013-07-19 07:30:13 -04:00
ad0aaa6e93
Initial commit of Zone MVC
2013-07-18 08:08:07 -04:00
6ba1d8f041
Added the Js helper and RequestHandler component to AppController to be available app-wide.
2013-07-16 08:33:53 -04:00
e4ccd359cd
Allow setting of width with the live stream helper
2013-07-15 07:35:39 -04:00
4265e8b45f
Sort with newest at top, not bottom.
2013-07-11 12:09:45 -04:00
67ad15fdc5
Initial commit of the Logs Controller and View.
...
The log functionality is similar to that of the classic skin, though
with fewer options. Initial filtering support is for only component type.
Also displays a fixed last 100 log events, sorted by TimeKey ascending.
2013-07-11 12:06:12 -04:00
2ea43105ec
Merged config.js and events.js into main.js.
...
This should fix #15 as I'm keeping all JS in a single file, instead of
a file per page.
2013-07-11 12:00:01 -04:00
80ebaad07b
Initial commit of the Log model
2013-07-10 10:00:49 -04:00
64fba81f6a
Moved the navigation items to an ordered list
2013-06-25 12:21:21 -04:00
cdbb3d126e
Added Masonry from http://masonry.desandro.com/
...
Masonry is a JavaScript grid layout library, and it is going to make my
life easier on the Events page.
2013-06-22 21:53:53 -04:00
12537a7860
Added jquery-ui images and updated jquery-ui css to point to them.
2013-06-22 21:50:22 -04:00
e9e99261d9
Better styling of the Config page.
...
Added row highlighting, positioned all of the labels and inputs
appropriately, and added the description of the option.
2013-06-22 21:40:29 -04:00
bffe78904f
Display the correct input type for the config option.
...
I am keying the input type off of the 'Hint' and 'Type' columns
in the Config table. It would be easier if I just added an 'inputtype'
column to the Config table, and I might do that later, but I don't want to
mess with the database right now.
2013-06-22 11:59:46 -04:00
fe5df3eb8c
Also grab the Hint column from the Config table
2013-06-22 11:59:03 -04:00
5635b24897
Make the tab's first character uppercase
2013-06-21 22:22:54 -04:00
567c0c5c20
Switching on the category type to determine which type of input to display.
2013-06-21 22:20:16 -04:00
6faa248248
Sorting the Config results by Type (boolean, string, etc)
2013-06-21 22:19:27 -04:00
819f1b48d6
Filtering out the "hidden" category
2013-06-21 22:18:44 -04:00
d64a09576f
Split the config / options page into tabs based on Category.
...
Still a lot of work to do such as displaying the proper input
type based on option, however basic tabbing and saving works,
as does the on-hover tooltip (I think I put that in this commit).
2013-06-21 12:52:30 -04:00
bb19e80fa8
Support for control when monitor source is ffmpeg. This should fix #16 .
...
Some IP cameras need the source set to ffmpeg even though they are remote
cameras. These cameras do have a remote PTZ interface, but previously
when the monitor source was set to ffmpeg, the only control type
available was 'none'.
2013-06-15 19:50:19 -04:00
964e1919bc
Initial commit of Filters MVC.
...
The filters will be split from the events in this interface, where
in the classic interface, they were combined.
2013-06-04 13:23:00 -04:00
f50bf834d9
Forgot to change $event to $value, and to move a <td> or two.
2013-05-30 23:00:09 -04:00
50085d48b5
Reworked the Events index view to display thumbnails by default.
...
The EventsController calls createListThumbnail() to build a list
of thumbnail data which is then passed to the view to be looped though.
Also had to change how I loop through $events so that I can match up the
indexes in $events with the indexes in $thumbData
2013-05-30 22:54:51 -04:00
3505f35a6d
Replaced my function for selecting and filtering events based on monitors
...
The new way of doing it leverages jquery-ui functions.
2013-05-30 22:46:27 -04:00
59a1740dca
Re-worked the Events index view to display the monitors as a list
...
This will allow me to use the jquery-ui selectabled on the list.
2013-05-30 22:43:48 -04:00
e80bd5ffd0
Updated the CSS for jquery-ui-selected elements
2013-05-30 22:36:51 -04:00
26c1110e3f
Function to return info necessary to create an HTML img tag for a given event.
...
This function determines the scaled width and height of the image for the
thumbnail, as well as other information relating to the frame with the
highest score in this event.
2013-05-30 22:31:55 -04:00
1ae5cdd291
Function to return components necessary to build src to an event thumbnail.
...
A lot of this code was re-worked from the original includes/functions.php
file found in the classic zoneminder skin to work with CakePHP.
Function seems to work, but looks like it could use some serious re-factoring.
2013-05-30 22:22:48 -04:00
22a73a3255
Added one of the hard coded options from the original config.php file
2013-05-30 22:03:20 -04:00
f4d2df3941
Function to determine the path to an event in the filesystem.
2013-05-30 20:30:09 -04:00
c2e2079818
Function to rescale dimenions of events.
2013-05-30 20:25:18 -04:00
e107e34164
Associated the Event Model with the Frame Model
2013-05-30 19:47:32 -04:00
fb97233869
Initial commit of Frame Model
2013-05-30 19:47:07 -04:00
26f99bf76b
Adding jQuery UI
2013-05-29 17:46:07 -04:00
633aa7a9ad
Initial support for filtering events.
...
First I tell extractNamedParams() which params I care about (ignore the rest),
then I loop through the returned results and build my query via named params.
Finally I pass the named params into the $conditions array for paginate to use.
2013-05-29 07:54:06 -04:00
cc4af23115
Removed the Config model from the Events controller.
...
Not needed since commit c408575075
2013-05-29 07:52:34 -04:00
fdb5fd5b57
An AJAX loading / spinner gif
2013-05-29 07:50:49 -04:00
870298082e
Minor styling to selected rows in the Events view.
2013-05-29 07:50:23 -04:00
984035dde3
Initial commit of events.js file; added it to all pages.
...
events.js should eventually be loaded in only the events view. This commit
creates #15 .
2013-05-29 07:47:27 -04:00
47af648803
Minor HTML updates so that I can better select elements with jQuery later on.
...
Wrapped the Events table in a div, and gave the id #Events to that div.
2013-05-29 07:45:47 -04:00
d5e60e8b78
Minor indenting, and added an empty placeholder $conditions array.
2013-05-29 07:44:30 -04:00
545826b55c
A method to make named parameters strongly defined.
...
Added a method that processes named parameters and ensures all mandatory ones
exist and substitutes missing optional ones with default values. This makes
named parameters strongly defined and easier to read.
Thanks to http://developinginthedark.com/posts/cakephp-tip-1-named-parameters
for the idea.
2013-05-29 07:37:00 -04:00
c408575075
Grab ZM_WEB_EVENTS_PER_PAGE from Configure instead of the database
2013-05-25 12:30:34 -04:00
6d2f7baf5d
Re-added the jQuery javascript engine
2013-05-25 12:22:23 -04:00
1795633b71
Added names to the tables and td for sorting the events list via js
2013-05-25 11:55:52 -04:00
60b67a1703
Removed the jquery helper. Going to keep my js code in seperate files for now
2013-05-25 11:54:34 -04:00
07ac7aaeb4
Use the jQuery javascript engine
2013-05-25 11:44:53 -04:00
13b7c4b04a
Write cached scripts
2013-05-25 11:43:22 -04:00
aa72855b28
Added jQuery 2.0.1 file
2013-05-25 11:39:24 -04:00
05c8ddf153
Reworked to allow displaying of monitors from many views with less code.
...
* Moved getStreamSrc from Monitors Controller to Monitors Model
* Minor indenting of code
* Removed some old code
* Changed how I lookup ZM_MPEG_LIVE_FORMAT from within getStreamSrc
* Changed Monitors View view to use divs instead of tables
2013-05-24 20:13:14 -04:00
7b98b62c16
Fixed some indenting
2013-05-22 21:19:10 -04:00
57c553e05f
Added LiveStream helper
2013-05-22 21:18:43 -04:00
155ec308a0
Replaced HTML image tag with LiveStream helper
2013-05-22 21:18:01 -04:00
f05c23b104
Created a helper for live video streams
2013-05-18 18:22:39 -04:00
c28a35ca31
Added a daemon status message to the footer of every page (whether or not ZM is running)
2013-05-17 09:03:30 -04:00
ae5a3d716c
Made zm.conf options available site-side
2013-05-17 09:02:34 -04:00
9628aff358
Load AppModel to AppController
2013-05-17 09:01:54 -04:00
195b5deac1
Added a function to check the status of the ZoneMinder daemons
2013-05-17 08:57:24 -04:00
f1a590c805
Made the options in the Config table available site-wide.
2013-05-17 08:42:32 -04:00
17c8b98a41
Moved all of the Events table stuff in the Monitors index view to the Events index view
2013-05-15 17:53:07 -04:00
869fb3f626
Changed the way that I am looking up monitors
2013-05-15 17:52:30 -04:00
0d004fb588
Changed some minor indents
2013-05-15 17:51:53 -04:00
343fd4c3b6
Removed the host field from the monitors query
2013-05-15 17:51:14 -04:00
176064343d
Moved the events table code frmo the Monitors controller to the Events controller
2013-05-15 17:50:46 -04:00
4022695961
Reworked the events paginate function, it now grabs only the needed fields, sorts properly, and limits based on the configured ZM_WEB_EVENTS_PER_PAGE option.
2013-05-15 17:46:11 -04:00
c47f450e41
Added the Monitor and Config model to the Events controller
2013-05-15 17:42:42 -04:00
2a3b649341
Forgot to pull out the Monitors schema before committing...
2013-05-15 08:42:39 -04:00
7913fbb49f
Added a link to the add monitors page
2013-05-15 08:36:05 -04:00
a1aed0ec03
First pass at ability to add monitors. Field names do not match database columns so not all values are saved
2013-05-15 08:35:49 -04:00
Isaac Connor
Isaac Connor
SteveGilvarry
Hannes
Emmanuel Papin
Kyle Johnson
Andrew Bauer
Jan M. Hochstein
Andrew Bauer
stevegilvarry
tim
Kfir Itzhak
Will W
m-bene
Kyle Johnson
Maciej Czerniak
Sune1337
Justin Lawrence
Adam J. Henry
Scott Robinson
Miklos Marton
Edward Barnard
Philipp Rehs
David Nesting
kjohnson
Chris Wiggins
Isaac Connor
Kevin Crider
Serguei S. Dukachev
Richard Kojedzinszky
Isaac Connor
nagyrobi