3af795264d
add actual disk space as a mouseover in nav bar
2017-10-10 10:38:13 -04:00
8da7d845b4
Merge branch 'storageareas' of github.com:connortechnology/ZoneMinder into storageareas
2017-10-10 09:37:23 -04:00
c654d008f0
add monitor selector to montagereview and montage.
2017-10-10 09:36:56 -04:00
d0541b0837
Merge pull request #27 from digital-gnome/eventnavFix
...
Fix nearevents path
2017-10-07 12:49:50 -04:00
e23b4a0d5d
Fix event path
2017-10-07 12:42:16 -04:00
f230aa01ef
turn off debug
2017-10-07 11:31:48 -04:00
09242d72b3
implement alternate ports for streaming
2017-10-05 16:05:41 -04:00
40972383c1
remove debug
2017-10-05 10:48:04 -04:00
b56a976d7a
fixes to montage review and cleanup in group filtering/editing
2017-10-05 10:46:04 -04:00
87a49ad009
work on infinite depths of groups
2017-10-04 16:40:09 -04:00
b5a5f45e04
turn off debug
2017-10-02 10:06:07 -04:00
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
35482ba53c
Merge branch 'storageareas' of github.com:ConnorTechnology/ZoneMinder into storageareas
2017-09-26 16:13:51 -04:00
aada54769f
add a Group object
2017-09-23 13:42:39 -04:00
a81ff85fbb
add ffmpeg decoding of a .mp4 to get the frames
2017-08-23 15:05:44 -04:00
676c4b7ddc
Merge branch 'master' into storageareas
2017-08-22 09:52:14 -04:00
9b95259567
fix deleting monitor, but passing an event Id to deleteEvent instead of a hash consisting of just the Id
2017-08-22 09:33:51 -04:00
f01adc6be5
fixes
2017-08-17 10:18:51 -04:00
f573158fbb
fix breakage caused by empty SSL_CERT options
2017-08-15 19:40:02 -04:00
adab628af9
fix video speed, various other
2017-08-14 18:22:52 -04:00
b6965a2c3f
fix spacing/braces
2017-08-14 11:38:21 -04:00
49464d381a
Merge branch 'master' into storageareas
2017-08-14 10:44:40 -04:00
ecb7df0e8b
Support SSL for mysql connections ( #1965 )
...
* Fix install location for config files when building to alternate directory.
With the previous code, we ended up with a directory structure like the following:
$ find /etc/zm/conf.d/
/etc/zm/conf.d/
/etc/zm/conf.d/01-system-paths.conf
/etc/zm/conf.d/conf.d
/etc/zm/conf.d/conf.d/README
/etc/zm/conf.d/conf.d/02-multiserver.conf
* Omitted README file that should have appeared in /etc/zm/conf.d
* Fix location for configs when building to alternate directory.
* Fix works, but this should go on a branch instead.
* Fix works, but this should go on a branch instead.
* Fix location for configs when building to alternate directory.
With the previous code, we ended up with a directory structure like the following:
$ find /etc/zm/conf.d/
/etc/zm/conf.d/
/etc/zm/conf.d/01-system-paths.conf
/etc/zm/conf.d/conf.d
/etc/zm/conf.d/conf.d/README
/etc/zm/conf.d/conf.d/02-multiserver.conf
* Remove double quotes. This is a list of paths.
* Allow SSL database connection to be secured with SSL.
* Fix incorrect variable name
* Fix PHP syntax errors
* SSL connection parameters must also be passed in API.
* Revert fixes to build files; they should not be in this branch.
2017-08-14 10:30:42 -04:00
b9addeecfd
update deleting the events when deleting a monitor
2017-08-08 15:02:40 -04:00
792d8640c2
use the analyze file if exists as thumbnail
2017-07-28 09:54:33 -04:00
63e974192c
handle case when no filter is specified
2017-07-13 14:57:27 -04:00
fed4dae7e5
fix width and height in options
2017-07-11 19:13:29 -04:00
c372787882
fix typo
2017-07-06 10:50:56 -04:00
874dc79948
tell eventdetail popup to close on save
2017-07-06 10:48:33 -04:00
9b4fb05d5b
Fix parseFilter because terms is now under Query
2017-07-06 10:47:47 -04:00
a263de144b
fixup defaults for Filter
2017-06-29 15:00:17 -04:00
621d2e0e41
remove debug code
2017-06-28 15:18:12 -04:00
8b1459a510
fixes for cambozola on ie, and fixes to setting fixed widths
2017-06-28 15:17:55 -04:00
90696331a9
Merge branch 'master' into storageareas
2017-06-26 21:58:11 -04:00
b5565bb16a
fix filters, refreshparent in wrong block
2017-06-23 09:04:46 -04:00
375e4a3e9c
More filter UI fixes
2017-06-20 10:45:16 -04:00
93f81daa8d
Fix saving logic
2017-06-20 09:08:25 -04:00
dc96ca72a8
Fix AutoDetail=>AutoDelete, add Id to defaults and remove debugging
2017-06-20 09:08:15 -04:00
965b306ebc
continue redoing filters
2017-06-19 13:24:02 -04:00
1d9e0b7d69
fix saving filters
2017-06-19 10:18:44 -04:00
75c11431e6
deprecate filtersavepopup
2017-06-16 11:10:25 -04:00
3225891843
update/fix filter behaviour
2017-06-15 15:45:43 -04:00
085d239a6e
Merge branch 'master' into storageareas
2017-06-13 18:02:28 -04:00
bf04a68085
Merge pull request #1752 from connortechnology/filter_by_runstate
...
rough in the ability to filter on RunState
2017-06-12 20:54:17 -05:00
bacf65ae9a
Migrate values from Options -> Paths to zm.conf ( #1908 )
...
* initial commit to migrate contents of Options->Paths to zm.conf
* remove paths items from configdata.pm
* remove paths tab from options
* update deb packaging scripts with new cmake vars
* remove extraneous file
* save custom paths variables to config file before dB is freshened
* don't check configs if the dB version is >= 1.31.0
2017-06-12 21:39:37 -04:00
528582fec6
fix tabs
2017-06-09 10:36:38 -04:00
1788aabb6c
Merge branch 'storageareas' into move_dirs
2017-06-09 10:35:58 -04:00
371b86300a
Merge branch 'master' into storageareas
2017-06-08 14:23:40 -04:00
2c1f576da4
Don't need to check for values in args, beacuse we set one above
2017-06-08 14:01:44 -04:00
405078686a
update getStreamSrc to take a hash instead of an array of thing=thing
2017-06-08 14:01:22 -04:00
Isaac Connor
digital-gnome
Isaac Connor
ralimi
Andrew Bauer