Commit Graph

16716 Commits

Author SHA1 Message Date
Isaac Connor cda3824a25 Use INSERT.. ON DUPLICATE... instead of REPLACE INTO. REPLACE INTO deletes the existing row. Since we now have event counts in there, we lose them. 2020-11-10 12:33:10 -05:00
Isaac Connor b3e3fea79f Update summary event count tables 2020-11-09 12:26:14 -05:00
Isaac Connor 4b4863c44a Fix remaining references to MonitorStatus.Id 2020-11-06 16:07:40 -05:00
Isaac Connor 2e7aa17882 Fix triggers that update Storage 2020-11-06 14:32:21 -05:00
Isaac Connor 691ff5881d Fix some commas 2020-11-06 14:28:11 -05:00
Isaac Connor f2630b8fbc Merge branch 'master' into move_event_totals_to_monitor_status 2020-11-06 14:17:23 -05:00
Isaac Connor a3a6d94b6f bump version to 1.15.14 2020-11-06 14:16:34 -05:00
Isaac Connor 9cc9461b7e Merge branch 'master' of github.com:ZoneMinder/zoneminder 2020-11-06 14:15:23 -05:00
Isaac Connor 98e296a2c8 Move event stat totals to Monitor_Status. 2020-11-06 14:15:05 -05:00
Isaac Connor 59403dc11b Move event stat totals to Monitor_Status. 2020-11-06 14:00:18 -05:00
Isaac Connor 159b383276 Move event stat totals to Monitor_Status. Implement a class for them called Monitor_Status 2020-11-06 13:27:47 -05:00
Isaac Connor 63c78b43f8 Change event stats to Monitor_Status 2020-11-06 13:27:00 -05:00
Isaac Connor 6ed006bc60 rename StartTime and EndTime to StartDateTime and EndDateTime in the named query params 2020-11-06 12:25:04 -05:00
Isaac Connor 402b559b2c Add StartTime and EndTime virtual fields for backwards compatability 2020-11-06 11:15:12 -05:00
Isaac Connor 27f336975c Merge branch 'master' of github.com:ZoneMinder/zoneminder 2020-11-05 18:12:43 -05:00
Isaac Connor 68cdd2123d Merge branch 'release-1.34' 2020-11-05 13:55:15 -05:00
Isaac Connor 746882ba85 Get rid of zmEventScaleAuto cookie. Just use the per monitor zmEventScale cookie. Fixes #3070 2020-11-05 13:45:02 -05:00
Esteban Flores c4eb59442e Changed "Purge By Age" filter
Changed "Purge By Age" filter, the "date" option is not available in v1.34.22. Using "End Date" as the filter parameter works just fine.
2020-11-05 12:27:46 -05:00
Isaac Connor 50b991b88d
Merge pull request #3067 from msLinuxNinja/master
Changed "Purge By Age" filter
2020-11-05 12:26:56 -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
Isaac Connor e085e08caa Fix missed StartTime to StartDateTime 2020-11-04 18:27:51 -05:00
Isaac Connor 130588eb8f fix typos 2020-11-04 18:22:50 -05:00
Isaac Connor d37bce4e0e Fix missed StartTime to StartDateTime 2020-11-04 18:20:59 -05:00
Isaac Connor 018abe39c2 Use rename commands that work on mysql 5.7 2020-11-04 18:11:24 -05:00
Isaac Connor 289612a826 Merge branch 'master' of github.com:/ZoneMinder/zoneminder 2020-11-04 18:10:55 -05:00
Isaac Connor 3e5f87cb41 Bump version to 1.35.13 2020-11-04 14:42:01 -05:00
Isaac Connor c3d43838da Update StartTime to StartDateTime and EndTime to EndDateTime 2020-11-04 14:41:32 -05:00
Isaac Connor b17fa8f9c1 Rename StartTime, EndTime in Events to StartDateTime and EndDateTime 2020-11-04 13:58:03 -05:00
Isaac Connor ce99a9456b Rename StartTime, EndTime in Events to StartDateTime and EndDateTime 2020-11-04 13:56:44 -05:00
Isaac Connor 68ad1cf1f7 Rename StartTime, EndTime in Events to StartDateTime and EndDateTime 2020-11-04 13:56:37 -05:00
Isaac Connor 786e2fec92 Rename StartTime, EndTime in Events to StartDateTime and EndDateTime 2020-11-04 13:56:27 -05:00
Isaac Connor af9e279f9e Rename StartTime, EndTime in Events to StartDateTime and EndDateTime 2020-11-04 13:55:27 -05:00
Isaac Connor d75e93249c Rename StartTime, EndTime in Events to StartDateTime and EndDateTime 2020-11-04 13:54:12 -05:00
Isaac Connor 9d22de98a3 Rename StartTime, EndTime in Events to StartDateTime and EndDateTime 2020-11-04 13:53:45 -05:00
Isaac Connor 9e6a9cad80 Rename StartTime, EndTime in Events to StartDateTime and EndDateTime 2020-11-04 13:53:17 -05:00
Isaac Connor 8029f59eac Rename StartTime, EndTime in Events to StartDateTime and EndDateTime 2020-11-04 13:52:50 -05:00
Isaac Connor 2d33dd5386 Rename StartTime, EndTime in Events to StartDateTime and EndDateTime 2020-11-04 13:52:32 -05:00
Isaac Connor 0d404ac66f Rename StartTime, EndTime in Events to StartDateTime and EndDateTime 2020-11-04 13:50:45 -05:00
Isaac Connor 33f58add11 Rename StartTime, EndTime in Events to StartDateTime and EndDateTime 2020-11-04 13:49:47 -05:00
Isaac Connor adbd3486bf Rename StartTime, EndTime in Events to StartDateTime and EndDateTime 2020-11-04 13:49:39 -05:00
Isaac Connor 4731041a40 FS Storage DiskSpace isn't implemented. 2020-11-04 12:42:04 -05:00
Isaac Connor e67532ef76 implement is_valid_attr. Fix incorrect EventDiskspace vs FS DiskSpace. FS DiskSpace isn't implemented. DiskPercent is. 2020-11-04 12:40:43 -05:00
Isaac Connor 387b2b1fc2 add attr validation to addTerm. Add addTerms 2020-11-04 12:39:42 -05:00
Isaac Connor 09fe354a22 If event db insert fails, try again until it succeeds. 2020-11-04 11:59:08 -05:00
Isaac Connor af399bb174 Reqiure Id to have a value not just be set 2020-11-04 09:18:41 -05:00
Isaac Connor c72ceffe3d Improved testing for existence of foreign keys, better descriptive output of steps. 2020-11-03 12:30:27 -05:00
Isaac Connor 2c899bd3c5 Merge branch 'master' of github.com:ZoneMinder/zoneminder 2020-11-03 12:11:58 -05:00
Isaac Connor 6112db627c Even if we found the filter in the db, if it is present in the query string, update the object with the new values 2020-11-03 11:59:28 -05:00
Isaac Connor b2385ccecc colour match a:link to navbar colour. This has the effect of brightening up all links. 2020-11-03 11:53:15 -05:00