Commit Graph

11762 Commits

Author SHA1 Message Date
Isaac Connor a44df858be Merge branch 'master' into storageareas 2018-08-02 15:40:44 -04:00
Isaac Connor a0e67da51d Improve loging around writing out analysis frames 2018-08-02 15:40:33 -04:00
Andrew Bauer c8ed12f573
Update ISSUE_TEMPLATE.md 2018-08-02 09:49:40 -05:00
Isaac Connor 82833a152e exit on HUP to free up memory. 2018-08-02 06:53:18 -04:00
Isaac Connor 3de6b764e2 exit on HUP to free up memory. 2018-08-02 06:52:36 -04:00
Isaac Connor 50c7eec0ff Merge branch 'storageareas' of github.com:connortechnology/ZoneMinder into storageareas 2018-08-02 05:25:53 -04:00
Isaac Connor 2c1a3348af handle auth params in query string as well as post 2018-08-01 12:40:12 -04:00
Isaac Connor 5b878d5e89 deprecate eventPermission, controlPermission and systemPermission in session. 2018-08-01 12:10:43 -04:00
Isaac Connor 434c1508bc Merge branch 'master' into fix_2167 2018-08-01 10:01:51 -04:00
Isaac Connor 1534934b20 move login code back into AppController. Has to be done for every request 2018-08-01 10:01:35 -04:00
Isaac Connor b85f74bb99 when selecting auto, we need to remove the width & height css key 2018-07-31 16:55:54 -04:00
Isaac Connor c934295bf9 we shall always pass width & height as pixels without units. 2018-07-31 16:55:13 -04:00
Isaac Connor b20d61e0df fix onclick when editing layout 2018-07-31 16:47:25 -04:00
Isaac Connor d50e95fe9b redirect to montage instead of montagereview 2018-07-31 16:46:36 -04:00
Andrew Bauer 6ad732e419 retrieve greip data rather than the ip (#2173) 2018-07-31 14:01:01 -04:00
Isaac Connor 246070793b Fix crash in zma dur to images array not being allocated when analysis_fps not being set 2018-07-31 13:36:03 -04:00
Andrew Bauer 63153f05be
bump version in rpm specfile 2018-07-31 12:25:00 -05:00
Isaac Connor 908f81c6ef Add some more debug 2018-07-31 13:22:52 -04:00
Isaac Connor 639717eb7b If mysql gets restarted, and there is no change in fps, then the monitor_status record never gets updated. So just always update it. 2018-07-31 12:07:57 -04:00
Isaac Connor 588ca2cf62 Merge branch 'master' into storageareas 2018-07-31 10:52:24 -04:00
Isaac Connor 11cedb4335 repeat the update that adds Refresh to Monitors. Bump version. 2018-07-31 10:27:34 -04:00
Isaac Connor ee97dc39dc Add Refresh column to Monitors table. Explicitly put it after ZoneCount in the update.sql 2018-07-31 10:22:13 -04:00
Isaac Connor 886391a547 Merge branch 'master' of github.com:ZoneMinder/ZoneMinder 2018-07-31 10:16:05 -04:00
Isaac Connor 363e1dda97 Add some more Monitor defaults, mainly Refresh which gets called in watch.js.php 2018-07-31 10:15:26 -04:00
Roman Dissertori 48b91c5544 Bugfix in Control and added new Camera (#2171)
* fixed control typos

missing word "s" for "Controls" Table for database queries

* added Dericam P2 camera Control

* fixed missing CanReset column

* Update DericamP2.pm

* added some more missing controls

CanSleep, CanWake

* Update DericamP2.pm

* Update DericamP2.pm

* Update DericamP2.pm

* Update DericamP2.pm

* Update DericamP2.pm

* Update DericamP2.pm

* Update DericamP2.pm

* Update zm_create.sql.in
2018-07-28 09:26:02 -04:00
Isaac Connor 2ff47e04da the updated video-js.css puts the fonts into a font dir. 2018-07-25 17:04:42 -04:00
Isaac Connor 00bdfdcb16 increase height of function popup so that dropdown options fit in it 2018-07-25 09:39:24 -04:00
Isaac Connor 6ab1c3ced8 proper case table header 2018-07-25 09:39:08 -04:00
Isaac Connor c095b9cd33 Merge branch 'master' into fix_2167 2018-07-24 16:48:29 -04:00
Isaac Connor c6aae346b9 use instead of session streamPermission 2018-07-24 16:43:07 -04:00
Isaac Connor 3a676cd569 deprecate montiorPermision in session 2018-07-24 16:42:36 -04:00
Isaac Connor 8098051268 Use instal of session for systemPermission 2018-07-24 16:42:16 -04:00
Isaac Connor dc57a3c91c fix spacing/quotes/google code style 2018-07-24 16:41:09 -04:00
Isaac Connor 98f279addb Update permission code to use 2018-07-24 12:02:35 -04:00
Isaac Connor ba0ab50545 change quotes 2018-07-24 12:02:18 -04:00
Isaac Connor 00cfb100db Update permissions code to use 2018-07-24 12:02:03 -04:00
Isaac Connor 3255a2829f add back the ZM_OPT_USE_AUTH test for being logged in in AppController 2018-07-24 12:01:40 -04:00
Isaac Connor 08d3f98e5e use for auth, and add Monitor Edit checks to Zone add/delete/edit 2018-07-24 11:49:40 -04:00
Isaac Connor caa8adae5e fix when gets loaded. 2018-07-24 10:40:18 -04:00
Isaac Connor 8c35d4d1b0 Populate a global from the session on every request. Use the object instead of using allowedMonitors in session. 2018-07-24 10:32:37 -04:00
Isaac Connor 4c4bad7186 Merge branch 'add_export_to_filter' into storageareas 2018-07-17 15:33:19 -04:00
Isaac Connor 965ffda01e Add button types. fix extra px in slideheight 2018-07-17 15:32:30 -04:00
Andrew Bauer f07b1105d3
Merge pull request #2164 from pliablepixels/fixGetCredentials
fixed getCredentials not working if called directly
2018-07-17 13:24:01 -05:00
Pliable Pixels 997aa6aa55 fixed getCredentials not working if called directly 2018-07-17 13:57:20 -04:00
Pliable Pixels d45ca8880a documentation for new login/logout APIs (#2163) 2018-07-17 13:24:47 -04:00
Andrew Bauer 8f05d0b7da
Merge pull request #2162 from Daedilus/Control/IPCAMIOS
Control/ipcamios
2018-07-17 09:44:59 -05:00
Daedilus d90e3daf80 Added default settings for control script IPCAMIOS as per comments in Pull #2161 2018-07-17 08:31:55 -06:00
Isaac Connor 8a43f4400e Merge branch 'add_export_to_filter' of github.com:connortechnology/ZoneMinder into add_export_to_filter 2018-07-17 08:27:23 -04:00
Isaac Connor a12c7d90ab Merge branch 'master' into add_export_to_filter 2018-07-17 08:26:58 -04:00
Isaac Connor 37779ff51d use a window.location.assign instead of creating a popup to export 2018-07-17 08:26:19 -04:00