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

5427 Commits

Author SHA1 Message Date
Isaac Connor 46032385fe fix viewport on mobile. Fix duplicated css when selected css is base 2019-06-22 14:10:55 -04:00
Isaac Connor 38bcdbbffe ONly close session if we opened it in generateAuthHash, only try to validate auth hash if it is set in the session 2019-06-21 18:04:39 -04:00
Isaac Connor 85b9b045cc Copy Profile Token to ControlDevice for use with Netcat PTZ script 2019-06-21 12:42:26 -04:00
Isaac Connor 60618d5998 Fix hour subtraction in getAuthUser to actually subtract an hour 2019-06-21 11:45:33 -04:00
Isaac Connor 3bae7a5432 spaces and parenthesis 2019-06-20 13:28:12 -04:00
Isaac Connor 199e8182be Merge branch 'master' of github.com:ZoneMinder/zoneminder 2019-06-19 08:36:48 -04:00
Isaac Connor dc7707bbc1 fix an oninput and use validHtmlStr on ServerNames storageName MonitorName etc in dropdowns 2019-06-18 10:03:14 -04:00
Tom Hodder 1336c03f97 WIP: Add pagination to frames.php in classic (#2618) 
* add pagination to the frames.php results

* remove commented code, fix view all paging

* removing debugging logging statements

* default frames paging to on
 2019-06-16 12:02:00 -04:00
Pliable Pixels 98bf7800b0 remove a password log, corrected PHP version in log (#2627) 
* remove a password log, corrected PHP version in log

* PHP version correction
 2019-06-16 11:59:48 -04:00
Pliable Pixels c4dc5f34e4 add event file system path to API (#2639) 2019-06-16 11:59:23 -04:00
Isaac Connor ec7b373913 fix structure of events_by_monitor_id 2019-06-11 14:38:51 -04:00
Isaac Connor 1e7cf8c7cf fix eslint, Fix video not resuming after setting speed to 0. 2019-06-11 14:38:28 -04:00
Isaac Connor 3a91880e2e Merge branch 'storageareas' 2019-06-10 16:01:03 -04:00
Isaac Connor 1eadb814e2 Fix use of onclick and onchange. Fix bulk frame lookup. Make scanning events more efficient 2019-06-10 15:59:19 -04:00
Isaac Connor 265e49fe45 Add a newline after each filter group to make the code easier to read 2019-06-10 15:58:17 -04:00
Isaac Connor 1749a7a4f9 fix extra closing button tag in shutdown button. Add a newline after each Storage group to make the code easier to read 2019-06-10 15:57:53 -04:00
Isaac Connor b9ea9ce0ae Merge branch 'master' into storageareas 2019-06-07 14:40:43 -04:00
Isaac Connor 9b507734b2 spacing 2019-06-06 13:49:24 -04:00
Isaac Connor 41714c676d Merge branch 'master' of github.com:ZoneMinder/zoneminder 2019-06-06 13:40:09 -04:00
Isaac Connor dfc60baf85 fix eslint spacing 2019-06-06 13:40:00 -04:00
fri.K b254e1e392 For column name title field should be taken instead of array name (#2635) 2019-06-06 12:58:33 -04:00
fri.K 43d24cda8e Completed Polish translation (#2634) 
* Completed Polish translation

* Changing translation to be simillar with other lines
 2019-06-05 17:07:32 -04:00
Isaac Connor 08cc4e0383 add null value to set() function 2019-06-05 10:22:20 -04:00
Isaac Connor 5346f82de9 Fix unable to login when ZM_AUTH_RELAY != hashed and fix setting the password in session when ZM_AUTH_RELAY==plain 2019-06-05 09:23:34 -04:00
Isaac Connor 83b00c2cd1 Merge branch 'master' into storageareas 2019-06-04 16:43:43 -04:00
Isaac Connor 4b9b2015cb write a note why regnerateAuthHash doesn't work when saving config 2019-06-04 16:30:57 -04:00
Isaac Connor cc269378cf regenerate auth_hash in session because we might have changed an auth hash setting 2019-06-04 16:27:25 -04:00
Isaac Connor 168aa35461 force regeneration of auth_hash on login. Fix failed auth_hash verification not logging you out by returning null instead of false. Update session with new auth_hash when forcing regeneration 2019-06-04 16:26:29 -04:00
Isaac Connor 86ad96b788 increase height of donate popup to hold all content 2019-06-04 12:08:08 -04:00
Isaac Connor 7649f5d6b9 Merge branch 'master' of github.com:ZoneMinder/zoneminder 2019-06-04 10:33:14 -04:00
Isaac Connor 9d6091e271 better fix for #2453. Pushing an element causes td's within td's. Weird formatting, etc. We use an html escaping function to prevent XSS 2019-06-04 10:32:54 -04:00
Tom Hodder a6f3303859 add options help to linked monitors option (#2633) 
* add options help to linked monitors option

* fix typo and clarify instructions for new widget
 2019-06-04 10:05:08 -04:00
Isaac Connor 7445f5588f show storage when there are 4 areas. Used to only do it for < 4 2019-05-31 11:01:09 -04:00
Isaac Connor aefd735abb quotes 2019-05-31 11:00:30 -04:00
Isaac Connor eaa1939f6b comment out debug lines 2019-05-31 10:35:54 -04:00
Isaac Connor 274737d1b1 Fix moocord to mocord. 2019-05-31 10:35:18 -04:00
Isaac Connor b0869a0b13 spaces and quotes 2019-05-31 10:34:53 -04:00
Isaac Connor 75ec4818a6 WHen saving a monitor, only start zmc and zma if appropriate 2019-05-31 10:15:02 -04:00
Isaac Connor ba96f0709c fix saving user using password_hash 2019-05-30 09:58:54 -04:00
Isaac Connor 628760d5b9 Spacing and braces cleanup from asker's code 2019-05-29 10:29:03 -04:00
Isaac Connor 8e0f828aa1 Add APIEnabled to translations 2019-05-29 10:28:42 -04:00
Isaac Connor ee0c21d587 Add API Enabled to User edit 2019-05-29 10:28:25 -04:00
Isaac Connor 722411475d Fix +/- buttons on new line in filter not having onclick events bound 2019-05-29 09:23:56 -04:00
Isaac Connor 21761a35ad Merge branch 'master' of github.com:ZoneMinder/ZoneMinder 2019-05-29 08:40:52 -04:00
Isaac Connor 07d4310466 Can't cache-bust jquery-ui-theme.css as it loads sprites by relative path 2019-05-29 08:40:48 -04:00
Pliable Pixels bc0565858b check for API disabled only when auth is on (#2624) 2019-05-28 13:44:06 -04:00
Isaac Connor c4d76f03c9 Introduce ZM_PATH_SHUTDOWN to cmake config 2019-05-27 12:09:32 -04:00
Isaac Connor ac8197f2e5 fix eslint errors in monitor.js 2019-05-27 11:25:49 -04:00
Isaac Connor 3c5d20a2e1 when an event view is scaled, adjust the frame popup window size accordingly 2019-05-24 15:06:37 -04:00
Isaac Connor fad919adec Fix incorrect fix for dealing with bulk frames. prev and next fid should just be +/- 1, so that we show the actual capture frame as opposed to the non-existent db frame record. Fix is by specifying the EventId as well 2019-05-24 14:59:33 -04:00