Isaac Connor
|
3c55daaf36
|
Merge branch 'tesla' of github.com:connortechnology/ZoneMinder into tesla
|
2017-11-22 12:10:54 -08:00 |
|
Isaac Connor
|
9dd0f29e88
|
Merge branch 'storageareas' into tesla
|
2017-11-22 11:41:11 -08:00 |
Isaac Connor
|
cd1d2e1721
|
lots more debugging. re-add status update command on failure
|
2017-11-22 01:18:07 -05:00 |
|
Isaac Connor
|
5717a19215
|
be able to popup watch view even if the monitor is not running
|
2017-11-13 20:29:01 -05:00 |
|
Isaac Connor
|
99802945fe
|
be able to popup watch view even if the monitor is not running
|
2017-11-13 20:28:18 -05:00 |
|
Isaac Connor
|
aba7ecd9a6
|
split lines
|
2017-11-08 11:18:23 -05:00 |
|
Isaac Connor
|
09f3355e18
|
add /usr/share/zoneminder/www/cache as a temp dir
|
2017-11-04 14:52:36 -04:00 |
|
Isaac Connor
|
5aa61cf1f5
|
unset the ref so that last monitor isn't duplicated
|
2017-11-02 07:59:25 -04:00 |
|
Isaac Connor
|
1aea1517bf
|
put back old behaviour for add monitor
|
2017-11-01 13:09:14 -04:00 |
Isaac Connor
|
a6c790b374
|
use a shared include for the filters bar
|
2017-10-30 07:37:08 -07:00 |
|
Isaac Connor
|
bc150574c7
|
wip import
|
2017-10-26 18:56:10 -07:00 |
|
Isaac Connor
|
ea84bd1e69
|
add a Status Filter
|
2017-10-25 09:04:54 -07:00 |
|
Isaac Connor
|
5ba6cf0fb2
|
Add DiskSpace to Events listings on console
|
2017-10-24 14:19:36 -07:00 |
|
Isaac Connor
|
9cbd33b439
|
if there is a selected monitor but it isn't in the available monitors, still show the monitors
|
2017-10-23 17:02:47 -07:00 |
|
Isaac Connor
|
169b64813b
|
improve Server and Storage dropdown filters
|
2017-10-20 14:27:29 -04:00 |
Isaac Connor
|
d4b0c504fe
|
fix Server and Storage dropdowns
|
2017-10-19 12:44:33 -07:00 |
|
Isaac Connor
|
cf2eace2c7
|
improve htmlSelect and add Storage and Server filters to console
|
2017-10-19 09:50:07 -04:00 |
|
Isaac Connor
|
c281467e69
|
Store server and storage filters in session. Add storage and server filters to console. WIP
|
2017-10-18 13:24:41 -04:00 |
|
Isaac Connor
|
29a50626e0
|
cleanup
|
2017-10-16 12:19:38 -07:00 |
|
Isaac Connor
|
7f50a13074
|
add Event disk space recalc to zmaudit
|
2017-10-10 12:11:59 -07:00 |
|
Isaac Connor
|
827e858feb
|
use a cached Storage object to prevent hitting the db al lot
|
2017-10-05 16:11:43 -04:00 |
|
Isaac Connor
|
b56a976d7a
|
fixes to montage review and cleanup in group filtering/editing
|
2017-10-05 10:46:04 -04:00 |
|
Isaac Connor
|
87a49ad009
|
work on infinite depths of groups
|
2017-10-04 16:40:09 -04:00 |
|
Isaac Connor
|
4be133ed09
|
remove btn styles from buttons. make groups, cycle, montage, montage review non-popups. Add datetime filters to montagereview. Fix dark skin
|
2017-09-30 14:19:32 -04:00 |
|
Isaac Connor
|
33ce55584f
|
Merge branch 'master' into storageareas
|
2017-07-26 10:48:42 -04:00 |
|
Isaac Connor
|
1cfd657168
|
put back the preg_replace that strips usernames and passwords from monitor source
|
2017-07-26 10:22:57 -04:00 |
|
Isaac Connor
|
cfbfc0dd44
|
Merge branch 'master' into storageareas
|
2017-07-21 11:04:32 -04:00 |
|
Isaac Connor
|
457d909c88
|
fix quotes
|
2017-07-21 10:54:33 -04:00 |
|
Isaac Connor
|
d13d7e9050
|
recode the bit that outputs the link under source so that it defaults to Monitor # under all situations
|
2017-07-14 09:57:25 -04:00 |
|
Isaac Connor
|
403dca78fb
|
break up a long line
|
2017-07-13 10:26:24 -04:00 |
|
Isaac Connor
|
22e957ba46
|
clean up state a bit, use 1 less call to daemon check by using global . When selecting a layout, set img width to 100%
|
2017-07-12 12:49:01 -04:00 |
|
Isaac Connor
|
48373f0d8b
|
fix filters on console. filter object now has terms under a Query array
|
2017-07-06 10:49:10 -04:00 |
|
Isaac Connor
|
085d239a6e
|
Merge branch 'master' into storageareas
|
2017-06-13 18:02:28 -04:00 |
|
Isaac Connor
|
371b86300a
|
Merge branch 'master' into storageareas
|
2017-06-08 14:23:40 -04:00 |
|
Isaac Connor
|
b4bdc1fd6b
|
Merge branch 'master' into dragndrop_monitor_sorting
|
2017-06-06 20:39:58 -04:00 |
|
Isaac Connor
|
bfa724d06c
|
fix spacing
|
2017-06-05 11:11:34 -04:00 |
|
Isaac Connor
|
a9183a1599
|
more quotes
|
2017-06-05 09:40:19 -04:00 |
|
Isaac Connor
|
451714a403
|
Merge branch 'master' into storageareas
|
2017-06-04 21:42:56 -04:00 |
|
Isaac Connor
|
555a667035
|
fix filter button
|
2017-06-02 12:12:59 -04:00 |
|
Isaac Connor
|
e47adcf6cc
|
the tfoot has to come after the tbody
|
2017-06-01 09:36:00 -04:00 |
|
Isaac Connor
|
73ca07792b
|
double quotes to single quotes
|
2017-05-31 22:11:54 -04:00 |
|
Isaac Connor
|
5c67c87147
|
remove deprecated cellspacing attr on table
|
2017-05-31 22:08:44 -04:00 |
|
Isaac Connor
|
a940fe429c
|
deprecate the use of the center tag, and only put in the development h3 if it has contents
|
2017-05-31 22:08:05 -04:00 |
|
Isaac Connor
|
98b49fb64d
|
quotes, spacing
|
2017-05-31 21:28:40 -04:00 |
|
Isaac Connor
|
bb051fd509
|
fix merge conflicts
|
2017-05-25 15:29:31 -04:00 |
|
Isaac Connor
|
7cfa0b12ec
|
Merge branch 'dragndrop_monitor_sorting' into storageareas
|
2017-05-25 15:26:04 -04:00 |
|
Isaac Connor
|
229c8c6e23
|
Mmove Right buttons to the left, because there is no more room on the right anymore, move the script that sets up the sorting to js/console.js
|
2017-05-25 15:03:10 -04:00 |
|
Isaac Connor
|
afce83d289
|
Merge branch 'master' into dragndrop_monitor_sorting
|
2017-05-25 14:31:41 -04:00 |
|
Isaac Connor
|
31b5a99b43
|
remove old code to do sequence up/down arrows, replace with jquery sortable
|
2017-05-25 14:30:07 -04:00 |
|
Isaac Connor
|
043d722651
|
braces,whitespace
|
2017-05-25 14:26:49 -04:00 |