595 Commits

Author	SHA1	Message	Date
Isaac Connor	5c0e4aa172	Merge branch 'multi-server' into storageareas	2016-01-01 17:11:01 -05:00
Isaac Connor	cf7e168872	Fix populating the server filter and then fix filtering by server. Also introduce robustness and consolel ogging when a filter doesn't exist	2016-01-01 17:10:37 -05:00
Isaac Connor	468f997e4c	Soft error, with logging when the filter element doesn't exist	2016-01-01 16:36:29 -05:00
Isaac Connor	93dbc3f0c1	Merge multi-server updates and bump version	2016-01-01 16:31:02 -05:00
Isaac Connor	31ba0221ed	Add Server to filters and log results	2015-12-31 10:13:03 -05:00
Isaac Connor	983b47f6dc	Add Server columns	2015-12-31 09:09:57 -05:00
Isaac Connor	492550b5ef	Merge branch 'storageareas' into newpointone ... Conflicts: scripts/zmaudit.pl.in	2015-12-24 12:36:40 -05:00
Isaac Connor	45987e92a9	Merge branch 'storageareas' of github.com:ZoneMinder/ZoneMinder into storageareas	2015-12-24 12:34:55 -05:00
Isaac Connor	479e5df454	Add default events dir to dropdown	2015-12-22 10:53:39 -05:00
Isaac Connor	1aa79c306b	Merge branch 'multi-server' of github.com:ZoneMinder/ZoneMinder into multi-server	2015-12-22 09:47:45 -05:00
Isaac Connor	9d8455daea	fix size of filter popups	2015-12-21 15:18:05 -05:00
Isaac Connor	a840246849	Add Server dropdown for ServerId	2015-12-21 14:29:53 -05:00
Isaac Connor	aa9a6ddcc3	populate dropdown with the available storage areas when StorageId is selected	2015-12-21 14:12:33 -05:00
Isaac Connor	dfd7986c01	Merge branch 'master' into multi-server ... Conflicts: distros/debian_cmake/links distros/ubuntu1504_cmake/zoneminder.postinst	2015-12-21 12:57:45 -05:00
Isaac Connor	ca07b951cb	Merge branch 'master' into newpointone ... Conflicts: docs/installationguide/ubuntu.rst	2015-12-21 12:41:25 -05:00
Isaac Connor	872e5eff15	Merge branch 'multi-server' into newpointone ... Conflicts: web/lang/en_gb.php web/skins/classic/views/filter.php	2015-12-21 11:35:16 -05:00
Isaac Connor	00c4eedb90	Add StorageId and StorageName to fields that we can filter on	2015-12-21 10:04:13 -05:00
Isaac Connor	b626712a2f	Add ServerId and ServerName to fields that we can filter on	2015-12-21 10:03:48 -05:00
Isaac Connor	27597c3401	Merge branch 'master' into storageareas ... Conflicts: docs/installationguide/ubuntu.rst	2015-12-20 11:19:44 -05:00
Andy Bauer	e5f243a9f8	Merge branch 'maxfps' of https://github.com/knnniggett/ZoneMinder into knnniggett-maxfps	2015-12-19 08:16:20 -06:00
Steve Gilvarry	e3d634e53e	Merge pull request #1182 from ZoneMinder/one_eighth ... add a 1/8th scale option, which is useful for 1920x1080 streams	2015-12-19 14:07:18 +11:00
Isaac Connor	a0f8e8be4b	increase width and height of monitors popup to fit new fields	2015-12-18 13:43:16 -05:00
Isaac Connor	ee42174002	Merge branch 'master' into storageareas	2015-12-18 13:42:15 -05:00
Isaac Connor	983d87f69b	increase height and width of groups window to fit buttons in	2015-12-18 13:34:44 -05:00
Isaac Connor	ca45ac23fa	increase height of group edit window	2015-12-18 13:30:42 -05:00
Isaac Connor	fb1766f21f	Add storage.php	2015-12-18 11:39:42 -05:00
Isaac Connor	09c75e2363	add a storage area editing page	2015-12-15 14:08:34 -05:00
Isaac Connor	20f9a01a66	Add a Storage tab, to provide a place to define your storage areas	2015-12-15 11:13:21 -05:00
Isaac Connor	14dc447145	add a Storage Area dropdown to set where this monitor will storage it's events	2015-12-15 11:13:00 -05:00
Isaac Connor	14cde582cf	Merge branch 'multi-server' into multiserverplusstorage ... Conflicts: src/zm_monitor.h	2015-12-14 16:55:26 -05:00
Isaac Connor	b2b1afa8ad	Merge master	2015-12-14 15:49:32 -05:00
Isaac Connor	f2065e2fcb	Merge branch 'one_eighth' into multi-server	2015-12-08 08:47:35 -05:00
Isaac Connor	d6b2e1959f	add a 1/8th scale option, which is useful for 1920x1080 streams	2015-12-08 08:40:44 -05:00
Isaac Connor	3c86965760	Merge branch 'master' into multi-server ... Conflicts: web/skins/classic/js/flat.js	2015-12-04 15:31:30 -05:00
Isaac Connor	f54b8c27ee	upgrade montage to use Monitor object and getStreamSrc which knows which server to connect to	2015-12-02 12:10:32 -05:00
Isaac Connor	34f6590107	upgrade montage to use Monitor object and getStreamSrc which knows which server to connect to	2015-12-02 12:10:26 -05:00
Isaac Connor	aa91e69a9b	add monitorUrl to be used to target the recording server for the monitor	2015-12-01 15:17:49 -05:00
Isaac Connor	342326e159	append monitorUrl to thsiURL to get access to the recording server for the monitor stream	2015-12-01 15:17:25 -05:00
Isaac Connor	95f002c7d6	convert monitor hash accesses to function calls	2015-12-01 15:16:53 -05:00
Isaac Connor	382ad0f390	put () after property names of Monitor object	2015-12-01 14:30:24 -05:00
Isaac Connor	c2a7e0c587	fix size of monitor popup in flat skin	2015-11-25 15:39:46 -05:00
Isaac Connor	fc85ccbf5f	Set value for Hostname to avoid php warning. fix save button. Can't use it to pass action value because it gets translated.	2015-11-11 16:43:23 -05:00
Isaac Connor	2237391876	white spacing, and fix loading of Server objects in monitor	2015-10-15 09:28:35 -04:00
Isaac Connor	582cbe7567	Merge branch 'master' into multi-server	2015-10-15 09:01:19 -04:00
Isaac Connor	1d173a9bf0	Merge pull request #1083 from pliablepixels/1082-monitor-orange ... fixed orange display for monitor mode	2015-10-06 08:36:35 -04:00
Isaac Connor	e12640ec73	Merge branch 'no_overwrite_zm_conf' into multi-server	2015-10-02 15:34:14 +00:00
Isaac Connor	cf5473836e	set default border on live streams so that when they alarm they don't jump around	2015-10-02 10:04:56 -04:00
Isaac Connor	ea87ffe66f	merge master, bump version to 1.28.108	2015-10-01 11:52:49 -04:00
Pliable Pixels	d9355064e7	fixed orange display for monitor mode	2015-10-01 11:35:38 -04:00
Isaac Connor	cb18adef5c	increase min height of zone edit popup so that buttons are visible	2015-09-28 13:01:07 -04:00