7268 Commits

Author	SHA1	Message	Date
Andrew Bauer	e93de2a3a4	partial jquery convesion of watch.js	2020-12-03 13:12:01 -06:00
Isaac Connor	05bd6e1c56	Fix editing groups causing a new Group to be added. You have to tell cakephp which Group you are saving. Also fix the resulting output to be the saved group, not a list of monitors. Fixes #3088	2020-12-03 13:14:19 -05:00
Isaac Connor	6877054fea	Parse tree dumping should be debug not warning	2020-12-03 11:17:41 -05:00
Isaac Connor	c8aac87f74	Merge branch 'master' of github.com:ZoneMinder/zoneminder	2020-12-03 10:26:27 -05:00
Isaac Connor	19122d0824	Fix bandwidth dropdown clicking	2020-12-03 10:25:59 -05:00
Andrew Bauer	ce4d9cd657	put back manual refresh button on watch view	2020-12-03 08:38:28 -06:00
Andrew Bauer	74fe47c4c5	don't autorefresh watch view table	2020-12-03 08:31:52 -06:00
Andrew Bauer	dd0cac35fe	include filterquery in watch view event list ajax	2020-12-03 07:53:09 -06:00
Andrew Bauer	a38c392266	eslint	2020-12-03 07:22:32 -06:00
Andrew Bauer	d5df996bca	deploy animated thumbnails on watch view	2020-12-02 19:44:12 -06:00
Isaac Connor	76eea525b7	Merge pull request #3085 from hax0kartik/Font ... Font	2020-12-02 16:16:21 -05:00
Isaac Connor	1c10cc492b	Fix StartTime to StartDateTime	2020-12-02 13:15:32 -05:00
Andrew Bauer	aac47ed361	fixes to export functions	2020-12-02 12:02:24 -06:00
Andrew Bauer	f13533cab7	convert export functions to jquery	2020-12-02 10:53:55 -06:00
Andrew Bauer	70689acf8d	remove data-mobile-responsive, use table-responsive-sm instead	2020-12-02 07:47:57 -06:00
Andrew Bauer	347c64eb7d	remove warning	2020-12-01 13:30:57 -06:00
Andrew Bauer	6da826d79c	fix typo	2020-12-01 13:29:43 -06:00
Isaac Connor	8397ec3b9d	Merge branch 'release-1.34'	2020-12-01 14:28:10 -05:00
Isaac Connor	48775e2230	Fix Clear Log by using minTime and maxTime as timestamps. Fix export including unselected filters. Can't just serialize the form asit may contain fields in teh querystring so you get an array of values instead of a single value	2020-12-01 14:24:41 -05:00
Isaac Connor	baeb1dbd5b	Take an optional debug param in dbQuery	2020-12-01 14:07:23 -05:00
Isaac Connor	ae7a706526	Handle minTime and maxTime being specified as either a timstamp or a datetime. Remove duplicated query building code. Reduce ram requirements when exporting logs.	2020-12-01 14:04:51 -05:00
Andrew Bauer	051e361958	eslint	2020-12-01 12:19:01 -06:00
Andrew Bauer	b0da7f5920	fix navbar bandwidth dropdown	2020-12-01 10:27:08 -06:00
Andrew Bauer	93f11bbc82	set responsive breakpoint for small screens on watch & events views	2020-12-01 09:50:32 -06:00
Andrew Bauer	f12c8f453e	after deleting an event, call streamNext rather than reload	2020-12-01 09:30:06 -06:00
Andrew Bauer	23fcd1f2c5	modernize the event playback view	2020-12-01 09:07:42 -06:00
Andrew Bauer	ac01e0638a	Update skin.css	2020-11-30 10:19:12 -06:00
Andrew Bauer	ee9f98d7e6	make modal content more readable on dark skin	2020-11-30 10:06:35 -06:00
Isaac Connor	836cd2d58d	Merge branch 'Font' of https://github.com/hax0kartik/zoneminder into font	2020-11-30 09:45:39 -05:00
Isaac Connor	67dac2651b	Log an error with path when can't open video	2020-11-29 17:06:07 -05:00
hax0kartik	528699f942	Use ctzll + new font format for improving drawing speed	2020-11-28 18:46:20 +05:30
Isaac Connor	d68b922632	Merge branch 'master' of github.com:ZoneMinder/zoneminder	2020-11-27 13:30:31 -05:00
Isaac Connor	8c56ac80c5	Make Name,Path,Url in storage modal 100%	2020-11-27 13:30:24 -05:00
Isaac Connor	80c4e2fa57	Fix table not being 100%. Use appropriate bootstrap style labels for radios	2020-11-27 13:29:57 -05:00
Andrew Bauer	a67fb0bb16	eslint	2020-11-26 19:28:25 -06:00
Andrew Bauer	8d8054bc0f	deploy bstable to watch view	2020-11-26 17:00:05 -06:00
Andrew Bauer	08dabf1a4f	don't add "zoom" class when thumb animation is off	2020-11-25 13:29:14 -06:00
Andrew Bauer	28614ce703	change where we check for web_animate_thumbs	2020-11-25 13:16:11 -06:00
Andrew Bauer	ff4b0e6309	add option to disable thumb animation	2020-11-25 13:03:16 -06:00
Isaac Connor	cf08010ebe	Fix redirect on zone editing	2020-11-18 13:04:56 -05:00
Isaac Connor	5bf5d58ac1	Fixes recovering frames from jpegs. Use Time::HiRes stat to get microseconds.	2020-11-16 11:32:50 -05:00
Andrew Bauer	a2b5271835	fix copy/paste typo	2020-11-14 17:34:59 -06:00
Andrew Bauer	0ffb5e153c	modify FilterTerm to support Frames view searches	2020-11-14 17:33:18 -06:00
Andrew Bauer	f3756def08	deploy server side pagination for frames view	2020-11-14 14:45:22 -06:00
Andrew Bauer	9aa6fea6a3	frames view server pagination WIP	2020-11-14 14:19:28 -06:00
Andrew Bauer	f88d721ae3	fix issue with events view and ALL pagination	2020-11-14 10:27:33 -06:00
Isaac Connor	f32d10a1ab	Merge branch 'master' of github.com:ZoneMinder/zoneminder	2020-11-13 17:16:13 -05:00
Isaac Connor	66f7cc55dc	Spacing code comments, quotes	2020-11-13 17:05:23 -05:00
Andrew Bauer	52e747791d	rough in frames server pagination backend	2020-11-13 12:34:01 -06:00
Isaac Connor	a581cb9de1	Make various text input options be 90%	2020-11-13 10:18:35 -05:00