a940fe429c
deprecate the use of the center tag, and only put in the development h3 if it has contents
2017-05-31 22:08:05 -04:00
043d722651
braces,whitespace
2017-05-25 14:26:49 -04:00
29bcab9204
fix Debug to Logger::Debug
2017-05-18 13:54:06 -04:00
254fcbcef7
update gpl 2 mailing address in source files
2016-12-26 09:23:16 -06: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
24d471f452
Merge pull request #1503 from ZoneMinder/id_on_console
...
add option to show monitor ID on console
2016-08-06 10:59:03 -05:00
19265b631a
custom banner text on web console
2016-07-09 13:11:30 -05:00
f461bc1e80
get rid of extra )
2016-05-26 12:18:58 -04:00
f969186abb
add the ZM_WEB_ID_ON_CONSOLE option and use it to show the ID column on the console
2016-05-26 11:15:13 -04:00
730abc9789
make zones unclickable when zm is not running
2016-05-26 09:35:36 -05:00
804ac1de81
Clone feature added
2016-04-14 13:53:10 -04:00
0b2a309014
Merge pull request #961 from Linwood-F/960-montage-review-new-feature
...
960 montage review new feature
2016-02-08 20:40:04 -06:00
44f3b99d24
change logic to show server column if any servers are defined. Reason is that once you have setup 1, you want to know which cameras have not been assigned a server yet
2016-01-04 14:59:04 -05:00
273ab6c5c6
Only show Server column when more than 1 Servers are defined
2016-01-04 14:51:24 -05:00
582cbe7567
Merge branch 'master' into multi-server
2015-10-15 09:01:19 -04:00
d9355064e7
fixed orange display for monitor mode
2015-10-01 11:35:38 -04:00
4a65ae1d2a
fix error in display of Server
2015-09-17 15:34:48 -04:00
0f181b72d1
include Server object and display the server column
2015-09-16 14:51:23 -04:00
32f6c92b02
replace php short open tag
2015-08-16 12:29:03 -05:00
85e2b165b1
bump version to 1.28.101
2015-08-15 12:01:57 -05:00
e178e1b1d6
fix #948 1
2015-08-04 11:37:11 -04:00
84ed491765
Initial Montage Review for people to take a look at
2015-07-22 13:51:31 -04:00
560a4cccbe
Show correct part of URL (hostname) for ffmpeg sources in console
2015-07-17 13:59:40 +02:00
1a0d4d2221
Console now shows custom run state in header (if applicable)
2015-06-21 09:31:21 -04:00
bf4038a724
followup changes based on comments in #833
2015-05-21 12:23:31 -05:00
3a94712db2
add translate function
2015-05-10 08:10:30 -05:00
216348274b
Remove a remaining hardcoded string
2015-04-18 18:14:36 +02:00
2b00ebd02c
if path results in an empty string, set it to something so that the link is there when type is vlc
2015-02-03 10:52:49 -05:00
3c8153c9b4
better fix for the view=console security flaw.
...
This does it in index.php,so it guards all pages, and also just changes the view to login, so instead of giving an error, it presents you with the login, which I think is better.
2014-12-12 09:38:54 -05:00
74da3e9c02
fix auth requirement by checking for user when AUTH is on
2014-12-11 17:09:18 -05:00
e87e69fa57
Ran script to replace all Short open tags
2014-12-05 10:44:23 +11: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
b3f078eaa5
add the word disabled after function if the monitor is not enabled.
2014-07-23 15:46:37 -04:00
d6a27b31e8
fix extra }
2014-03-24 13:44:06 -04:00
bfb52ab9aa
fix groups
2014-03-21 23:10:13 -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
c2b93c3caf
Merge remote branch 'nagyrobi/patch-26' into nagyrobi
2014-02-26 09:32:58 -06:00
1dd8dc4aa6
Merge remote branch 'nagyrobi/patch-21' into nagyrobi
2014-02-26 09:15:47 -06: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
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
f73585dbaa
Few web interface corrections regarding cURL
2013-11-04 17:28:15 +02: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
ae51ac5519
redo changes to use new dbFetch functions with parameter arrays
2013-10-18 14:24:08 -04: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
ff9cbeff6b
Update console.php
...
Enable localization of the monitor function names in the console.
2013-08-16 13:39:42 +02: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
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
d2f5e9623c
Added checks for mismatches between system and database versions
...
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@3364 e3e1d417-86f3-4887-817a-d78f3d33393f
2011-05-25 09:15:14 +00:00
Isaac Connor
Andy Bauer
Isaac Connor
Andrew Bauer
arjunrc
Isaac Connor
Isaac Connor
Linwood-F
root
Emmanuel Papin
Isaac Connor
SteveGilvarry
Kfir Itzhak
Edward Barnard
nagyrobi
Kyle Johnson
stan