ZaneYork
/
zoneminder
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
10,670 Commits 20 Branches 69 Tags 131 MiB
Commit Graph

4085 Commits

Author SHA1 Message Date
Isaac Connor 9a15328894 Merge branch 'storageareas' into zma_to_thread 
Conflicts:
	src/zm_event.cpp
 2018-01-26 13:02:16 -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 348fdafa4e Update submofule 2018-01-26 11:34:45 -05:00
Isaac Connor 475c465b0d define 2018-01-26 10:39:12 -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 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 71263c525b :Merge branch 'storageareas' into zma_to_thread 
Conflicts:
	src/zm_ffmpeg_camera.cpp
	src/zm_monitor.cpp
 2018-01-24 11:55:32 -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 215660a817 Merge branch 'storageareas' into zma_to_thread 
Conflicts:
	src/zm_ffmpeg_camera.cpp
	src/zm_packetqueue.cpp
	src/zm_videostore.cpp
	src/zm_videostore.h
	web/includes/Event.php
	web/skins/classic/views/events.php
 2018-01-24 11:06:19 -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 de08e3114e more and less debug 2018-01-23 18:16:37 +01:00
Isaac 8bd1e4cec6 Only show groups filter if there are groups 2018-01-23 18:15:59 +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 8fe0e1bdc0 fix Debug => Logger::Debug 2018-01-22 15:58:01 -05:00
Isaac 13bfbe4f4b Merge branch 'storageareas' of github.com:ConnorTechnology/ZoneMinder into storageareas 2018-01-22 20:07:11 +01: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 c04fcfb239 Need a few more pixels of width to fit all preset buttons 2018-01-22 15:50:18 +01:00
Isaac 06c9266c62 use snapshot.jpg more 2018-01-22 03:27:01 +01:00
Isaac Connor f0d4cab24a Merge branch 'storageareas' into zma_to_thread 
Conflicts:
	web/ajax/add_monitors.php
 2018-01-21 11:13:06 -05:00
Isaac Connor 181a94de82 test for existence of port in url_parts 2018-01-21 11:10:34 -05:00
Isaac Connor bd2da456f4 handle non-multi-server case when restarting monitors via API 2018-01-19 21:09:33 -05:00
Isaac Connor e26747b5cc show port when it's not the standard port 2018-01-19 12:15:26 -05:00
Isaac Connor 773ed11742 use Object methods to restart zmc and zma. restart them on save of existing Monitor 2018-01-19 08:17:53 -08:00
Isaac Connor d1dbf4cc31 Turn off debug 2018-01-19 08:17:33 -08:00
Isaac Connor 3abd873c34 Turn off debug 2018-01-19 08:17:17 -08:00
Isaac Connor 0f3cf33565 Move unparse_url from add_monitors to functions to make it generally available 2018-01-19 08:16:52 -08:00
Isaac Connor 2720b254ff Add Triggers to Monitors field to quiet error 2018-01-19 08:16:41 -08:00
Isaac Connor d586faf7fb Fix restarting Monitor 2018-01-19 08:16:28 -08:00
Isaac Connor e37d27e972 Merge branch 'storageareas' into zma_to_thread 
Conflicts:
	src/zm_monitor.cpp
 2018-01-18 13:44:26 -05:00
Isaac Connor 55fa86c7be Add a few more extensions to the list of files to include in export 2018-01-17 16:57:38 -05:00
Isaac Connor ace66cf977 show port in source column 2018-01-17 13:33:22 -08:00
Isaac Connor 212bfd4a2c add Monitor to info shown on event 2018-01-17 12:20:15 -08:00