2271 Commits

Author	SHA1	Message	Date
Isaac Connor	3e06bbcef8	Merge branch 'master' into storageareas	2018-12-27 13:50:29 -05:00
Andrew Bauer	27dd8166ea	Merge pull request #2362 from connortechnology/small_groups_fixes ... Small groups fixes	2018-12-24 11:30:57 -06:00
Isaac Connor	e0a9c4a21e	fix event popup detection	2018-12-24 11:23:58 -05:00
Isaac Connor	2b8fa653ed	Merge branch 'small_groups_fixes' into storageareas	2018-12-24 09:48:36 -05:00
Isaac Connor	27826b4aca	Merge branch 'master' into storageareas	2018-12-24 09:48:29 -05:00
Isaac Connor	68adc289fe	Fix colspan count now that depth is zero-based	2018-12-24 09:40:23 -05:00
Isaac Connor	0cce0a642b	Update chosen library to 1.8.7	2018-12-24 09:37:49 -05:00
Isaac Connor	1130d6650a	Fix spacing and pass popup to previous/next event so that popups stay as popups	2018-12-21 10:50:19 -05:00
Isaac Connor	0bfe1007c8	Merge branch 'master' into storageareas	2018-12-14 10:16:08 -05:00
Andrew Bauer	21a98f3653	Merge branch 'remove_default_view' of https://github.com/connortechnology/ZoneMinder into connortechnology-remove_default_view	2018-12-11 09:44:13 -06:00
Isaac Connor	278abbc201	Merge branch 'master' into remove_default_view	2018-12-11 10:37:26 -05:00
Andrew Bauer	3cf6bf1786	Merge pull request #2243 from connortechnology/add_archive_filter_to_montagereview ... Rough in an archived status filter in montagereview.	2018-12-11 09:36:35 -06:00
Andrew Bauer	fe5cb4bfdc	Merge pull request #2283 from connortechnology/warn_colour_when_disabled ... Use a warning colour when motion detection is disabled.	2018-12-11 09:36:07 -06:00
Andrew Bauer	4d7e98475f	Merge pull request #2297 from connortechnology/introduce_getBodyTopHTML ... Introduce get body top html	2018-12-11 09:35:54 -06:00
Andrew Bauer	c530337c50	Merge pull request #2331 from connortechnology/fix_ios9 ... Fix ios9	2018-12-11 09:29:50 -06:00
Isaac Connor	c8c34d3f95	Merge branch 'master' into storageareas	2018-12-11 10:21:22 -05:00
Isaac Connor	1e8c4276bb	fix #2319 some more. This is fixing rate sticking across gapless events and reload	2018-12-10 17:32:17 -05:00
Isaac Connor	50017057de	Merge branch 'master' into storageareas	2018-12-05 09:05:27 -05:00
Isaac Connor	9ffd77428a	fix paths to jquery-ui-theme components, thereby upgrading them to the proper version. This fixes the datetime filters not being shown on skins that don't specify a custom theme for jquery-ui	2018-12-05 09:05:10 -05:00
Isaac Connor	a9290759a5	Merge branch 'fix_ios9' into storageareas	2018-12-03 16:25:34 -05:00
Isaac Connor	18ce7c9ea0	Old browsers, specifically Safari on IOS9 doesn't support let. Need to use var instead.	2018-12-03 15:17:16 -05:00
Isaac Connor	7d90a56561	Merge branch 'master' into storageareas	2018-11-30 14:46:42 -05:00
Isaac Connor	af2bb992e9	Merge branch 'server_path_prefix' into storageareas	2018-11-29 14:33:46 -05:00
Isaac Connor	17551eacee	Merge branch 'server_path_prefix'	2018-11-29 14:27:32 -05:00
Isaac Connor	1c17f334d3	fix missing bits. Implement UrlToIndex in Monitor and fix use of Url(). Implement PathToApi as well	2018-11-29 14:26:30 -05:00
Isaac Connor	d83fb2e985	Merge branch 'master' of github.com:ZoneMinder/ZoneMinder	2018-11-29 14:08:03 -05:00
Isaac Connor	5e0d742e26	Use history.go(-1) which works on safari	2018-11-29 14:04:35 -05:00
Andrew Bauer	5a88cbcddb	Merge pull request #2329 from connortechnology/fix_2319 ... Fix rate resetting	2018-11-29 09:57:13 -06:00
Andrew Bauer	be07e4413f	Merge pull request #2152 from connortechnology/server_path_prefix ... Server path prefix	2018-11-29 09:56:25 -06:00
Isaac Connor	df0b600431	Merge branch 'master' into storageareas	2018-11-29 10:49:06 -05:00
Isaac Connor	c0a9fae01f	Merge branch 'fix_2319' into storageareas	2018-11-29 09:57:41 -05:00
Isaac Connor	605397b565	Fix rate resetting by storing it in a cookie and using that on initial event load. Fixes #2319	2018-11-29 09:43:21 -05:00
Isaac Connor	1e915e9567	Merge branch 'master' into server_path_prefix	2018-11-28 10:45:36 -05:00
Isaac Connor	57acb2aac6	Merge branch 'server_path_prefix' into storageareas	2018-11-28 10:41:11 -05:00
Isaac Connor	a89dd83565	Update to use object instead of db row	2018-11-28 09:55:34 -05:00
Isaac Connor	cd13dda294	fix use of instead of	2018-11-28 09:54:22 -05:00
Elmar Pruesse	94d8e043ce	Fix unreadable input text when OS theme dark (#2324) ... * Update skin.css * Update skin.css	2018-11-27 18:25:05 -05:00
Isaac Connor	f8b2ff5c77	rework from Url() to PathToIndex(), PathToZMS(), UrlToIndex() and UrlToZMS()	2018-11-27 17:35:25 -05:00
Isaac Connor	b5430a1927	Merge branch 'fix_2317' into storageareas	2018-11-23 15:35:55 -05:00
Isaac Connor	6128d2a4d9	fix #2317 by updating the url encoding of a filter to match events for that monitor	2018-11-23 15:34:23 -05:00
Isaac Connor	19f3cce41f	Dont auto-guess pathPrefix	2018-11-23 13:54:14 -05:00
Isaac Connor	7ad19be0d7	Merge branch 'server_path_prefix' into storageareas	2018-11-23 13:29:01 -05:00
Isaac Connor	dea5db9dd9	Merge branch 'zmaudit_check_other_storageareas' into storageareas	2018-11-23 11:11:39 -05:00
Isaac Connor	c5f7fb7b18	Merge branch 'master' into server_path_prefix	2018-11-22 10:04:33 -05:00
Isaac Connor	d8d9544497	Merge branch 'master' of github.com:ZoneMinder/ZoneMinder	2018-11-17 10:39:52 -05:00
Isaac Connor	87140ecdb5	white space and quiet warning	2018-11-17 10:39:42 -05:00
Andrew Bauer	5c2e5d89ed	fix gpl mailing address ... This makes rpmlint & lintian complain less	2018-11-15 19:53:45 -06:00
Isaac Connor	f72651da5a	Add auth hash to ajax fps and status calls in zone edit	2018-11-15 12:22:35 -05:00
Isaac Connor	d89c0bc737	Merge branch 'master' into storageareas	2018-11-14 15:55:00 -05:00
Isaac Connor	aa8ac9c31c	spaces and quotes	2018-11-14 15:54:45 -05:00