469 Commits

Author	SHA1	Message	Date
Isaac Connor	f754b82f3b	When we do not have permission to edit monitors, return empty string instead of nothing so that we don't generate an error	2021-04-28 12:03:44 -04:00
Isaac Connor	29e91f48e6	Use Snapshots permission instead of Events for snapshots	2021-04-12 15:59:31 -04:00
Isaac Connor	7743445323	Handle when there isn't a server Id	2021-03-22 21:30:56 -04:00
Isaac Connor	f306febb5f	use find_one when loading Server which can use caching	2021-03-22 17:49:59 -04:00
Isaac Connor	587cebecbb	navbar requests don't pass an auth token so we never send an auth update. Just always send it.	2021-03-13 12:10:35 -05:00
Isaac Connor	62cfdd8d61	fix searching in snapshots	2021-03-12 10:52:23 -05:00
Isaac Connor	9504d8be61	event_ids => snapshot_ids	2021-03-12 10:40:23 -05:00
Isaac Connor	70073ea017	Add thumbnails to snapshots list	2021-03-12 10:07:17 -05:00
Isaac Connor	11c2318a05	Rough in the ui for Snapshots	2021-03-12 09:28:05 -05:00
Isaac Connor	4dcce4ac95	Merge branch 'rtsp_server'	2021-01-26 14:22:10 -05:00
Andrew Bauer	c13d2ea99f	make watch view event list more efficient	2021-01-19 10:10:51 -06:00
Isaac Connor	cb90c06cde	Merge branch 'master' into zma_to_thread	2021-01-17 17:38:34 -05:00
Isaac Connor	50af7f25b8	Use less memory in event querying. More work to do here	2021-01-16 13:17:46 -05:00
Andrew Bauer	b1b71e5f09	fix return too soon when no log results	2021-01-11 13:46:50 -05:00
Andrew Bauer	b6d5802301	revert back to a standard modal (no static backdrop) for objdetect	2021-01-11 13:46:50 -05:00
rabsym	56bb4a74fc	Avoid top-scroll when returning from bs_modal objdetect	2021-01-11 13:46:50 -05:00
Andrew Bauer	c166b0de0f	fix return too soon when no log results	2021-01-02 16:33:56 -06:00
Andrew Bauer	56e88aea89	revert back to a standard modal (no static backdrop) for objdetect	2021-01-02 12:34:33 -06:00
rabsym	b7970d69a5	Avoid top-scroll when returning from bs_modal objdetect	2021-01-01 14:15:35 +01:00
Isaac Connor	a1917d83d0	Merge branch 'master' into zma_to_thread	2020-12-22 19:52:09 -05:00
Andrew Bauer	2ea4b39d93	don't use quotes around the event id	2020-12-22 11:46:31 -06:00
Andrew Bauer	ee45916526	move objdetect image to a modal	2020-12-22 10:08:31 -06:00
Isaac Connor	e123322d06	Merge branch 'master' into rtsp_server	2020-12-15 11:00:13 -05:00
Isaac Connor	99e7ae3505	Merge branch 'master' into rtsp_server	2020-12-15 10:14:19 -05:00
Andrew Bauer	c24564e0cd	insert frame stats into frame view	2020-12-13 13:20:26 -06:00
Andrew Bauer	2f0df74c54	show the analyse image in frames view if it exists	2020-12-12 11:37:50 -06:00
Isaac Connor	4667e21636	Add DecodingEnabled to Function modal	2020-12-10 14:06:40 -05:00
Isaac Connor	37d4b3472f	Add useful help for function modal describing each mode and the purpose of the Enabled checkbox	2020-12-10 13:43:28 -05:00
Isaac Connor	28a3868069	report both capture_fps and analysis_fps	2020-12-09 15:03:33 -05:00
Isaac Connor	84c7a117f5	Use width and height attrs instead of css for rendering speed. Also alt doesn't need validHtmlStr because Event.Id will have no weird characters	2020-12-08 11:26:43 -05:00
Isaac Connor	c156731f0b	Allow users with canView Events to view event list. Don't allow unarchive or delete if they don't have canEdit	2020-12-08 10:33:25 -05:00
Isaac Connor	b261fbb397	Merge branch 'master' into zma_to_thread	2020-12-07 16:26:26 -05: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
Andrew Bauer	23fcd1f2c5	modernize the event playback view	2020-12-01 09:07:42 -06: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	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
Andrew Bauer	c0225a35aa	use different variable assignment for clarity	2020-11-13 07:24:17 -06:00
Andrew Bauer	a15c8ea7d8	Merge pull request #3072 from ZoneMinder/iconnor_ajax_event_changes ... Rework code to use Filter methods to generate advanced search	2020-11-13 07:10:08 -06:00
Isaac Connor	df783f4835	Merge branch 'master' into zma_to_thread	2020-11-12 12:53:55 -05:00
Isaac Connor	52c7cc5869	reorganize code. Remove Server caching as it is done in Object.php.	2020-11-11 11:49:44 -05:00
Isaac Connor	7b8ee6af9f	Rework code to use Filter methods to generate advanced search functionality. Reduces sql queries to 1 or 2, using count() to populate [total] and [totalNotFiltered]. Does pagination using array_splice instead of SQL queries. Will use more ram, but reduces db load.	2020-11-05 12:20:49 -05:00
Isaac Connor	ee89eb45e6	Fix EndTime to EndDateTime	2020-11-04 18:39:02 -05:00