Commit Graph

741 Commits

Author SHA1 Message Date
Isaac Connor 3be3a3ada2 convert the monitor variable to a Monitor object, replace the static zone image with a stream, and use SVG to draw the zones 2016-04-08 10:46:51 -04:00
Isaac Connor 60642c1fff Merge branch 'iconnor_video' into storageareas 2016-04-05 12:32:33 -04:00
Isaac Connor 238a25a302 Merge branch 'master' into iconnor_video 2016-04-05 09:38:59 -04:00
Andrew Bauer a0e6c004a2 Merge pull request #1388 from ZoneMinder/reload_stream_on_error
try to reload the image stream on error.
2016-04-04 20:57:48 -05:00
Andy Bauer 4e9a925933 Merge branch 'Autotools_delete' of https://github.com/SteveGilvarry/ZoneMinder into SteveGilvarry-Autotools_delete 2016-04-04 20:52:49 -05:00
Andy Bauer 7ff8d36598 Merge branch 'depracation_nation' of https://github.com/SteveGilvarry/ZoneMinder into SteveGilvarry-depracation_nation 2016-04-04 20:44:53 -05:00
Isaac Connor 6c8e8368e1 rtsp should be lower case 2016-04-04 16:56:54 -04:00
Isaac Connor 564f189416 Merge branch 'always_show_ptz' into storageareas 2016-04-04 16:45:54 -04:00
Isaac Connor 6c92c0e3f7 Merge branch 'reload_stream_on_scale' into storageareas 2016-04-04 16:13:35 -04:00
Isaac Connor 98fce7c3c6 Merge branch 'reload_stream_on_error' into storageareas 2016-04-04 16:13:26 -04:00
Isaac Connor 123a1a898a try to reload the image stream on error. 2016-04-04 15:04:09 -04:00
Isaac Connor 0b13f9d76f reload stream on scale change 2016-04-04 14:58:07 -04:00
Isaac Connor 5f3e7134fb split power out of the Panel box so that I can style it better 2016-04-04 13:22:26 -04:00
Isaac Connor f91ff4503a rework the ptz controls to take up less vertical space, also don't set width of buttons 2016-04-04 13:20:04 -04:00
Isaac Connor b3f0f5d0e8 Merge branch 'updated-console' into storageareas 2016-04-04 11:51:07 -04:00
Isaac Connor 197ae67313 Merge branch 'always_show_ptz' into storageareas 2016-04-04 11:47:29 -04:00
Isaac Connor 3e20e5f21c fix ptz control box size 2016-04-04 11:40:01 -04:00
Isaac Connor 9dfe71ceb8 Always show events and always show ptz controls. Also clean out some commented out cruft 2016-04-04 11:39:12 -04:00
Isaac Connor 2233747fcb add a missing t 2016-04-04 11:38:16 -04:00
Isaac Connor 43e4052dd9 Merge branch 'storageareas' of github.com:ZoneMinder/ZoneMinder into storageareas 2016-04-04 11:36:03 -04:00
Isaac Connor dd153d8efb add header.php to autotools build 2016-04-04 11:35:51 -04:00
Isaac Connor 96aa20fb79 value should be lower case when checking for rtsp 2016-04-01 15:43:59 -04:00
Isaac Connor 5f6d140de5 Load all event fields, so we know we have them deeper in the code. 2016-04-01 14:07:27 -04:00
Isaac Connor 82b32578ec Merge branch 'master' into iconnor_video 2016-04-01 12:54:09 -04:00
Isaac Connor 6816a4c75b Merge branch 'iconnor_video' into storageareas 2016-04-01 11:35:38 -04:00
Isaac Connor a2e228a5ca put quotes aroudn the string 2016-04-01 11:01:16 -04:00
Isaac Connor 3140905d02 whitespace and structure changes to match google coding style. Use new htmlSelect function to build the select dropdowns. Use a monitor object instead of a newMonitor array 2016-04-01 10:35:34 -04:00
Isaac Connor e7ee464a17 Add a RecordAudio setting to the Storage Tab 2016-03-31 15:50:44 -04:00
Isaac Connor c9a1a9020d Merge h264 2016-03-31 11:03:36 -04:00
Isaac Connor e5a36c02bd Merge remote-tracking branch 'origin/master' into video_remote 2016-03-30 16:55:24 -04:00
Isaac Connor ea49dc20d1 Merge branch 'master' into storageareas 2016-03-30 10:58:07 -04:00
Isaac Connor e9c65785e8 Merge branch 'storageareas' of github.com:ZoneMinder/ZoneMinder into storageareas 2016-03-30 10:56:53 -04:00
Isaac Connor 247cb3d0b2 Merge pull request #1360 from schrorg/monitornames-spaces
Allow spaces in monitor names
2016-03-30 09:17:57 -04:00
Isaac Connor 0ab6e27259 Use Monitor object 2016-03-29 14:35:12 -04:00
Isaac Connor f0a307e082 Merge branch 'storageareas' of github.com:ZoneMinder/ZoneMinder into storageareas
Conflicts:
	distros/ubuntu1504_cmake/control
