Commit Graph

10761 Commits

Author SHA1 Message Date
Isaac Connor 3c635d2f6a Merge branch 'storageareas' of github.com:connortechnology/ZoneMinder into tesla 2018-01-26 13:07:59 -08:00
Isaac Connor 7fc29fe681 List starttime of orphaned event 2018-01-26 16:07:26 -05:00
Isaac Connor e824f0abfe use a big Y to indicate that hitting enter will result in Y. Also list q as an option to quit 2018-01-26 16:05:43 -05:00
Isaac Connor 30404203ea Merge branch 'storageareas' of github.com:connortechnology/ZoneMinder into tesla 2018-01-26 12:54:56 -08:00
Isaac Connor a12030fda7 Handle no storageareas found 2018-01-26 12:54:54 -08:00
Isaac Connor 2f39e44f91 Finish implementing single monitor mod 2018-01-26 15:53:47 -05:00
Isaac Connor 456f29fcba Rename column Id OF Monitor_Statuses to simplify JOINS. 2018-01-26 13:39:37 -05:00
Isaac Connor dc46f23af0 Merge branch 'storageareas' of github.com:connortechnology/ZoneMinder into tesla 2018-01-26 10:17:54 -08:00
Isaac Connor 2d9f9125aa add update_storage_stats procedure 2018-01-26 13:08:10 -05:00
Isaac Connor bb9d640c01 use instead of ['request'] to fix behaviour when request has been emptied due to failed auth 2018-01-26 12:56:38 -05:00
Isaac Connor 772d3472fb Merge branch 'storageareas' of github.com:ConnorTechnology/ZoneMinder into storageareas 2018-01-26 12:21:20 -05:00
Isaac Connor 5a3d0b944e Detect invalid delta_time and don't exit on failed mysql 2018-01-26 12:21:12 -05:00
Isaac Connor 348fdafa4e Update submofule 2018-01-26 11:34:45 -05:00
Isaac Connor 524193cdaf workarounds to get the fixed CakePHP-Enum_Behaviour 2018-01-26 11:21:28 -05:00
Isaac Connor 475c465b0d define 2018-01-26 10:39:12 -05:00
Isaac Connor 209093a4c6 Improve debug output 2018-01-26 10:32:37 -05:00
Isaac Connor d001ce467e use get for status JSON requests 2018-01-26 10:31:55 -05:00
Isaac Connor a0892b1ffc Whitespace 2018-01-26 10:30:59 -05:00
Isaac Connor 1503c586d2 When there is an error saving, add the invalidFields() info to the error message. Only restart the daemon on success. 2018-01-26 10:30:29 -05:00
Isaac Connor 6d0b5fb86f We need to use my fork of CakePHP-Enum-Behaviour as it has fixes. 2018-01-26 10:27:57 -05:00
Isaac Connor 1e3cf9bbf8 handle no streams better 2018-01-25 09:14:21 -08:00
Isaac Connor 320f5c2083 Turn off error reporting in output 2018-01-25 09:13:44 -08:00
Isaac Connor 2ea2f46ec8 braes 2018-01-25 09:13:31 -08:00
Isaac Connor 703cd332df Merge branch 'storageareas' of github.com:connortechnology/ZoneMinder into tesla 2018-01-25 08:43:53 -08:00
Isaac Connor 356015a492 Merge branch 'tesla' of https://stash.teslamotors.com/scm/~iconnor/zoneminder into tesla 2018-01-25 08:42:08 -08:00
Isaac Connor 42a27c2ca9 Fix Servers dropdown 2018-01-25 08:41:54 -08:00
Isaac Connor 7165f3cfd8 Add server auto-selection 2018-01-25 08:41:42 -08:00
Isaac Connor 57bae7cf17 Fix filtering 2018-01-25 09:14:09 -05:00
Isaac Connor c35c9c4083 Merge branch 'storageareas' of github.com:ConnorTechnology/ZoneMinder into storageareas 2018-01-25 08:46:38 -05:00
Isaac Connor 0bd1ee5992 Merge branch 'master' into m 2018-01-25 08:43:31 -05:00
Isaac Connor fb50f6f996 Merge branch 'storageareas' of github.com:connortechnology/ZoneMinder into tesla 2018-01-24 17:14:42 -08:00
Isaac cc34a3c566 change button type 2018-01-24 23:08:12 +01:00
Isaac e4c28150fe cleanup, code style, quotes. Include jquery source instead of trying to link to it 2018-01-24 23:07:57 +01:00
Isaac 5865bbfb12 turn off debugging 2018-01-24 23:07:21 +01:00
Isaac a331bfc494 Merge branch 'storageareas' of github.com:ConnorTechnology/ZoneMinder into storageareas 2018-01-24 22:50:15 +01:00
Isaac e364a541d4 Whitespace and use ZM_DIR_EXPORT instead of ZM_DIR_TMP 2018-01-24 22:21:43 +01:00
Isaac Connor 8e906342b1 Merge branch 'storageareas' of github.com:/connortechnology/ZoneMinder into storageareas 2018-01-24 16:12:49 -05:00
Isaac Connor c930a7cce6 fix crash 2018-01-24 15:29:49 -05:00
Isaac Connor e4c900a868 Use a LEFT JOIN on Storage WHEN Running Filters 2018-01-24 12:34:06 -05:00
Isaac Connor 1800c6fcf0 Add locking around Event deletion 2018-01-24 12:16:34 -05:00
Isaac Connor b821d665bf Fix commas 2018-01-24 12:16:18 -05:00
Isaac Connor 50fc4a2d94 Use a memory table called Monitor_Status to store FPS and Status info for Monitors. This is to reduce locking and updates on the main Monitors table. 2018-01-24 11:51:11 -05:00
Isaac Connor cf4ac74d02 If failed to delete from Frames or Stats, return instead of deleting the event. 2018-01-24 10:45:42 -05:00
Isaac Connor a271f1776d Fix #80 don't escape NULL value when building SQL 2018-01-24 10:35:22 -05:00
Isaac Connor c7ecd580c1 Fix #81 by testing for non-numeric characters in LIMIT. Change type of input to number, making it harder to enter non-numeric characters 2018-01-24 10:27:01 -05:00
Isaac Connor 780cff41cf fix regression 2018-01-24 10:08:45 -05:00
Isaac Connor 9f89ccfa32 revert issue with AUTH_HASH_LOGINS 2018-01-24 07:46:56 -05:00
Isaac Connor ea4937b75e put back missing s 2018-01-23 17:47:24 -05:00
Isaac Connor d9252e2d47 Merge branch 'storageareas' into tesla 2018-01-23 13:29:37 -08:00
Isaac Connor fdf1ef795f Add default value for newStorage['StorageId'] 2018-01-23 13:28:46 -08:00