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
|
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
|
fb50f6f996
|
Merge branch 'storageareas' of github.com:connortechnology/ZoneMinder into tesla
|
2018-01-24 17:14:42 -08:00 |
Isaac Connor
|
a271f1776d
|
Fix #80 don't escape NULL value when building SQL
|
2018-01-24 10:35:22 -05:00 |
Isaac Connor
|
9f89ccfa32
|
revert issue with AUTH_HASH_LOGINS
|
2018-01-24 07:46:56 -05:00 |
Isaac Connor
|
994766fd50
|
Merge branch 'storageareas' of github.com:connortechnology/ZoneMinder into tesla
|
2018-01-22 13:25:38 -08: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
|
06c9266c62
|
use snapshot.jpg more
|
2018-01-22 03:27:01 +01:00 |
Isaac Connor
|
9b7fee03c7
|
Add Server auto-selection
|
2018-01-19 11:00:46 -08: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
|
484a361af8
|
use Object methods to restart zmc and zma. restart them on save of existing Monitor
|
2018-01-18 12:40:10 -08:00 |
Isaac Connor
|
30b0d2c5b1
|
Turn off debug
|
2018-01-18 12:39:50 -08:00 |
Isaac Connor
|
c08cbdb9dd
|
Turn off debug
|
2018-01-18 12:39:39 -08:00 |
Isaac Connor
|
f9d8c349e1
|
Move unparse_url from add_monitors to functions to make it generally available
|
2018-01-18 12:39:08 -08:00 |
Isaac Connor
|
04eef58883
|
Add Triggers to Monitors field to quiet error
|
2018-01-18 12:38:48 -08:00 |
Isaac Connor
|
1fbb5bc0f8
|
Fix zmaudit.pl => zmaudit, etc.
|
2018-01-17 14:22:04 -05:00 |
Isaac Connor
|
fe7c54bc26
|
Fix Debug
|
2018-01-16 17:54:37 -05:00 |
Isaac Connor
|
a8dde207e1
|
Warning should be a debug
|
2018-01-16 12:33:50 -05:00 |
Isaac Connor
|
9f42871c86
|
Fix Zone Triggers, bump version
|
2018-01-16 11:49:17 -05:00 |
Isaac Connor
|
004fdbad9b
|
We don't need to update ZoneCount manually anymore
|
2018-01-16 09:31:23 -05:00 |
Isaac Connor
|
9284e26512
|
get rid of the snapshot setting. If we aren't storing all frames, then we should always store the snapshot.
|
2018-01-13 15:15:14 -05:00 |
Isaac Connor
|
4b37c6fc42
|
Change the Group dropdown to a single indented dropdown, and use chosen on it
|
2018-01-12 11:25:15 -08:00 |
Isaac
|
3c55557c77
|
Handle to val in a filter term
|
2018-01-11 22:53:53 +01:00 |
Isaac Connor
|
b013da6b95
|
Fix ptz controls. Something has changed in the way the Event object works, but we don't actually need it.
|
2018-01-11 13:14:11 -05:00 |
Isaac Connor
|
5792021ee3
|
Merge branch 'storageareas' into fugro
|
2018-01-10 15:08:28 -05:00 |
Isaac Connor
|
74269fea73
|
make montagereview load event images from the server that the storage is located on
|
2017-12-22 12:33:30 -08:00 |
Isaac Connor
|
0d7fff761c
|
upgrade find_all to take parameters
|
2017-12-22 11:38:42 -08:00 |
Isaac Connor
|
cc8ed75eb9
|
Merge branch 'storageareas' of github.com:connortechnology/ZoneMinder into storageareas
|
2017-12-22 09:03:11 -08:00 |
Isaac Connor
|
f51259443c
|
fix disk_used_percentage to use db calculated used size
|
2017-12-22 09:02:49 -08:00 |
Isaac
|
9dfad4886d
|
fix saving Monitors
|
2017-12-22 16:13:00 +01:00 |
Isaac Connor
|
148e21d707
|
fugro
|
2017-12-21 21:46:21 -05:00 |
Isaac Connor
|
915ea93348
|
source remote server when streaming event
|
2017-12-21 16:53:46 -08:00 |
Isaac Connor
|
e9141ca3e8
|
re-init logger after loading config to actually pick up the appropriate values. This stops the error logging of Info to weblog when weblog is actually set to None. Also update quotes
|
2017-12-20 10:19:24 -05:00 |
Isaac Connor
|
e47c8fad88
|
Merge branch 'storageareas' of github.com:ConnorTechnology/ZoneMinder into storageareas
|
2017-12-19 11:01:42 -05:00 |
Isaac Connor
|
2922a86d23
|
fixes to new Storage Schemes code
|
2017-12-19 11:01:03 -05:00 |
Isaac Connor
|
5f4b2ca53f
|
don't close the session when logging in
|
2017-12-18 14:35:11 -05:00 |
Isaac Connor
|
dcfae11fc7
|
fix typos
|
2017-12-18 13:16:54 -05:00 |
Isaac Connor
|
c93de992c2
|
add Scheme to the list of fields
|
2017-12-18 13:04:57 -05:00 |
Isaac Connor
|
d312482a2b
|
add StorageScheme to Storage and Events. Deprecate ZM_USE_DEEP_STORAGE
|
2017-12-18 12:52:26 -05:00 |
digital-gnome
|
c0fcfe6eb6
|
Combine possible sort inputs to one in sortQuery, output limitQuery
|
2017-12-15 08:47:08 -05:00 |
Isaac Connor
|
7d7e73977f
|
use stored session group
|
2017-12-13 16:51:56 -05:00 |
Isaac Connor
|
abad266c5b
|
introduce chosen to use it to make the filtering dropdowns awesome
|
2017-12-13 16:15:03 -05:00 |