2016-03-29 11:53:17 -04:00
Isaac Connor 1ea1852476 Do some Storage Areas support 2016-03-29 11:52:25 -04:00
Robin Daermann c8c0586c66 Trim monitor names 2016-03-29 11:40:14 +02:00
Andy Bauer 6eda3eff72 do not set maxfps fields during onvif probe 2016-03-26 08:38:28 -05:00
Robin Daermann 71db9b84e6 Allow spaces in monitor names 2016-03-24 14:37:24 +01:00
Isaac Connor 757740ede5 Move skin and css changing up above the include of header.php so that the set cookie call will work 2016-03-23 16:12:51 -04:00
Isaac Connor dd06db0bf0 remove duplication 2016-03-23 15:54:20 -04:00
Isaac Connor a66e97de09 Merge & fix new console & options 2016-03-23 09:48:57 -04:00
Isaac Connor 3a8352eb6b Merge branch 'master' into storageareas 2016-03-21 10:25:03 -04:00
Kyle Johnson 897a0a995c Convert options layout to side-tabs, and improve readability 2016-03-15 15:21:28 -04:00
Kyle Johnson 87932002cf Push the options page down a bit to make tab look better 2016-03-15 14:45:40 -04:00
Kyle Johnson 183f58ad17 Restyle options view with horizontal form layout 2016-03-15 14:43:22 -04:00
Kyle Johnson 694ad0b539 Add styling to delete / save / add buttons in options.php 2016-03-15 14:08:01 -04:00
Kyle Johnson bd30d40522 Remove cancel button from options as it no longer makes sense. 2016-03-15 14:03:17 -04:00
Kyle Johnson 0004a1180e Update options.php to use bootstrap container 2016-03-15 13:56:54 -04:00
Kyle Johnson 26748c2de5 Oops. Move Console view outside of canView(system) restriction 2016-03-15 13:52:36 -04:00
Kyle Johnson f05c1548ce Add a link back to console in header 2016-03-15 13:49:14 -04:00
Kyle Johnson 299c61c1ec Make the Options link a standard href (not a popup). 2016-03-15 13:47:31 -04:00
Kyle Johnson 8070bf8700 Move console php code to header as that code is now needed in additional views. 2016-03-15 13:46:03 -04:00
Kyle Johnson 49f46ac927 Move the header into its own file, and include it in options view. 2016-03-15 13:43:49 -04:00
Kyle Johnson 8acfe1b0d8 Update options styling 2016-03-12 22:44:11 -05:00
Kyle Johnson 2378c9a359 Fix state link to do popup like before 2016-03-12 20:44:42 -05:00
Kyle Johnson d202760d82 Additional footer padding 2016-03-12 20:37:07 -05:00
Kyle Johnson f5ba52824a Add styles to additional console buttons 2016-03-12 20:36:39 -05:00
Kyle Johnson a2c2101c48 Remove extra #footer styling 2016-03-12 20:28:16 -05:00
Kyle Johnson f80cbf52df Bump up the default font size 2016-03-12 20:27:51 -05:00
Kyle Johnson bebb1017fd Wrap footer in container-fluid 2016-03-12 20:27:22 -05:00
Kyle Johnson 5e2d4bc325 Restyle of Login page. 2016-03-12 20:11:32 -05:00
Kyle Johnson a403c1db8c Move recaptcha javascript to actual <head> tag
The way it was handled previously resulted in invalid html, with an
extra <head> tag being inserteed inside the <body>.
2016-03-12 19:14:07 -05:00
Kyle Johnson 71c35e712b Initial major restyle of classic skin. 2016-03-12 03:28:02 -05:00
Kyle Johnson c9441ec8c0 Local copy of bootstrap 3.3.6, included in classic skin. 2016-03-12 01:16:19 -05:00
Andrew Bauer 77f7a3642c remove check for "selected" property 2016-03-09 10:34:06 -06:00
Andrew Bauer 3280aff876 disable save button when nothing slected. fixes #1322 2016-03-09 09:43:44 -06:00
Isaac Connor b06b82f634 widen filter popup, because storage area name or server name might be longer 2016-03-04 15:35:55 -05:00
Isaac Connor 86dbe4fa15 define default for StorageId to prevent error message 2016-03-03 09:22:53 -05:00
Isaac Connor bcb403bf08 Merge branch 'fix_setButtonStates' into storageareas 2016-03-03 09:08:37 -05:00
Isaac Connor c0ed40fd06 fix structure of if/for 2016-03-03 09:06:57 -05:00
Isaac Connor cedc46adf3 Merge branch 'fix_setButtonStates' into storageareas 2016-03-02 09:12:19 -05:00
Isaac Connor bb0dcf3d43 fix setButtonStates. The checkboxes are an array. 2016-03-01 12:19:46 -05:00
SteveGilvarry d40bf89b17 Remove Phone BW settings used with mobile skin 2016-02-26 22:43:37 +11:00
SteveGilvarry 4837585601 Deleted eyezm options documentation and references to it in other areas of documentation. Removed zmstreamer.cpp.
Conflicts:
	src/zmstreamer.cpp
