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

11730 Commits

Author SHA1 Message Date
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
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
Daedilus 26d6b99018 Added new control script for iPhone ip camera software (#2161) 
https://itunes.apple.com/ca/app/ipcamera-high-end-network-camera/id570912928?mt=8

See https://forums.zoneminder.com/viewtopic.php?f=9&t=27386 for details.
 2018-07-17 08:09:15 -04:00
Andrew Bauer 455204135d
fail if zm_path_ffmpeg not set 2018-07-17 06:57:38 -05:00
Daedilus de0a272b3d Added new control script for iPhone ip camera software 
https://itunes.apple.com/ca/app/ipcamera-high-end-network-camera/id570912928?mt=8

See https://forums.zoneminder.com/viewtopic.php?f=9&t=27386 for details.
 2018-07-16 20:34:27 -06: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 61e7136857 Merge branch 'storageareas' of github.com:connortechnology/ZoneMinder into storageareas 2018-07-12 17:03:21 -04:00
Isaac Connor cb079ce9f3 Merge branch 'master' into storageareas 2018-07-12 15:05: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
Isaac Connor 4aa289cd66 fix reCaptcha failure still allowing login 2018-07-12 11:44:20 -04:00
Isaac Connor ce22f207e3 Merge branch 'master' into add_export_to_filter 2018-07-12 11:40:32 -04:00
Isaac Connor 903127fe85 Merge branch 'storageareas' 2018-07-12 11:39:33 -04:00
Isaac Connor eb610cd3a1 rewrite the HTTP_X_FORWARDED_PROTO test to just make it part of the if instead of modifying SERVER['HTTPS'] 2018-07-12 11:38:58 -04:00
Isaac Connor 06813d3b80 Merge branch 'master' of github.com:ZoneMinder/ZoneMinder 2018-07-12 11:35:13 -04:00
Isaac Connor 2767e7cca3 remove unneeded packaging files from chosen. 2018-07-12 11:35:02 -04:00
Isaac Connor 87f68e4a5b Merge branch 'master' into storageareas 2018-07-12 10:47:18 -04:00
Isaac Connor dd4392bf12 Merge branch 'storageareas' of github.com:ConnorTechnology/ZoneMinder into storageareas 2018-07-12 10:11:18 -04:00
Isaac Connor 9f92af5a33
Merge pull request #100 from xenoxaos/http_x_forwarded_proto_support 
Adding support for HTTP_X_FORWARDED_PROTO
 2018-07-12 10:10:36 -04:00
Andrew Bauer 9f61043931
Update startpackpack.sh 2018-07-12 07:59:27 -05:00
Mike Brown 6a5ff83848 Adding support for HTTP_X_FORWARDED_PROTO 2018-07-11 21:01:37 -05:00
Isaac Connor 0acad44b4a test for existence of Storage path before trying things like disk_total_space which will fill the html output with php errors. 2018-07-11 17:21:44 -04:00
Isaac Connor 8a936cdcc9 Merge branch 'master' into add_export_to_filter 2018-07-11 16:43:02 -04:00
Isaac Connor f4a3c3a8f5 Merge branch 'master' of github.com:ZoneMinder/ZoneMinder 2018-07-11 16:22:27 -04:00
Andrew Bauer 0e0de00e50
Merge pull request #2153 from connortechnology/cycle_width 
Cycle width
 2018-07-11 15:06:37 -05:00
Isaac Connor 184d6fa2ef remove extra spaces 2018-07-11 15:51:04 -04:00
Isaac Connor 410b1ad810 Merge branch 'master' into cycle_width 2018-07-11 15:49:44 -04:00