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

15654 Commits

Author SHA1 Message Date
hax0kartik a53f67cd31 Remove a extra file added by mistake 2020-03-05 09:53:07 -08:00
hax0kartik 15aec7b109 Add libjwt 2020-03-05 09:51:33 -08:00
hax0kartik 2091ad8c92 Add libjwt and remove gnutls-openssl wrapper 2020-03-05 09:29:27 -08:00
Isaac Connor 8a34e9f22d Merge branch 'master' of github.com:ZoneMinder/ZoneMinder 2020-03-04 16:51:29 -05:00
Isaac Connor af2b6c435e Merge branch 'release-1.34' of github.com:ZoneMinder/zoneminder into release-1.34 2020-03-04 14:18:59 -05:00
Isaac Connor 424677165f Use ppa:iconnor/zoneminder-master instead of ppa:iconnor/zoneminder 2020-03-04 14:18:50 -05:00
Isaac Connor b78acd7b95 google code style 2020-03-04 14:14:38 -05:00
Isaac Connor 6d4ed20745 Drop lock around openFile so that we don't hang 2020-03-04 14:14:28 -05:00
Isaac Connor 2882693791 If can't connect to db, bail instead of loading config 2020-03-04 14:13:44 -05:00
Isaac Connor 06f480acf8
Merge pull request #2872 from ZoneMinder/revert-2844-2810-libjwt 
Revert "Add libjwt as a optional library"
 2020-03-04 13:57:40 -05:00
Isaac Connor 444c6fd372
Revert "Add libjwt as a optional library" 2020-03-04 13:57:27 -05:00
Isaac Connor 641b191c34
Merge pull request #2867 from veprbl/pr/cmake_install_full 
cmake: use CMAKE_INSTALL_FULL_
 2020-03-04 12:00:11 -05:00
Isaac Connor 24f04b8551
Merge pull request #2871 from pliablepixels/1.34-dev 
move the recommended install method before what is discouraged
 2020-03-04 11:59:02 -05:00
Isaac Connor 5443e6385b
Merge pull request #2844 from hax0kartik/2810-libjwt 
Add libjwt as a optional library
 2020-03-04 11:58:27 -05:00
Pliable Pixels 4f8745809a move the recommended install method before what is discouraged 2020-03-04 11:42:55 -05:00
Isaac Connor 53f262a4cb Merge pull request #2870 from pliablepixels/dev 
#2866 - fixes incorrect token type comparison
 2020-03-04 11:31:16 -05:00
Isaac Connor d60e1a783f Merge branch 'master' of github.com:ZoneMinder/zoneminder 2020-03-04 11:22:15 -05:00
Isaac Connor 55f63e8e9d Merge branch 'fix_auth_timeouts' 2020-03-04 11:22:08 -05:00
Isaac Connor 4dae0c4609
Merge pull request #2870 from pliablepixels/dev 
#2866 - fixes incorrect token type comparison
 2020-03-04 11:21:48 -05:00
Isaac Connor a9e3d0691f quotes, fix status ajax call using old auth_hash 2020-03-04 11:17:48 -05:00
Isaac Connor 8eee5cc222 Add global array so that we only do it once. 2020-03-04 11:03:30 -05:00
Isaac Connor d24069e3d0 Look for global array so we don't load all Servers multiple times. Add all servers to allowed script-src in CSPHeaders 2020-03-04 11:03:07 -05:00
Isaac Connor 4c7178b78b fix cpplint complaints and remove casts that are unnecessary. Micro-optimisation by using fputs for date_string instead of fprintf 2020-03-04 11:02:21 -05:00
Pliable Pixels 1381cb194e
#2866 - fixes incorrect token type comparison 2020-03-04 10:50:59 -05:00
Isaac Connor 9f696186a8 Increase height of storage popup for Enabled 2020-03-04 10:48:02 -05:00
Isaac Connor ac00ca0ad8 Only list enabled Storage Areas 2020-03-04 10:46:59 -05:00
Isaac Connor 077b8888f9 Use Storage object and add Enabled 2020-03-04 10:46:32 -05:00
Isaac Connor 0b267fbdee Add Enabled to Storage 2020-03-04 10:46:16 -05:00
Isaac Connor d59bc4ca6d add Enabled to Storage 2020-03-04 10:15:44 -05:00
Isaac Connor 2f48c442cc add Enabled to Storage 2020-03-04 10:15:35 -05:00
Isaac Connor 0323925406 Code style updates. Quote the word Function in SQL for newer mysql 2020-03-04 09:48:55 -05:00
Isaac Connor 285866a681 Merge branch 'master' of github.com:ZoneMinder/zoneminder 2020-03-03 17:29:44 -05:00
Isaac Connor 7c066822f3 escape table columns for mysql8 2020-03-03 17:29:31 -05:00
Isaac Connor 3a24f27a7a include id in monitors dropdown so that it is searchable 2020-03-03 16:59:38 -05:00
hax0kartik 1dd8a71b52 Fix conditionals for when to look for openssl 2020-03-03 09:16:24 -08:00
hax0kartik c048590b49 Look for openssl when libjwt is not found 2020-03-03 08:54:00 -08:00
hax0kartik 60d3243e69 Look for openssl as well when gnutls-openssl wrapper is not found 2020-03-03 08:35:24 -08:00
hax0kartik ef3d7497d0 Only look for libjwt-gnutls and look for openssl only if gnutls is not found 2020-03-03 07:39:29 -08:00
Dmitry Kalinkin a703d96c13 cmake: use CMAKE_INSTALL_FULL_ 
CMAKE_INSTALL_FULL_ is to be used as a definition of the full path.

https://cmake.org/cmake/help/latest/module/GNUInstallDirs.html
 2020-03-03 08:41:53 -05:00
Isaac Connor fa6ac399be Fix code in makePopupLink. Return content-type application/json for json response 2020-03-02 17:21:58 -05:00
Isaac Connor d29b93216d Allow users without System::View to read servers.json 2020-03-02 16:39:12 -05:00
Isaac Connor 85e5ade07a fix makePopupLink when condition is false 2020-03-02 16:10:56 -05:00
Isaac Connor bd59ae8856 Move the Basic Auth login code from skin.php to includes/auth.php 2020-03-02 15:00:31 -05:00
Isaac Connor c1e13221f7 Move the Basic Auth login code from skin.php to includes/auth.php 2020-03-02 14:59:36 -05:00
Isaac Connor a2dd24ae1f When sending eventCmdReq, pass eventCmdParms since it might have been updated. 2020-03-02 14:38:36 -05:00
Isaac Connor 00de49a5c1 add monitorStreamReplayBuffer to javascript vars. Use it to determine whether to update fast forward and reverse buttons 2020-03-02 12:43:07 -05:00
Isaac Connor e3e9fd2bc1 Merge branch 'release-1.34' of github.com:ZoneMinder/zoneminder into release-1.34 2020-03-02 12:08:32 -05:00
Isaac Connor 7c21f065bd Checking AuthHashGeneratedAt is no good because it gets updated before we check it. Instead check the auth hash in session against the one in and sensd the update if they are different 2020-03-02 12:07:11 -05:00
Isaac Connor d0e70fc501 Merge branch 'fix_auth_timeouts' of github.com:connortechnology/ZoneMinder into fix_auth_timeouts 2020-03-02 12:04:45 -05:00
Isaac Connor 8f113ad030 Merge branch 'master' of github.com:ZoneMinder/zoneminder 2020-03-02 11:55:08 -05:00