9a2d58adce
We don't store all the permissions in the session anymore. We just use the global user object
2018-10-29 11:03:03 -04:00
95a6d0666a
Improve behaviour and reduce extra logging when db goes away
2018-10-29 09:59:26 -04:00
91d83a89fa
include semaphore function replacements
2018-10-25 15:40:12 -04:00
d0080684b8
Bosnian translation ( #2266 )
...
* Zoneminder bosnian translation
Hi,
this is a bosnian translation for zoneminder, but it can be used as croatian and serbian translation too
* Delete BA_ba.php
* Bosnian translation
80% translated, tested on my Zoneminder v1.30.4 installation and is looking good. ZmNinja also translated into Bosnian lagnuage.
2018-10-24 13:52:32 -04:00
6488122862
Merge branch 'master' of github.com:ZoneMinder/ZoneMinder
2018-10-24 10:03:11 -04:00
115141bf9f
add caching to Group::find
2018-10-24 10:02:42 -04:00
2024df4393
use json_encode/decode instead of serialize/unserialize to pass onvif probe results around. Also clean up some code/ add some missing things. Fixes #2271 and #2272
2018-10-24 09:49:56 -04:00
18850d8779
API getVersion Fix -> Undefined variable: eTagMatches... ( #2268 )
...
see https://github.com/cakephp/cakephp/issues/12536
2018-10-23 07:58:07 -04:00
86b0e4ea18
fix auth_hash. Should use generateAuthHash instead of accessing session directly
2018-10-22 18:32:39 -04:00
9938346752
Merge branch 'master' of github.com:/ZoneMinder/ZoneMinder
2018-10-22 16:14:36 -04:00
7b69bc4292
Merge branch 'master' of github.com:/connortechnology/ZoneMinder
2018-10-22 16:13:55 -04:00
f4ddc0fe9b
ob_clcean and flush break outputting the image
2018-10-22 16:13:12 -04:00
ccd64b0fae
Merge branch 'master' of github.com:ZoneMinder/ZoneMinder
2018-10-22 14:21:34 -04:00
7e4c54fec0
Use proper buttons and remove extra bootstrap styles from buttons so that they aren't all jammed together
2018-10-22 13:54:27 -04:00
559f34a838
User Monitor->Url() instead of Monitor->Server->Url() which will append port #
2018-10-20 14:33:09 -04:00
069f67a10f
Break some long lines
2018-10-20 14:32:58 -04:00
c9c46aa12d
User Monitor->Url() instead of Monitor->Server->Url() which will append port #
2018-10-20 14:32:25 -04:00
f5eca2da1e
No longer need to add thisUrl to monitorUrl
2018-10-20 11:37:36 -04:00
3237a10d0a
Merge branch 'master' of github.com:zoneminder/ZoneMinder
2018-10-20 11:36:45 -04:00
8878397622
fix spacing
2018-10-20 11:36:25 -04:00
530a53f138
Merge branch 'master' of github.com:ZoneMinder/ZoneMinder
2018-10-19 15:02:31 -04:00
3723f7acb3
comment out redundatn code increasing load on server
2018-10-19 15:02:10 -04:00
17a5519dd6
Include the remoteAddr in the session authhash cache, so that a change of ip won't allow the same useless auth hash. ( #2264 )
2018-10-19 13:39:37 -04:00
f9b1453705
Include SERVER_PORT when not doing multi-server or multi-port but are running on a port other than 80.
2018-10-19 10:59:16 -04:00
23fd5db5c8
fix #2265 extra graphics in url
2018-10-19 10:06:51 -04:00
e7ec2faccd
monitorUrl now includes /zm/index.php so adding thisUrl generates an incorrect url
2018-10-18 20:33:50 -04:00
4fdac25ae1
remove blank last line
2018-10-18 09:20:15 -04:00
37a48550e5
Merge branch 'master' of github.com:ZoneMinder/ZoneMinder
2018-10-18 08:57:29 -04:00
f7de3a87e2
show event notes in same event view ( #2259 )
2018-10-16 12:11:25 -04:00
1b9b2811b3
remove ? from streamCmdParms. Mootools adds it in so this gives us a double ?
2018-10-16 11:39:16 -04:00
37065d15ac
fix url to api in monitor restart.
2018-10-16 09:47:24 -04:00
d1bef49d0b
Don't reload on a timeout when refreshing the navbar
2018-10-11 11:30:30 -04:00
a76e33bd48
rough in for alarmed frame retrieval ( #2248 )
...
* rough in for alarmed frame retrieval
* add sorting
2018-10-11 10:07:56 -04:00
f2b38f175d
Update Frame::find_one so that we can specify an ordering for find_one and so that semantics match other objects find methods
2018-10-11 09:14:40 -04:00
c4c8a728f2
Handle no controls found more gracefully
2018-10-10 19:04:00 -04:00
be78cb1b34
correct falsepi=> false
2018-10-10 16:08:48 -04:00
4d5b0ca864
Merge pull request #2247 from connortechnology/turn_off_navbar
...
Turn off navbar
2018-10-10 13:21:46 -05:00
bf3e783c42
remove link to zones_overview that I never got around to creating
2018-10-10 14:13:12 -04:00
c58f043998
Add a mouseover tooltip saying Toggle Filters on up arrow
2018-10-10 14:12:16 -04:00
031c96c71d
Merge branch 'master' into turn_off_navbar
2018-10-10 14:04:29 -04:00
a46c9a8a7a
Merge branch 'master' of github.com:ZoneMinder/ZoneMinder
2018-10-10 14:03:35 -04:00
63a5211789
use url instead of server_url in Monitor object
2018-10-10 14:03:27 -04:00
a1ab0855db
if navbar=0 is given in the url, don't output the navbar
2018-10-10 14:02:46 -04:00
6ed146b4dd
Use Hostname instead of Url in test for CORS access.
2018-10-10 14:01:36 -04:00
48e805c09f
Make header flips perisisent based on cookie
2018-10-10 13:11:27 -04:00
ff00f15b58
add missing ;
2018-10-09 11:10:09 -04:00
90ea6aa076
remove : from labels on monitor filters. They can be put back in css
2018-10-09 11:09:42 -04:00
4d626dfb4e
allow username&password even if AUTH_HASH is enabled ( #2231 )
2018-10-08 17:28:03 -04:00
52b1439d51
fix the lack of /zm/index.php in url in Server->Url() and multiport
2018-10-08 09:55:47 -04:00
1eb8e9ed9e
Include PHP_SELF in url to Server. This will assume that all servers in a multi-server setup use the same path
2018-10-08 09:45:03 -04:00
409fd6aa6f
Merge pull request #2232 from connortechnology/fix_2229_getDiskPercent
...
Fix 2229 get disk percent
2018-10-03 18:11:28 -05:00
04c06d0893
Merge branch 'master' of github.com:ZoneMinder/ZoneMinder
2018-10-03 11:23:01 -04:00
66221e39ab
rough in a StorageController for api
2018-10-03 11:22:51 -04:00
12bed9b6ac
Use alternate, working test for relative ZM_DIR_EVENTS. Don't use human output from du when specifying mid to be consistent.
2018-10-03 11:11:33 -04:00
03f09bdc48
Use defined CONFIG constants instead of looking up config from db
2018-10-03 10:56:02 -04:00
e7790ebeef
Documentation Improvements + Fixes ( #2230 )
...
* get
* get
2018-10-03 10:29:10 -04:00
efda26121b
allow login by username&password in request
2018-10-02 16:59:05 -04:00
c9423aa902
Merge branch 'master' of github.com:ZoneMinder/ZoneMinder
2018-10-01 10:40:20 -04:00
592f55a550
do a location.reload instead of trying to guess what the current url is. Should solve permission denied problem when watching live view and auth times out.
2018-10-01 10:39:00 -04:00
1978882825
dim x264 encode when on arm ( #2227 )
2018-10-01 09:17:22 -04:00
613d885930
!= E.id is not sufficient. Since we are enforcing chronological ordering, > and < work better than !=
2018-09-30 10:15:04 -04:00
c88dc690a6
Make getNearEvents smarter. When Sorting by something other than Id, include Id in the sort so that events with identical starttime for example maintain the correct chronological order.
2018-09-28 13:24:50 -04:00
c481fc868f
be more robust when curFrames is empty.
2018-09-28 11:25:19 -04:00
4b97fc9480
Merge pull request #2221 from pliablepixels/font-license
...
added license
2018-09-27 16:45:34 -05:00
c5c01d56be
fix unsetting fixed width/height/layout. Since they are actually controlled by cookies, the session will overwrite when we try to unset the cookie. Also fix some missing ;'s
2018-09-27 14:20:41 -04:00
7ffb46302f
When events have the same starttime, sort secondly by Id
2018-09-26 14:10:49 -04:00
d1f93d752b
wrap again
2018-09-26 10:10:07 -04:00
e27bd11f79
wrap
2018-09-26 10:08:08 -04:00
8afb3d8650
formatting
2018-09-26 10:05:54 -04:00
f1db5446d1
added license
2018-09-26 10:02:39 -04:00
bf9ff8461c
Add WebSite to the Monitor type enumeration
2018-09-24 13:20:19 -04:00
c8c533ca2f
Merge branch 'master' of github.com:ZoneMinder/ZoneMinder
2018-09-23 10:51:56 -04:00
c5b23807a4
put back overlay.js for log view.
2018-09-23 10:51:46 -04:00
b8a2e71bb6
use base64_encode for monitor probe
...
We need to employ the same method of encoding as the onvif probe to avoid fixing one while breaking the other
2018-09-21 12:00:03 -05:00
347c0d2ae4
fix whitespace
2018-09-20 13:41:13 -05:00
ac9129b632
fix corrupted export downloads
2018-09-20 13:36:52 -05:00
999e4c6c43
Merge branch 'master' of github.com:ZoneMinder/ZoneMinder
2018-09-20 13:37:46 -04:00
90d1d79e9a
Add missing AutoUpload field to Filter
2018-09-20 13:37:36 -04:00
f53533e61e
fix populating onvif probe data
2018-09-20 10:30:23 -05:00
ba4878d2b5
fix use of instead of ['limit']
2018-09-20 10:11:55 -04:00
503b40cb62
Need to cache the object not the row
2018-09-20 10:07:15 -04:00
6181e52c47
gracefully handle non-existence of imageFeed
2018-09-20 09:07:28 -04:00
c6e953c4a9
if Monitor is not found, return empty Monitor instead of null
2018-09-20 09:02:20 -04:00
c4108a2610
Fix missing quotes inc Event::Monitor
2018-09-20 08:59:15 -04:00
8a5c989cac
fix warning when editing users after a monitor has been deleted
2018-09-18 08:52:43 -04:00
7f98277571
Merge updated Monitor.php that does caching
2018-09-15 09:52:08 -04:00
b0c555599c
Merge updated objects from sa. Implements caching of objects and fixes logged errors when using the default storage group. Fixes #2209
2018-09-15 09:42:59 -04:00
fa55cec12c
fix error when scale is auto
2018-09-14 16:57:28 -04:00
f1442eba90
once we have found a match for our origin, break out of loop
2018-09-14 14:56:26 -04:00
d9b1d3ec11
fix CORS Headers when we are coming from a non-standard port. Use a regexp instead of == so that we match regardless of port
2018-09-14 14:52:33 -04:00
b5b71edbf6
Make a Url function in the Monitor object to use the Server->Url + Port. Default to port used in current url. Fixes problems with using something other than port 80
2018-09-14 14:26:45 -04:00
b3565fb983
remove file that should not be there
2018-09-12 07:02:57 -05:00
c66dd25ebb
implement collapsible headers ( #2203 )
2018-09-11 17:39:40 -04:00
eef928a742
fix find_all => find
2018-09-11 14:31:03 -04:00
684f48979a
Merge branch 'master' of github.com:ZoneMinder/ZoneMinder
2018-09-11 14:30:19 -04:00
8608fc97be
fix trms=>terms
2018-09-10 15:11:57 -04:00
0ee261fae3
get rid of code that hid the close/back button on events if there was no history.
2018-09-10 15:11:41 -04:00
534aebb21f
When loading previous and subsequent log lines, merge the fields in the filters instead of replacing
2018-09-09 16:36:09 -04:00
55dcb161ae
find should always return an array
2018-09-09 13:59:10 -04:00
b4f80fbe11
Always return an array from find
2018-09-09 13:56:29 -04:00
Isaac Connor
Damir Merdan
raTmole
Isaac Connor
Isaac Connor
Pliable Pixels
Andrew Bauer
Dhanika Bulathsinhala
Pliable Pixels
Andy Bauer