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

11968 Commits

Author SHA1 Message Date
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 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
Isaac Connor 856608d720 Merge branch 'master' of github.com:ZoneMinder/ZoneMinder 2018-07-11 15:48:27 -04:00
Isaac Connor 05615c5cf4 We should not use a hard path in cache bust 2018-07-11 15:48:01 -04:00
Dmitry Smirnov 7db1fabbe1 Removed "chosen" web site; "prism.js" is not distributable. (#2154) 2018-07-11 15:46:43 -04:00
Isaac Connor 115e554d94 Remove erroneous t and convert tabs to spaces 2018-07-11 15:46:11 -04:00
Andrew Bauer 18c3618e28 Arp tool (#2155) 
* let cmake set path to arp

* declare cameras array

* fix probeV4L function

* typo

* fix another typo - my machine is possessed.

* update redhat, debian, ubuntu build dependencies
 2018-07-11 15:43:59 -04:00
Isaac Connor 3d97b6343e Merge branch 'master' of github.com:ZoneMinder/ZoneMinder 2018-07-11 11:46:04 -04:00
Isaac Connor fe5ebe094d More work just using auth.php instead of cake code. Don't reload the User object 2018-07-11 11:45:49 -04:00
Isaac Connor b8691e4654 Don't need global cookies. Only open session if needed in userLogin 2018-07-11 11:45:19 -04:00
Andrew Bauer a6b44d2ab5 remove jscalendar from rpm builds 2018-07-11 10:06:45 -05:00
Isaac Connor c6ded845d0 Return the user db row ifrom userLogin instead of assuming it will be accessed as a global. Add is_session_started function and use it to detect when we need to start/stop the session in generateAuthHash 2018-07-11 10:34:45 -04:00
Isaac Connor 4f80ca6871 Use userLogin function from auth.php instead of cake code. 2018-07-11 10:33:49 -04:00
Isaac Connor 983e3c45be Fix spacing and quotes 2018-07-11 09:54:25 -04:00
Isaac Connor f10509690b add username and passwordHash to Session so that generateAuthHash works 2018-07-11 09:54:15 -04:00
Isaac Connor f56d751661 join multiple echos into 1 2018-07-10 13:47:30 -04:00
Isaac Connor 21438d17ac Fix authenticating User 2018-07-10 13:19:51 -04:00
Isaac Connor 930d929427 Merge branch 'storageareas' into api_auth 2018-07-10 12:46:30 -04:00
Isaac Connor d9f5d5fe4c Merge branch 'master' into storageareas 2018-07-10 12:46:09 -04:00
Isaac Connor e6a9422636 Add entry for StorageArea 2018-07-10 12:26:25 -04:00
Isaac Connor a0992baa16 Add entry for SignalCheckPoints 2018-07-10 12:25:36 -04:00
Isaac Connor d05ad12b48 We no longer base64_encode the probe data, we just use htmlspecialchars, so don't base64_decode it. Fixes #2148 2018-07-10 11:54:30 -04:00
Isaac Connor 46a496aefa rework monitorprobe to be more logical, and not use Fatal. 2018-07-10 11:54:16 -04:00
Isaac Connor 7ed316d3a5 We no longer base64_encode the probe data, we just use htmlspecialchars, so don't base64_decode it. Fixes #2148 2018-07-10 11:49:45 -04:00
Isaac Connor 13055bdda6 rework monitorprobe to be more logical, and not use Fatal. 2018-07-10 11:49:02 -04:00
Isaac Connor d3034670a0 Merge branch 'master' into storageareas 2018-07-10 11:03:33 -04:00
Isaac Connor 5010488fbf somehow the 1.31.45 update got included 2018-07-10 11:02:48 -04:00
Isaac Connor a26ab59c30 Merge branch 'master' of github.com:ZoneMinder/ZoneMinder 2018-07-10 11:01:47 -04:00
Isaac Connor 831fe57025 Spacing and google code style 2018-07-10 11:00:52 -04:00
Isaac Connor 7fb12171a3 Merge branch 'master' of github.com:ZoneMinder/ZoneMinder 2018-07-10 10:31:54 -04:00
Isaac Connor 77fbfccee0 fix #2149 2018-07-10 10:31:43 -04:00
Dmitry Smirnov 756369f2d8 JSON::Any --> JSON::MaybeXS (Closes: #770). (#2151) 2018-07-10 10:27:03 -04:00
Isaac Connor 8db6561030 Add missing ; 2018-07-09 13:08:20 -04:00
Isaac Connor 974e42a610 spacing 2018-07-09 13:07:49 -04:00
Isaac Connor 3ecf0055b5 spacing 2018-07-09 13:07:16 -04:00
Isaac Connor 0824f740ae Make video 100% width in cycle. Also fix monitors filtering by putting it in a form 2018-07-09 12:50:57 -04:00
Isaac Connor 65564fa480 Merge branch 'master' of github.com:ZoneMinder/ZoneMinder 2018-07-09 12:39:08 -04:00
Isaac Connor 12a673169f spacing 2018-07-09 12:33:37 -04:00
Isaac Connor ba8dc2059d spacing 2018-07-09 12:33:21 -04:00
Isaac Connor afa31842b5 spacing 2018-07-09 12:28:39 -04:00
Isaac Connor 9561401a44 Merge branch 'master' of github.com:ZoneMinder/ZoneMinder 2018-07-09 12:02:14 -04:00
Isaac Connor fd5cf07bfb Make server name and hostname full width. 2018-07-09 10:48:14 -04:00
Isaac Connor 6cf336cc33 Always use a /zm in urls to zm assets 2018-07-09 09:47:20 -04:00
Isaac Connor 4a4e845e9c Fix stupid code that defaulted minTimeSecs to 2010 instead of the first event 2018-07-08 16:24:53 -04:00
Isaac Connor ade8d078df Define minTimeSecs and maxTimeSecs 2018-07-08 15:28:55 -04:00
Isaac Connor d8a4acf319 Merge branch 'master' of github.com:ZoneMinder/ZoneMinder 2018-07-08 15:08:54 -04:00
Isaac Connor d257b53e82 Add missing ) to frame sql when no min/max time specified 2018-07-08 15:08:49 -04:00