Isaac Connor
|
c837a17aea
|
Add a warning about missing EndTime term on UpdateDiskSpace
|
2020-08-18 13:25:18 -04: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 |
|
Andrew Bauer
|
de0a4a18ee
|
fix checkbox column
|
2020-08-16 18:00:11 -05:00 |
|
Andrew Bauer
|
5468c0322e
|
appease the eslint nanny
|
2020-08-16 16:30:35 -05:00 |
|
Andrew Bauer
|
0cbf559821
|
only hide cols if cookie not exist
|
2020-08-16 16:02:43 -05:00 |
|
Andrew Bauer
|
7c72e1fa08
|
fix cookie issue with bootstrap-table
|
2020-08-16 15:39:20 -05:00 |
|
Andrew Bauer
|
33ea9de8cf
|
better spacing archived & emailed tinytext
|
2020-08-16 15:19:08 -05:00 |
|
Andrew Bauer
|
f27f6e6394
|
fix archive buttons, remove asterisk from event name
|
2020-08-16 14:46:56 -05:00 |
|
Andrew Bauer
|
94d666b296
|
tiny text under event name, add emailed column
|
2020-08-16 14:41:50 -05:00 |
|
Isaac Connor
|
e5dda8d142
|
Include avutils/imgutils.h to support compile on libav-tools
|
2020-08-16 14:56:52 -04:00 |
|
Andrew Bauer
|
ee31761627
|
cleanup & consolidate events view buttons
|
2020-08-16 13:44:18 -05:00 |
|
Andrew Bauer
|
9be63f1d99
|
reorganize and init eventTable
|
2020-08-16 11:34:37 -05:00 |
|
Andrew Bauer
|
93475bef7e
|
eslint nanny
|
2020-08-15 16:08:53 -05:00 |
|
Andrew Bauer
|
252bf7995a
|
eslint nannt
|
2020-08-15 15:54:58 -05:00 |
|
Andrew Bauer
|
1c558b66e7
|
add font-awesome stylesheet
|
2020-08-15 15:44:54 -05:00 |
|
Andrew Bauer
|
50a1ceb48a
|
add bootstrap-table.min.css
|
2020-08-15 15:37:02 -05:00 |
|
Andrew Bauer
|
45fde13535
|
rough in new events view
|
2020-08-15 15:27:58 -05:00 |
|
Isaac Connor
|
c87886f5a5
|
Fix v4l2 channel and palette dropdowns allowing the saving of local monitors.
|
2020-08-15 12:31:30 -04:00 |
|
Andrew Bauer
|
e5046803b0
|
fix missing eoan docker image
|
2020-08-13 13:53:51 -05:00 |
|
Andrew Bauer
|
7225281771
|
enlarge event thumbs on hover
|
2020-08-13 12:50:59 -05:00 |
|
Andrew Bauer
|
b45c4fac1f
|
tighten up event column spacing
|
2020-08-13 12:33:13 -05:00 |