Isaac Connor
|
0e58920d2a
|
Merge branch 'storageareas' of github.com:connortechnology/ZoneMinder into tesla
|
2018-01-29 06:30:43 -08:00 |
Isaac Connor
|
ff12495364
|
bump version for column rename in Monitor_Status
|
2018-01-29 09:28:19 -05:00 |
|
Isaac Connor
|
2dcb0d183f
|
Merge branch 'storageareas' of github.com:connortechnology/ZoneMinder into tesla
|
2018-01-28 18:07:33 -08:00 |
|
Isaac Connor
|
f2b335c7b2
|
SORT auto server selection in ascending order
|
2018-01-28 18:07:01 -08:00 |
|
Isaac Connor
|
51d5fd38aa
|
scan the board for the names of the camera inputs
|
2018-01-28 18:06:13 -08:00 |
|
Isaac Connor
|
f132a7681d
|
Merge branch 'tesla' of https://stash.teslamotors.com/scm/~iconnor/zoneminder into tesla
|
2018-01-28 18:05:29 -08:00 |
|
Isaac Connor
|
c59751713b
|
fix redirect
|
2018-01-28 17:31:00 -05:00 |
|
Isaac Connor
|
0d734a880c
|
add hack to ensure that next and previous operate on time
|
2018-01-28 17:30:49 -05:00 |
|
Isaac Connor
|
f98217e62a
|
remove useless debug code
|
2018-01-28 15:17:48 -05:00 |
|
Isaac Connor
|
190d8d1600
|
remove useless debug code
|
2018-01-28 15:17:41 -05:00 |
|
Isaac Connor
|
748f78d7a6
|
clean out old threaded code that has been #defined out for a long time. When EOF, after re-opening, continue instead of logging the error
|
2018-01-28 15:17:22 -05:00 |
|
Isaac Connor
|
057509637a
|
TUrn a warning into a debug
|
2018-01-28 15:16:06 -05:00 |
|
Isaac Connor
|
16c24240f7
|
clean out old threaded code that has been #defined out for a long time. When EOF, after re-opening, continue instead of logging the error
|
2018-01-28 15:14:38 -05:00 |
|
Isaac Connor
|
8a4b17fb50
|
turn into a url instead of boolean. Use it to refresh the options page on change so that changes are instantly noticable
|
2018-01-28 15:13:57 -05:00 |
|
Isaac Connor
|
5d4fde88d9
|
Merge branch 'storageareas' of github.com:connortechnology/ZoneMinder into tesla
|
2018-01-27 12:17:13 -08:00 |
|
Isaac Connor
|
bc6d8623a6
|
add a semaphore around the socket creation and retention. I think concurrent processes are messing with the sockets.
|
2018-01-27 15:03:22 -05:00 |
|
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
|
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
|
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 |