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
|
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
|
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
|
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
|
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
|
fdf1ef795f
|
Add default value for newStorage['StorageId']
|
2018-01-23 13:28:46 -08:00 |
|
Isaac Connor
|
0742217599
|
Only populate monitorNames if query is valid
|
2018-01-23 13:28:29 -08:00 |
|
Isaac Connor
|
933259f9a5
|
fix bracket
|
2018-01-23 13:16:21 -08:00 |
|
Isaac
|
fd2d2a0d77
|
ad update to update events_update_trigger to dix totaldiskspace
|
2018-01-23 18:43:59 +01:00 |
|
Isaac
|
de08e3114e
|
more and less debug
|
2018-01-23 18:16:37 +01:00 |
|
Isaac
|
8544589843
|
bump version to 1.31.27 for new event_update trigger
|
2018-01-23 18:16:24 +01:00 |
|
Isaac
|
8bd1e4cec6
|
Only show groups filter if there are groups
|
2018-01-23 18:15:59 +01:00 |
|
Isaac
|
66fd02a29e
|
Use dumpPacket
|
2018-01-23 18:15:29 +01:00 |
|
Isaac
|
abb2cfbe12
|
fix zm_av_packet_ref for old ffmpeg. Need to set the size and flags as well as copying the mem.
|
2018-01-23 18:14:55 +01:00 |
|
Isaac
|
83371d0f21
|
Fix Error => Debug
|
2018-01-23 17:42:57 +01:00 |
|
Isaac
|
1b23f7b564
|
turn off debug
|
2018-01-23 17:34:49 +01:00 |
|
Isaac
|
b22f20cb93
|
Merge branch 'storageareas' of github.com:ConnorTechnology/ZoneMinder into storageareas
|
2018-01-23 15:40:07 +01:00 |
|
Isaac Connor
|
6bc83ca6a2
|
Set Default Scheme
|
2018-01-23 09:07:40 -05:00 |
|
Isaac Connor
|
8fe0e1bdc0
|
fix Debug => Logger::Debug
|
2018-01-22 15:58:01 -05:00 |
Simpler1
|
ce19c65cc9
|
Ipcc (#2040)
* fix(ipcc): Invert up/down to work properly
* fix(ipcc): Change the initial values for ipcc camera
|
2018-01-22 15:33:11 -05:00 |
|
Isaac Connor
|
e60a86a061
|
improve debug output
|
2018-01-22 15:26:18 -05:00 |
|
Isaac Connor
|
37ff7c3779
|
Add finding by Id to Event
|
2018-01-22 15:26:01 -05:00 |
|
Isaac Connor
|
2068a5c684
|
Add object caching
|
2018-01-22 15:25:51 -05:00 |
|
Isaac
|
13bfbe4f4b
|
Merge branch 'storageareas' of github.com:ConnorTechnology/ZoneMinder into storageareas
|
2018-01-22 20:07:11 +01:00 |
|
Isaac Connor
|
d63594b5fa
|
don't do updates in a transaction so we don't hold locks
|
2018-01-22 14:06:52 -05:00 |
|
Isaac Connor
|
e59ade5391
|
Only alter MonitorIds if it exists.
|
2018-01-22 14:06:03 -05:00 |
|
Isaac Connor
|
843eee1e13
|
handle case where zmstats and zmstats.pl both exist
|
2018-01-22 14:05:38 -05:00 |
|
Isaac Connor
|
8a27ea3a04
|
Always populate the monitorNames object, and check for duplicate names when saving an existing Monitor as well as new monitors
|
2018-01-22 11:42:52 -05:00 |
|
Isaac Connor
|
97595051ce
|
whitespace
|
2018-01-22 11:42:19 -05:00 |
|
Isaac Connor
|
924fa80ea6
|
When renaming a monitor, take change of storage area into account when creating dirs and symlinks
|
2018-01-22 11:42:07 -05:00 |
|
Isaac Connor
|
94fc8013c6
|
use a smarter glob to pick up events that were Deep, when the storage area is now Medium.
|
2018-01-22 11:10:31 -05:00 |
|
Isaac Connor
|
b317748796
|
Add Server loading
|
2018-01-22 11:09:49 -05:00 |
|
Isaac Connor
|
493a2386c4
|
Only load Time from StartTime if it has a value. Parse Path to get LInkPath if no Time.
|
2018-01-22 11:09:35 -05:00 |
|
Isaac
|
c04fcfb239
|
Need a few more pixels of width to fit all preset buttons
|
2018-01-22 15:50:18 +01:00 |
|
Isaac
|
bfa0a00e67
|
dfebug improvements
|
2018-01-22 03:27:44 +01:00 |