Commit Graph

490 Commits

Author SHA1 Message Date
Isaac Connor 676c4b7ddc Merge branch 'master' into storageareas 2017-08-22 09:52:14 -04:00
Isaac Connor 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
Isaac Connor f01adc6be5 fixes 2017-08-17 10:18:51 -04:00
Isaac Connor f573158fbb fix breakage caused by empty SSL_CERT options 2017-08-15 19:40:02 -04:00
Isaac Connor adab628af9 fix video speed, various other 2017-08-14 18:22:52 -04:00
Isaac Connor b6965a2c3f fix spacing/braces 2017-08-14 11:38:21 -04:00
Isaac Connor 49464d381a Merge branch 'master' into storageareas 2017-08-14 10:44:40 -04:00
ralimi 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
Isaac Connor b9addeecfd update deleting the events when deleting a monitor 2017-08-08 15:02:40 -04:00
Isaac Connor 792d8640c2 use the analyze file if exists as thumbnail 2017-07-28 09:54:33 -04:00
Isaac Connor 63e974192c handle case when no filter is specified 2017-07-13 14:57:27 -04:00
Isaac Connor fed4dae7e5 fix width and height in options 2017-07-11 19:13:29 -04:00
Isaac Connor c372787882 fix typo 2017-07-06 10:50:56 -04:00
Isaac Connor 874dc79948 tell eventdetail popup to close on save 2017-07-06 10:48:33 -04:00
Isaac Connor 9b4fb05d5b Fix parseFilter because terms is now under Query 2017-07-06 10:47:47 -04:00
Isaac Connor a263de144b fixup defaults for Filter 2017-06-29 15:00:17 -04:00
Isaac Connor 621d2e0e41 remove debug code 2017-06-28 15:18:12 -04:00
Isaac Connor 8b1459a510 fixes for cambozola on ie, and fixes to setting fixed widths 2017-06-28 15:17:55 -04:00
Isaac Connor 90696331a9 Merge branch 'master' into storageareas 2017-06-26 21:58:11 -04:00
Isaac Connor b5565bb16a fix filters, refreshparent in wrong block 2017-06-23 09:04:46 -04:00
Isaac Connor 375e4a3e9c More filter UI fixes 2017-06-20 10:45:16 -04:00
Isaac Connor 93f81daa8d Fix saving logic 2017-06-20 09:08:25 -04:00
Isaac Connor dc96ca72a8 Fix AutoDetail=>AutoDelete, add Id to defaults and remove debugging 2017-06-20 09:08:15 -04:00
Isaac Connor 965b306ebc continue redoing filters 2017-06-19 13:24:02 -04:00
Isaac Connor 1d9e0b7d69 fix saving filters 2017-06-19 10:18:44 -04:00
Isaac Connor 75c11431e6 deprecate filtersavepopup 2017-06-16 11:10:25 -04:00
Isaac Connor 3225891843 update/fix filter behaviour 2017-06-15 15:45:43 -04:00
Isaac Connor 085d239a6e Merge branch 'master' into storageareas 2017-06-13 18:02:28 -04:00
Andrew Bauer 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
Andrew Bauer 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
Isaac Connor 528582fec6 fix tabs 2017-06-09 10:36:38 -04:00
Isaac Connor 1788aabb6c Merge branch 'storageareas' into move_dirs 2017-06-09 10:35:58 -04:00
Isaac Connor 371b86300a Merge branch 'master' into storageareas 2017-06-08 14:23:40 -04:00
Isaac Connor 2c1f576da4 Don't need to check for values in args, beacuse we set one above 2017-06-08 14:01:44 -04:00
Isaac Connor 405078686a update getStreamSrc to take a hash instead of an array of thing=thing 2017-06-08 14:01:22 -04:00
Isaac Connor 01717a5c14 Merge branch 'master' into filter_by_runstate 2017-06-06 20:34:47 -04:00
Isaac Connor d524f98d43 add find_all function 2017-06-06 20:29:17 -04:00
Andrew Bauer 2bc6f1627e Add support for conf.d subfolder (#1902)
* cmake changes to support conf.d

* php changes to support conf.d

* perl changes to support conf.d

* C changes to support conf.d

* add conf.d support to rpmspecfile

* fix typo

* specify ZM_CONFIG_SUBDIR in relevant target distros

* put back my config_file perl definition

* remove quotes from ZM macros

* fix snprintf

* add README to conf.d folder

* adjust rpm specfile

* remove custom permissions from README in rpmspecfile

* modify rpm README documentation to reflect conf.d support

* set ZM_CONFIG_SUBDIR in debian rules file
2017-06-05 16:39:19 -04:00
Isaac Connor ad4264dad7 spacing 2017-06-05 15:21:27 -04:00
Isaac Connor 451714a403 Merge branch 'master' into storageareas 2017-06-04 21:42:56 -04:00
Isaac Connor a1af422d29 the [filter][terms] etc part needs to be urlencoded as well. Becase [] are not valid in urls. 2017-06-01 09:35:38 -04:00
Isaac Connor 4889f3d0e8 rework logic in GetStreamImg a bit. If no frame is specified, then we can use snapshot...otherwise it should do the frame image! 2017-05-31 20:54:34 -04:00
Isaac Connor b6ed806d6c braces and comments 2017-05-30 13:51:00 -04:00
Isaac Connor 8b3b9eb30e more merges/fixes from SA 2017-05-30 13:47:30 -04:00
Isaac Connor 1a43334113 Use NULLs instead of '' when saving things 2017-05-30 13:38:57 -04:00
Isaac Connor e9a0474cf7 add back required lines with a comment 2017-05-30 12:04:12 -04:00
Isaac Connor 8a732dff8a add back required lines with a comment 2017-05-30 12:03:31 -04:00
Isaac Connor 0e643f0f93 Merge branch 'master' into storageareas 2017-05-30 11:58:38 -04:00
Isaac Connor c5288a172d fix merge problem 2017-05-30 11:57:20 -04:00
Isaac Connor 00479876f2 fix braces 2017-05-30 11:53:21 -04:00