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
|
c2c7b75956
|
check for ZM_SERVER_ID being defined
|
2018-07-09 15:30:15 -04:00 |
|
Isaac Connor
|
0b4d76f931
|
Add PathPrefix column to the server list
|
2018-07-09 14:36:46 -04:00 |
|
Isaac Connor
|
e98578b2d7
|
Use Server.js objects for Servers array populated by json
|
2018-07-09 14:30:55 -04:00 |
|
Isaac Connor
|
51cfd9b265
|
Use Server.js object for generating url to images
|
2018-07-09 14:30:06 -04:00 |
|
Isaac Connor
|
ee017a1ef7
|
Add PathPrefix to language
|
2018-07-09 14:29:40 -04:00 |
|
Isaac Connor
|
45f6eaf530
|
Add the current serverId to the available javascript variables
|
2018-07-09 14:28:21 -04:00 |
|
Isaac Connor
|
87aa146d84
|
remove debug output from updating navbar
|
2018-07-09 14:10:36 -04:00 |
|
Isaac Connor
|
ebe55cf6a4
|
Include new Server.js
|
2018-07-09 14:10:06 -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
|
3d1fe728f1
|
Merge ../ZoneMinder.master into server_path_prefix
|
2018-07-09 12:33:58 -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
|
acab621f2c
|
bump version for db update
|
2018-07-09 12:18:14 -04:00 |
|
Isaac Connor
|
7ef43a0684
|
Merge ../ZoneMinder.master into server_path_prefix
|
2018-07-09 12:10:48 -04:00 |
|
Isaac Connor
|
d051342e9f
|
Add PathPrefix
|
2018-07-09 12:10:29 -04:00 |
|
Isaac Connor
|
62f45b430e
|
Add PathPrefix and use it in Url. Make Url() smarter so it can do more of the heavy lifting.
|
2018-07-09 12:09:57 -04:00 |
|
Isaac Connor
|
661876b998
|
Use Server->Url() more,, moving the logic into Server->Url()
|
2018-07-09 12:09:29 -04:00 |
|
Isaac Connor
|
34299aff2c
|
Add PathPrefix to Servers Table
|
2018-07-09 12:09:10 -04:00 |
|
Isaac Connor
|
90e4c2632d
|
Use Server->Url() more,, moving the logic into Server->Url()
|
2018-07-09 12:08:50 -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 |