ZaneYork
/
zoneminder
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
11,674 Commits 20 Branches 69 Tags 131 MiB
Commit Graph

4584 Commits

Author SHA1 Message Date
Isaac Connor 2ad4b17d36 Merge branch 'master' into storageareas 2018-08-08 16:24:55 -04:00
Isaac Connor 037abd4916 Merge branch 'master' of github.com:ZoneMinder/ZoneMinder 2018-08-08 15:11:42 -04:00
Isaac Connor d87a41b629 Set button types so that they do things in all browsers.Fix Delete button when translated 2018-08-08 15:11:30 -04:00
Isaac Connor 23ddc83ad4
fix_2167 (#2168) 
* Populate a global  from the session on every request. Use the  object instead of using allowedMonitors in session.

* fix when  gets loaded.

* use  for auth, and add Monitor Edit checks to Zone add/delete/edit

* add back the ZM_OPT_USE_AUTH test for being logged in in AppController

* Update permissions code to use

* change quotes

* Update permission code to use

* Use  instal of session for systemPermission

* deprecate montiorPermision in session

* use  instead of session streamPermission

* move login code back into AppController. Has to be done for every request

* deprecate eventPermission, controlPermission and systemPermission in session.

* handle auth params in query string as well as post

* exit on HUP to free up memory.

* add missing global user

* system should be System
 2018-08-08 09:59:46 -04:00
Isaac Connor af7c81bda1 Merge branch 'fix_2167' into storageareas 2018-08-03 11:02:56 -04:00
Isaac Connor 683789eb41 Merge branch 'master' into storageareas 2018-08-03 10:27:48 -04:00
Isaac Connor b72d520e02 implement the ability to pass a disabled option to htmlSelect. Use it to disable the h264 passthrough option for non-ffmpeg monitors. Instead of disappearing it. 2018-08-03 10:02:42 -04:00
Isaac Connor e935570a40 Merge branch 'fix_2167' into storageareas 2018-08-02 18:08:54 -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
Isaac Connor 588ca2cf62 Merge branch 'master' into storageareas 2018-07-31 10:52:24 -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 965ffda01e Add button types. fix extra px in slideheight 2018-07-17 15:32:30 -04:00
Pliable Pixels 997aa6aa55 fixed getCredentials not working if called directly 2018-07-17 13:57:20 -04: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
Isaac Connor 683e8716f2 add type=button to button to prevent them from submitting 2018-07-17 08:25:15 -04:00
Isaac Connor a41ce9c9fe default to exporting all event data 2018-07-17 08:24:19 -04:00
Pliable Pixels 0ff9002adf 2156 api login (#2157) 
* error can be due to bad user or password

* added login/logout and related private functions

* handle case when userLogin fails, current code returns PHP error for  and API throw is not called

* formatting

* converted login params to POST, removed user=&pass= for other APIs

* formatting

* add auth check back but leave out login/out

* fixes to make it work across zmN, postman and curl

* added back enabled check
 2018-07-15 21:17:35 -04:00
Isaac Connor 0d75586fac Merge branch 'master' of github.com:ZoneMinder/ZoneMinder 2018-07-12 15:05:13 -04:00
Isaac Connor 43827953cd test for existence of HTTP_X_FORWARDED_PROTO 2018-07-12 15:04:54 -04:00
Isaac Connor 05f0338219 use a unique connection key for downloads 2018-07-12 14:07:19 -04:00
Isaac Connor 43cee7c383 make export work and fix links to jquery.js 2018-07-12 14:07:03 -04:00
Isaac Connor 95e4341d28 test for existence of DiskSpace in array 2018-07-12 14:05:43 -04:00
Isaac Connor e05604e4b3 Alter code style, spacing 2018-07-12 14:05:23 -04:00
Isaac Connor 82115ed2d3 Merge branch 'master' of github.com:ZoneMinder/ZoneMinder 2018-07-12 11:44:26 -04:00