Commit Graph

53 Commits (support_mariadb)

Author SHA1 Message Date
IgorA100 697f8de4f6
Fix: Add "All Events" in array "translate" (View event) 2024-03-24 19:51:24 +03:00
IgorA100 1793e7813c
Added value "Edit" to "translate" array for translation 2024-03-03 18:20:40 +03:00
IgorA100 43cd675d96
Added value "Live" to "translate" array for translation 2024-02-29 15:12:33 +03:00
Isaac Connor b94b454bf9 Rename EventName to Name and Monitor Name to Monitor to take up less space 2024-02-07 11:08:15 -05:00
Isaac Connor 0ab7a755ba Event::Tags returns an array of Tags objects, so turn them into a string. 2023-10-20 14:02:48 -04:00
Simpler1 18d74ed7ac (feat): Tags
fix(tag): Create tags on mobile

chore(tags): Change TagName to Name

chore(tags): eslint

chore(tags): dbFetchAll to dbQuery for removetag

chore(events): eslint (attempt 2)

feat(tags): Better handling of keyboard

fix(tags): Enter key for creating new tag

fix(tags): Don't allow space as a tag name

feat(tags): Delete tag if last assignment removed

fix(tags): Increase height of dropdown

in progress

fix(Tags): Use T.Id on the events page dropdown

fix(Tags): Remove $availableTags from events.php

chore(sql): Formatting sql statements

feat(Tags): Working OR on filters and events pages

fix(filter): Populate availableTags

chore(Tags): code formatting

fix(tag): Add tag on create tag

Fix(tags): Remove tag from available if last

feat(tags): Add zm_update.sql

fix(chosen): Undo css width

fix(chosen): tags dropdown width

fix(tags): dropdown over timeline

fix(tags): Full width input

fix(events): Refresh table on page show

chore(filter): Clean up availableTags

chore(event): Clean up available & selected Tags

fix(event): Update available tags on remove

fix(event): Remove hack for selected tags

feat(tags): Blur input after adding tag

doc(tags): Initial tags documentation

fix(tags): Dark theme dropdown

fix(tags): Dark theme for tags on input

fix(tags): Dark theme for highlight in dropdown

fix(tags): Populate filter tags droplist

chore(): Bump zm_update to 1.37.42

chore(tags): Move mobile check to skin.js

chore(tags): Comment debug statements

fix(tags): Enter key to create tag on mobile Chome

chore(tags): Space in 'All Tags' for translation

Temporary commit to handle cookie expiration times

chore(tags): Remove unnecessary Tag(s) from en_gb

chore(): Cleanup unnecessary Error and Debug

chore(): Resolve merge conflicts