2016-02-26 22:37:23 +11:00
SteveGilvarry 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
Isaac Connor 131d0daefe fix syntax 2016-02-19 11:47:18 -05:00
Isaac Connor afb0cf2a7e Merge branch 'master' into storageareas 2016-02-19 11:09:18 -05:00
Isaac Connor 5a2a4baa89 Must load StorageId as well when loading event 2016-02-19 09:47:19 -05:00
Isaac Connor 68babd783b Merge branch 'master' into storageareas 2016-02-17 09:46:56 -05:00
Dmitry Smirnov 632e9c8e53 Upgrade bundled jQuery (Closes: #1263)
Signed-off-by: Dmitry Smirnov <onlyjob@member.fsf.org>
2016-02-18 00:28:30 +11:00
Isaac Connor 172a4c6bd4 Add montagereview.php to autotools build. 2016-02-16 09:29:49 -05:00
Isaac Connor 292e3a141f Merge branch 'storageareas' of github.com:ZoneMinder/ZoneMinder into storageareas 2016-02-12 13:53:34 -05:00
Isaac Connor 5da8df45a7 Merge branch 'hide_rtspdescribe' into storageareas 2016-02-12 13:53:09 -05:00
Isaac Connor 5f217b48e0 When Protocol is HTTP, hide the RTSPDescribe line. Make it appear when Protocol is changed to RTSP 2016-02-12 13:52:59 -05:00
Isaac Connor b7256a6891 Merge branch 'master' into storageareas
Conflicts:
	CMakeLists.txt
	configure.ac
	db/zm_create.sql.in
	version
2016-02-10 09:17:40 -05:00
Andrew Bauer 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
Isaac Connor e106a86f5e Add Concurrent 2016-02-05 11:59:05 -05:00
Isaac Connor 0674fa2d7a Merge branch 'storageareas' of github.com:ZoneMinder/ZoneMinder into storageareas 2016-02-04 12:21:33 -05:00
Isaac Connor 89cff287cd Merge branch 'master' into storageareas 2016-02-04 12:14:16 -05:00
Isaac Connor d3755611c5 Merge pull request #1247 from bodegard/master
Corrected DB update version comments, fixed typos, and skin font modification
2016-02-04 11:54:02 -05:00
Isaac Connor 555904c588 Add Storage column to console 2016-02-03 09:42:50 -05:00
Isaac Connor 48283191ec Merge branch 'master' into storageareas 2016-02-01 15:47:08 -05:00
Isaac Connor cc2c1405ed include Event.php 2016-02-01 14:59:06 -05:00
Isaac Connor 4e9e01836f Use Event->Path instead of ZM_DIR_EVENTS 2016-02-01 13:41:57 -05:00
SteveGilvarry 7301e803ed Merge remote-tracking branch 'upstream/master' into feature-h264-videostorage
Conflicts:
	src/zm_monitor.cpp
	src/zm_monitor.h
2016-01-30 15:45:08 +11:00
Andrew Bauer 2f80f26f92 Merge pull request #1232 from ZoneMinder/remove_google_fonts
remove Google open Sans external import
2016-01-23 10:24:49 -06:00
Brandon Odegard 54a11175ff Reduce default size of body font in Flat skin 2016-01-22 13:56:41 -06:00
Brandon Odegard 1ca9ace84d Fixed missing semicolons 2016-01-22 13:31:02 -06:00
Isaac Connor f16fb5c5f6 use eid and fid instead of specifying the path to the image 2016-01-14 13:34:12 -05:00