4752 Commits

Author	SHA1	Message	Date
Mike Rosack	567b60ffa7	support for forwarded proto/port in Server.php (#2343)	2018-12-13 10:24:32 -05:00
Andrew Bauer	8d74354fcb	Merge pull request #2242 from connortechnology/cleanup_auth ... Cleanup auth	2018-12-12 20:53:24 -06:00
Isaac Connor	eba8b3327d	Merge branch 'master' into cleanup_auth	2018-12-11 16:04:42 -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	22460f580b	Merge pull request #2305 from pliablepixels/save-first-alarm ... Save first alarm	2018-12-11 09:35:40 -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	b3bed9a28a	fix whitespace	2018-12-11 10:20:02 -05:00
Isaac Connor	e1ecd47bff	Fix missing use of UrlToApi	2018-12-11 09:40:40 -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	a1141d2dc4	remove second use of HTTP_HOST and use a better method of stripping off port from HTTP_HOST	2018-12-07 08:39:23 -05:00
Isaac Connor	757e538550	strip port from HTTP_HOST	2018-12-06 17:12:03 -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	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	27d4ba9e5f	use output of babeljs.io to provide code that works on older browsers. The nice class notation is ES6 upwards.. Safari on IOS9 doesn't like it	2018-12-03 15:16:47 -05:00
Andrew Bauer	e327ad100e	fix WebSite camera startup issue	2018-12-01 17:03:50 -06:00
Andrew Bauer	cae6ffd5a3	use HTTP_HOST instead of SERVER_NAME	2018-12-01 13:27:08 -06:00
Isaac Connor	9bb4f1804e	Merge branch 'server_path_prefix'	2018-11-30 14:46:20 -05:00
Isaac Connor	8c626c984b	Need to pass port through all Url functions	2018-11-30 14:45:58 -05:00
Isaac Connor	945770c819	Merge branch 'server_path_prefix'	2018-11-29 15:53:35 -05:00
Isaac Connor	3bd5774ea1	Default to PathToIndex should have the index.php in it	2018-11-29 15:53:19 -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	a74a9ae292	Merge pull request #2328 from pliablepixels/login-auth-relay ... returns user=&pass= in credentials for auth_relay plain and none #2327	2018-11-29 09:59:09 -06: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	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
Pliable Pixels	e6b8a7bc66	resolves #2327	2018-11-29 09:21:10 -05:00
Isaac Connor	1e915e9567	Merge branch 'master' into server_path_prefix	2018-11-28 10:45:36 -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
Isaac Connor	2b48b09ef5	Add entries for PathToIndex and PathToZMS	2018-11-28 09:53:35 -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	10ce55c396	Merge branch 'master' of github.com:ZoneMinder/ZoneMinder	2018-11-26 16:20:22 -05:00
Isaac Connor	17c1933913	remove an extra l	2018-11-26 16:20:15 -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	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	415d43fafb	Include Server Name when testing for CORS. Also be case insensitive.	2018-11-15 12:23:52 -05: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	aa8ac9c31c	spaces and quotes	2018-11-14 15:54:45 -05:00
Isaac Connor	3a409b26aa	Use buttons instead of anchor tags for Prev/Next/FIrst/Last buttons	2018-11-14 15:54:34 -05:00