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

13398 Commits

Author SHA1 Message Date
Andrew Bauer 82672d9b86 stop bcrypt files from installing with zm 2019-06-23 13:20:08 -05:00
Andrew Bauer 00183b535a rename bcrypt to libbcrypt to reflect name of the project 2019-06-23 12:56:04 -05:00
Andrew Bauer 645d13c752 bump rpm specfile to 1.33.9 2019-06-23 12:16:15 -05:00
Andrew Bauer 8b37c0e9b0 remove bcrypt & jwt-cpp as submodules, bring in statically under src 2019-06-23 12:12:12 -05:00
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 ad1df8f80a log the response if command fails, and add missing uthentication sections 2019-06-21 11:40:46 -04:00
Isaac Connor 5a0b30efd5 escape $ 2019-06-21 10:19:48 -04:00
Isaac Connor 55d98e4a9f fix crash 2019-06-20 15:56:25 -04:00
Isaac Connor 470da03322 Merge sync fixes from storageareas 2019-06-20 15:14:20 -04:00
Isaac Connor 3bae7a5432 spaces and parenthesis 2019-06-20 13:28:12 -04:00
Isaac Connor b068428bbc zmcontrol complains about unfinished statement handles. This is because we aren't finishing them in functions in Database.pm 2019-06-20 13:27:42 -04:00
Isaac Connor 199e8182be Merge branch 'master' of github.com:ZoneMinder/zoneminder 2019-06-19 08:36:48 -04:00
Isaac Connor 33951ae584 Print out an error when a monitor is in MONITOR mode because we can't handle alarms. Allow signals to terminate zmu by checking zm_terminate. 2019-06-19 08:36:37 -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 30a210f68f also need to adjust dts of last packet when switching events 2019-06-12 10:05:08 -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 1928d1153f spacing and quotes 2019-06-11 13:32:15 -04:00
Isaac Connor acb95709e6 Fix issues with too much audio in events by storing packets in the queue with their timestamps converted to AV_TIME_BASE_Q, so that we can sort video and audio packets together. 2019-06-11 10:19:42 -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 ee80b086af log the # of db entries being written before doing the writing so that we know the # being written 2019-06-10 14:13:21 -04:00
Isaac Connor 50436c5ea1 Correct debug line listing how many frames are being written to db 2019-06-10 13:59:01 -04:00
Isaac Connor 76763fca0e Merge branch 'master' into storageareas 2019-06-10 12:58:33 -04:00
Isaac Connor 37cc323078 Merge branch 'master' of github.com:ZoneMinder/zoneminder 2019-06-10 12:58:18 -04:00
Isaac Connor ebc9a77c9d When saving jpegs, do a db write on the first frame. Fix test for writing frame info to db. Because we increment frames, it is essentially 1-based. So the test needs to be ==1 instead of ! 2019-06-10 12:57:57 -04:00
Isaac Connor 2e624522c7
fixes #2294 (#2637) 2019-06-10 09:43:56 -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 a16d29740c Fix final frame of event having same id as the second last 2019-06-06 13:49:01 -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 4b8a2a94e3 reduce frame send time too slow to a warning instead of error 2019-06-05 10:12:56 -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