Commit Graph

682 Commits

Author SHA1 Message Date
Isaac Connor c7deb91319 Merge branch 'zma_to_thread' of github.com:ConnorTechnology/ZoneMinder into zma_to_thread 2018-04-14 14:58:25 -04:00
Isaac Connor 41c52f25b7 Merge branch 'storageareas' into zma_to_thread 2018-04-14 11:57:18 -04:00
Isaac Connor dd945eed75 remove wip .42 2018-04-14 11:09:35 -04:00
Isaac Connor cd3046abb3 Merge branch 'storageareas' into zma_to_thread 2018-04-14 11:03:08 -04:00
Isaac Connor f9f78e9aa3 Convert event_id to a 64bit unsigned int 2018-04-12 13:40:11 -07:00
Isaac Connor 4ec595a98d EventId and FrameId to BIGINT 2018-04-10 13:09:24 -07:00
Isaac Connor f1a8d5f1ff start of work on .41. Adding foreign keysy 2018-04-05 13:41:24 -07:00
Isaac Connor 793f630ee0 Merge branch 'storageareas' of github.com:connortechnology/ZoneMinder into storageareas 2018-04-02 10:43:07 -07:00
Isaac Connor 1ff17c97b8 Add DoDelete to Storage and Locked to Events 2018-04-02 09:04:09 -07:00
Isaac Connor 2748f47fb7 add Url to Storage for S3 support 2018-03-28 08:23:03 -07:00
Isaac Connor e523067df7 Merge branch 'storageareas' into zma_to_thread 2018-03-15 11:28:14 -04:00
Isaac Connor 27736fb5d9 Merge ../ZoneMinder.master into storageareas 2018-03-15 11:04:41 -04:00
Isaac Connor 5ca7871510 Merge branch 'zma_to_thread' of github.com:connortechnology/ZoneMinder into zma_to_thread 2018-03-10 10:12:22 -05:00
Andy Bauer b41363fd60 Merge branch 'patch-3' of https://github.com/habibapp1365/zoneminder into habibapp1365-patch-3 2018-03-06 11:37:49 -06:00
habibapp1365 aa2134bde4
Update zm_create.sql.in 2018-03-06 19:59:06 +03:30
Isaac Connor 80127cbf81 Merge branch 'storageareas' into zma_to_thread 2018-03-06 10:57:49 -05:00
Isaac Connor 03d3f5e665 Merge branch 'storageareas' into zma_to_thread 2018-03-03 13:28:01 -08:00
Isaac Connor dc074bd2c0 fix path to triggers.sql 2018-02-28 07:18:38 -08:00
Isaac Connor a19e6b619c add Encoder to Monitors 2018-02-28 07:17:52 -08:00
Isaac Connor c443168389 split out codec and encoder, allowing one to specify which encoder to use 2018-02-28 07:17:16 -08:00
Isaac Connor 3aa31fd524 Merge branch 'master' into storageareas 2018-02-23 10:23:35 -05:00
Isaac Connor cece2f35f0 remove triggers from zm_create.sql.in as they are now contained in triggers.sql 2018-02-23 07:50:05 -05:00
Isaac Connor 0a6b463301 FIx MontageLayout=>MontageLayouts 2018-02-23 07:46:37 -05:00
Isaac Connor 834edafc63 install triggers as well 2018-02-23 07:46:24 -05:00
Isaac Connor 83785ac73f Merge branch 'storageareas' into zma_to_thread 2018-02-22 09:41:50 -05:00
Isaac Connor 52bca9d3ae Merge branch 'storageareas' of github.com:ConnorTechnology/ZoneMinder into storageareas 2018-02-20 22:48:45 -05:00
Isaac Connor 13ef478820 refix triggers updating EventCounts. remove unsigned from eventcounts and diskspace totals. 2018-02-20 22:48:34 -05:00
Isaac Connor 0ad01f09bd refix triggers updating EventCounts. remove unsigned from eventcounts and diskspace totals. 2018-02-20 22:48:23 -05:00
Isaac Connor 1981359d69 fixes, use summaries from Events_Day/etc instead of Events table 2018-02-19 19:45:21 -05:00
Isaac Connor 678634916f fix event insert trigger 2018-02-19 17:29:30 -05:00
Isaac Connor e4ec1712f4 remove the table creation/dropping and a if/elseif fix 2018-02-18 11:48:00 -05:00
Isaac Connor e18a14337f use path to triggers.sql 2018-02-18 11:47:03 -05:00
Isaac Connor fe0ccafae8 add missing ; 2018-02-18 11:29:22 -05:00
Isaac Connor d52277b283 update monitor counts 2018-02-18 11:28:58 -05:00
Isaac Connor 4b04b1ee7c remove unwanted space 2018-02-18 11:19:20 -05:00
Isaac Connor 94212eda2f fix triggers 2018-02-18 11:01:33 -05:00
Isaac Connor f3065bd8f6 Source doesn't really work 2018-02-18 10:59:36 -05:00
Isaac Connor 50eaa690d7 just source the complete list of triggers 2018-02-17 13:00:24 -05:00
Isaac Connor 670a979a0e source triggers.sql 2018-02-17 12:59:53 -05:00
Isaac Connor e991e2a05d fix some triggers 2018-02-17 12:57:21 -05:00
Isaac Connor 717d00ac99 missing // 2018-02-09 16:08:44 -05:00
Isaac Connor 0d5c8f385f fix DiskSpace summing when Nulls are present 2018-02-07 08:02:49 -05:00
Isaac Connor 4c5e47b050 fix DiskSpace summing when Nulls are present 2018-02-07 08:02:05 -05:00
Isaac Connor 8343793c48 Fix updating Storage area DiskSpace by using COALESCE 2018-02-06 11:34:40 -05:00
Isaac Connor 0f83dfc769 Correct events_day, etc update trigger 2018-02-06 08:43:09 -05:00
Isaac Connor 4bd92a3b94 fixes 2018-02-05 23:01:04 -05:00
Isaac Connor c767d79aef fix typo 2018-02-05 22:59:37 -05:00
flashoftheblades 34f6584081
Update zm_create.sql.in 2018-02-05 18:53:47 -05:00
Isaac Connor 86ae1b6598 Add missing commas 2018-02-05 17:31:34 -05:00
Isaac Connor 6822643d22 add update triggers for all the event tables so that diskspace counts work 2018-02-05 15:46:39 -05:00