Commit Graph

15681 Commits

Author SHA1 Message Date
Isaac Connor 2773737e54 Use gcc builtin functions for cpuid 2020-08-19 16:57:20 -04:00
Andrew Bauer 8f70ae192d enable thumbnail zoom on frames view 2020-08-19 15:42:35 -05:00
Andrew Bauer a903a885b6 whitepsace 2020-08-19 14:07:00 -05:00
Andrew Bauer 842efc1574 remove <a> tags from col headers 2020-08-19 12:31:13 -05:00
Andrew Bauer 74b0ad2cb3 get rid of horizontal scrollbar in frames 2020-08-19 12:20:57 -05:00
Andrew Bauer f317bf1722
fix copy/paste typo 2020-08-19 12:07:31 -05:00
Andrew Bauer e38a532b78 rough new frames view 2020-08-19 12:04:08 -05:00
Andrew Bauer ad9b9d91cc disable the back button when new page 2020-08-18 16:57:03 -05:00
Andrew Bauer 610ec2f78c
Update .travis.yml 2020-08-18 16:29:10 -05:00
Andrew Bauer e189e99353
Update zoneminder.spec 2020-08-18 15:37:37 -05:00
Andrew Bauer de075a2733
fix typo 2020-08-18 15:13:45 -05:00
Andrew Bauer 3664a9b42c set the pagination list 2020-08-18 15:12:07 -05:00
Andrew Bauer 1e41bd0823 whitespace 2020-08-18 13:48:18 -05:00
Andrew Bauer 6eb7b6d51c set the right toolbar btn class to match 2020-08-18 13:13:32 -05:00
Andrew Bauer df02d84a56 don't go back if not referred 2020-08-18 13:08:17 -05:00
Andrew Bauer 2c9caeb348 whitespace 2020-08-18 12:40:27 -05:00
Isaac Connor 2d5522df14 Merge branch 'master' of github.com:ZoneMinder/zoneminder 2020-08-18 13:25:21 -04:00
Isaac Connor c837a17aea Add a warning about missing EndTime term on UpdateDiskSpace 2020-08-18 13:25:18 -04:00
Andrew Bauer bf63500b08 fix thumbnail animation after user event 2020-08-18 12:00:20 -05:00
Andrew Bauer a0bc60ceda change not enabling ffmpeg msg to debug 2020-08-18 10:34:07 -05:00
Isaac Connor e6d6ee1b67 Merge branch 'filter_warnings' 2020-08-18 11:17:46 -04:00
Isaac Connor 16efa9dbb2 Add extra checks for Deleting without an Archived State term and Running in the background without any actions. 2020-08-18 11:17:22 -04:00
Andrew Bauer ccda2b3707 EPIPE sets zm_terminate so no need to check 2020-08-18 09:37:21 -05:00
Andrew Bauer 62d687adfa dont warn or error for EPIPE errno's 2020-08-18 09:30:06 -05:00
Andrew Bauer 1627b1d0d1 privacy view page formatting 2020-08-18 09:08:26 -05:00
Andrew Bauer 287c585d3d use translated text for delete confirmation 2020-08-18 08:26:45 -05:00
Andrew Bauer b32bcab91f add a delete confirmation modal 2020-08-18 08:06:58 -05:00
Isaac Connor 768c746944 Merge branch 'release-1.34' of github.com:ZoneMinder/zoneminder into release-1.34 2020-08-18 09:00:20 -04:00
Isaac Connor 4c69d7b748
Merge pull request #3001 from connortechnology/update_users_controller
Update permissions checking when viewing/editing users.  Fixes #2982.…
2020-08-18 09:00:07 -04:00
Isaac Connor a92a16f13e Merge branch 'update_users_controller' into release-1.34 2020-08-17 19:33:31 -04:00
Isaac Connor 7e679809f2 Merge branch 'update_users_controller' 2020-08-17 19:31:30 -04:00
Isaac Connor 610f73a835 Merge branch 'release-1.34' 2020-08-17 19:30:32 -04:00
Isaac Connor 57b4d2b278 Merge branch 'release-1.34' of github.com:ZoneMinder/zoneminder into release-1.34 2020-08-17 19:29:07 -04:00
Isaac Connor 3de2135f18 Merge branch 'master' of github.com:ZoneMinder/zoneminder 2020-08-17 18:31:24 -04:00
Andrew Bauer 1dd0b44334 eslint nanny strikes again 2020-08-17 16:59:57 -05:00
Isaac Connor 72f96ed1dd Merge branch 'master' of github.com:ZoneMinder/zoneminder 2020-08-17 17:44:21 -04:00
Andrew Bauer 80b92573b8 set the icons used in bstable toolbar 2020-08-17 16:18:18 -05:00
Andrew Bauer 3e5bfc445f fix checkbox column disappearing 2020-08-17 12:10:35 -05:00
Isaac Connor 11659249f0 Merge branch 'master' of github.com:ZoneMinder/zoneminder 2020-08-17 12:56:35 -04:00
Andrew Bauer 11afad5c92 add pagination on/off toggle 2020-08-17 11:02:25 -05:00
Isaac Connor 477152a4c4 Merge branch 'master' of github.com:ZoneMinder/zoneminder 2020-08-17 09:55:16 -04:00
Isaac Connor 87175ccd49 Use ZM_DB_HOST when altering user permissions 2020-08-17 09:55:09 -04:00
Isaac Connor f0fbf77726 Change TMP back to /var/tmp. This is used mostly for exports so it needs to not be ram-based. 2020-08-17 09:51:23 -04:00
Andrew Bauer 9bc1b6a34e change icon color on hover 2020-08-17 08:37:03 -05:00
Andrew Bauer e19d1f507e fix bootstrap-table-cookie correctly 2020-08-17 08:05:50 -05:00
Andrew Bauer 7fed6f9c29 shift thumbnail animation away from edge 2020-08-16 21:08:07 -05:00
Isaac Connor 1a6154752a Merge branch 'master' of github.com:ZoneMinder/zoneminder 2020-08-16 20:08:49 -04:00
Isaac Connor a8455d4ecf Add necessary globals 2020-08-16 20:08:42 -04:00
Isaac Connor 2021f561fa Import as a global 2020-08-16 20:08:26 -04:00
Isaac Connor ea4edcbc94 Make a global so tht we can use it in export_functions 2020-08-16 20:08:14 -04:00