chore(): Address merge conflicts with master
2023-08-31 15:50:08 -04:00
Isaac Connor 4f80577d36 Add geolocation to event view 2023-07-10 13:45:12 -04:00
Isaac Connor 2343a42eea Add Resolution to event stats 2023-04-06 19:03:40 -04:00
Isaac Connor 19832d24cd Implement fullscreen button for event view 2022-11-26 10:52:28 -05:00
Isaac Connor 85278293c2 Make monitor rows in event stats a link if user can view monitors. Include path to event. 2022-09-04 13:54:18 -04:00
Isaac Connor 9a10568a5d SCALE BASE is already deifned 2022-08-18 09:54:27 -04:00
Isaac Connor e08b826843 Add support for lambda functions as post processing. Use the to replace StartDateTimeShort with StartDateTimeFormatted so that dates on viewed events use the specified formatting. 2022-06-21 11:42:18 -04:00
Isaac Connor e8a68e4a80 Use dateTimeFOrmatter to format the date/time on events. Also turned off error display screwing up the js. 2022-06-01 15:51:45 -04:00
Isaac Connor 0aeafd9efb Remove CMD constants as they are in skin.js.php now 2022-04-28 17:06:10 -04:00
Isaac Connor 10402fdabe Use template backticks for the Notes string to handle multi-line 2022-03-04 13:41:19 -05:00
Isaac Connor adf8413333 Include EndDateTimeShort in event stats 2022-02-17 13:31:25 -05:00
Isaac Connor 3c655807e8 Use new Event->Server function to return the correct (and matching url to zms) url to use for ajax status calls. Fixes errors in a multi-server environment. 2022-02-03 14:47:32 -05:00
Isaac Connor 089c6044f1 Add layers toggle button, cleanup code by using ->canView, rename Monitor to monitor, add svg zones layer 2021-12-05 17:48:49 -05:00
Isaac Connor 268da411d9 Use getStat instead of other jquery code to update the event data. Don't refresh before rename ajax finishes. Deprecate the n/a handling in getStat. Not sure why it's needed. Sync update eventData with what is returned by ajax status call. Fixes #3265 2021-06-08 16:58:51 -04:00
Isaac Connor dc9c7a7e15 handle event not existing a little better. 2021-01-25 18:49:03 -05:00
Andrew Bauer a5b945f97a touch up event view stat list 2020-12-14 06:55:45 -06:00
Andrew Bauer 4ae47659df use js to build event stats 2020-12-13 21:19:38 -06:00
Andrew Bauer 69e540c104 deploy canView and canEdit js objects 2020-12-08 14:25:48 -06:00
Andrew Bauer 23fcd1f2c5 modernize the event playback view 2020-12-01 09:07:42 -06:00
Isaac Connor 9d22de98a3 Rename StartTime, EndTime in Events to StartDateTime and EndDateTime 2020-11-04 13:53:45 -05:00
Isaac Connor 12b75e93b8 Merge branch 'release-1.34' 2020-10-15 17:19:56 -04:00
Isaac Connor 78cbacae2e When changing rates, if not using video.js, send CMD_VARPLAY to tell zms what to do 2020-10-15 17:18:38 -04:00
Isaac Connor e3fe75f21b fix case on filterQuery 2020-08-17 17:42:03 -04:00
Isaac Connor 90671cd4e5 Add missing globals 2020-08-04 18:07:01 -04:00
Isaac Connor 12252f1f37 defend against XSS in Monitor Name 2020-04-23 15:54:12 -04:00
Isaac Connor aad0b9362c defend against XSS in Monitor Name 2020-04-10 11:05:48 -04:00
Isaac Connor d7d2c140a0 Use index to server hosting storage where event is saved to talk to zms 2019-08-27 15:19:18 -04:00
Isaac Connor 7598654740 add auth hash to ajax streams, and use monitorUrl instead of thisUrl to talk to zms 2019-08-23 17:58:40 -04: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 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 3be31020b7 Automatically add width to frames view when thumbnails are turned on. 2018-11-14 15:54:01 -05:00
digital-gnome b5db885a31 Add scaleToFit to frame view
Changes navigation to use flexbox because absolute positioning was messing with scaletofit.  Also makes frame view respect scale choice
2017-11-26 19:08:06 -05:00
digital-gnome 91c3e3573c ZMS controls for videojs
Add ZMS style controls to videojs page.  Zoom, fast forward, fast reverse, frame skip, play/pause.  Some cleanup of old videojs code
2017-11-11 14:49:43 -05:00
digital-gnome 1eb2edd95c Converge initial eventData with ajax
The initial eventData object on page load didn't have most of the information that the ajax call gave it.
2017-10-21 22:14:46 -04:00
digital-gnome c39cf77a9c removealarmcuesPHP
removed the PHP rendering and placement code
2017-10-08 21:42:12 -04:00
Isaac Connor d4cf84f7e6 Merge pull request #24 from digital-gnome/storageareas-featureAlarmCues
Storageareas feature alarm cues
2017-10-07 12:50:37 -04:00
digital-gnome 5bbe9b40e7 renderAlarmCues function
Generates the html for alarmcues and passes it to JS var
2017-10-03 19:26:48 -04:00
digital-gnome 22af70601e Convert to ampersand in filters
Querys weren't working because it was passing & instead of &.  Nothing else appeared to be using these.
2017-09-29 21:49:58 -04:00
Isaac Connor 4bb9709cb2 use object methods of Event 2016-10-12 15:39:53 -04:00
Isaac Connor 994f1d566e fix [ 2016-09-28 09:09:01 -04:00
Isaac Connor 167214cb01 Merge branch 'cookie_scale' into storageareas 2016-09-27 10:05:16 -04:00
Isaac Connor 6c3a3d3d50 store the scale value for watch and event views in a cookie, differentiated by monitorId. 2016-09-27 09:46:04 -04:00
Isaac Connor 380b86614f put quotes around integer values that will be empty strings if the event is not found 2016-06-03 10:46:21 -04:00
Andrew Bauer 3a94712db2 add translate function 2015-05-10 08:10:30 -05:00
SteveGilvarry e87e69fa57 Ran script to replace all Short open tags 2014-12-05 10:44:23 +11:00