Isaac Connor
|
c6bf502ee7
|
only show each Storage area if there are less than 4.
|
2017-12-22 11:39:27 -08:00 |
Isaac Connor
|
0c350b8f41
|
add ServerId to Storage
|
2017-12-22 11:38:59 -08:00 |
Isaac Connor
|
0d7fff761c
|
upgrade find_all to take parameters
|
2017-12-22 11:38:42 -08:00 |
Isaac Connor
|
bb8e326392
|
Fix not restarting a monitor if it has moved to a different server
|
2017-12-22 09:16:56 -08:00 |
Isaac Connor
|
cc8ed75eb9
|
Merge branch 'storageareas' of github.com:connortechnology/ZoneMinder into storageareas
|
2017-12-22 09:03:11 -08:00 |
Isaac Connor
|
f51259443c
|
fix disk_used_percentage to use db calculated used size
|
2017-12-22 09:02:49 -08:00 |
Isaac
|
9dfad4886d
|
fix saving Monitors
|
2017-12-22 16:13:00 +01:00 |
Isaac Connor
|
148e21d707
|
fugro
|
2017-12-21 21:46:21 -05:00 |
Isaac Connor
|
915ea93348
|
source remote server when streaming event
|
2017-12-21 16:53:46 -08:00 |
Isaac Connor
|
f036e95793
|
fix Moving when Medium Scheme
|
2017-12-21 16:53:22 -08:00 |
Isaac Connor
|
332cfb5af2
|
Merge branch 'storageareas' of github.com:ConnorTechnology/ZoneMinder into storageareas
|
2017-12-20 21:22:52 -05:00 |
Isaac Connor
|
2c1aa2a92f
|
missing ;
|
2017-12-20 21:22:37 -05:00 |
Isaac Connor
|
efc7b7d85a
|
Merge pull request #71 from digital-gnome/storageareas-datpickerfixes
Fix missing change to StartDateTime
|
2017-12-20 15:56:17 -05:00 |
digital-gnome
|
8bfdb73d24
|
Fix missing change to StartDateTime
Fixes filter loading from events if clicked from last hour link.
|
2017-12-20 15:46:03 -05:00 |
Isaac Connor
|
89d284b4ea
|
Merge pull request #70 from digital-gnome/storageareas-datpickerfixes
Allow nondate values
|
2017-12-20 15:25:52 -05:00 |
digital-gnome
|
b4c0f13adf
|
Allow nondate values
Supports -# days/hours/etc
|
2017-12-20 15:23:14 -05:00 |
Isaac Connor
|
e9141ca3e8
|
re-init logger after loading config to actually pick up the appropriate values. This stops the error logging of Info to weblog when weblog is actually set to None. Also update quotes
|
2017-12-20 10:19:24 -05:00 |
Isaac Connor
|
85b7baa131
|
Fix event Groups associations
|
2017-12-19 18:09:41 -05:00 |
Isaac Connor
|
e47c8fad88
|
Merge branch 'storageareas' of github.com:ConnorTechnology/ZoneMinder into storageareas
|
2017-12-19 11:01:42 -05:00 |
Isaac Connor
|
2922a86d23
|
fixes to new Storage Schemes code
|
2017-12-19 11:01:03 -05:00 |
Isaac Connor
|
1fe597c9cc
|
Merge pull request #69 from digital-gnome/filtersfix
Default value for new brackets
|
2017-12-19 09:55:33 -05:00 |
digital-gnome
|
d034ae9ab2
|
Default value for new brackets
|
2017-12-18 22:58:38 -05:00 |
Isaac Connor
|
5f4b2ca53f
|
don't close the session when logging in
|
2017-12-18 14:35:11 -05:00 |
Isaac Connor
|
46673bafdb
|
Merge pull request #68 from digital-gnome/montagereview-datepicker
Montagereview datepicker
|
2017-12-18 13:39:58 -05:00 |
Isaac Connor
|
8a8001f14a
|
fix missingc_str()
|
2017-12-18 13:25:24 -05:00 |
Isaac Connor
|
705a98276f
|
change StorageScheme to Scheme
|
2017-12-18 13:17:43 -05:00 |
Isaac Connor
|
dcfae11fc7
|
fix typos
|
2017-12-18 13:16:54 -05:00 |
Isaac Connor
|
0e2d2ce611
|
fix typos
|
2017-12-18 13:05:04 -05:00 |
Isaac Connor
|
c93de992c2
|
add Scheme to the list of fields
|
2017-12-18 13:04:57 -05:00 |
Isaac Connor
|
d312482a2b
|
add StorageScheme to Storage and Events. Deprecate ZM_USE_DEEP_STORAGE
|
2017-12-18 12:52:26 -05:00 |
Isaac Connor
|
be017d526e
|
Merge pull request #67 from digital-gnome/storageareas-filters
Filter page update/fixes
|
2017-12-18 11:13:24 -05:00 |
digital-gnome
|
a6b136ed40
|
dark theme fixes
Overrides bootstrap input colors for dark theme and more chosen
|
2017-12-18 09:50:08 -05:00 |
digital-gnome
|
88a1e3eb4d
|
Fix bad copy
|
2017-12-17 22:29:56 -05:00 |
digital-gnome
|
de6ebfc341
|
Remove chosen from some filter dropdowns and restyle to match
|
2017-12-17 22:04:10 -05:00 |
digital-gnome
|
804339f54f
|
Limit date range and only reload page after change is done
|
2017-12-17 16:44:57 -05:00 |
digital-gnome
|
5d190dedff
|
Set brackets width and allow blank
|
2017-12-17 14:25:50 -05:00 |
digital-gnome
|
bb75e6a6ea
|
Disallow future dates
|
2017-12-17 14:24:58 -05:00 |
digital-gnome
|
173ad4f75a
|
Add datepicker to montagereview
|
2017-12-17 09:22:31 -05:00 |
digital-gnome
|
6ffa96dea3
|
Add chosen to filters
|
2017-12-16 23:10:20 -05:00 |
digital-gnome
|
c8cfb47f9f
|
More bootstrap in datepicker
|
2017-12-16 23:10:19 -05:00 |
digital-gnome
|
9d87f7fe18
|
Use bootstrap icons in datepicker
|
2017-12-16 20:10:02 -05:00 |
digital-gnome
|
a091153929
|
Use seperate structure and theme jquery ui
|
2017-12-16 20:04:12 -05:00 |
digital-gnome
|
b6917d8b71
|
Fix initial time parsing
|
2017-12-16 09:08:50 -05:00 |
digital-gnome
|
d7532b0340
|
Add dateTime picker to filter
|
2017-12-15 22:57:42 -05:00 |
digital-gnome
|
2e56210007
|
Fix row highlighting
|
2017-12-15 22:56:49 -05:00 |
digital-gnome
|
eec174750e
|
Default for conjunction
|
2017-12-15 09:06:40 -05:00 |
digital-gnome
|
c0fcfe6eb6
|
Combine possible sort inputs to one in sortQuery, output limitQuery
|
2017-12-15 08:47:08 -05:00 |
digital-gnome
|
ce0a8c4486
|
Add sort/limit to filter object on pageload
|
2017-12-15 08:47:07 -05:00 |
digital-gnome
|
e192d664fd
|
WIP pass sort and limit
|
2017-12-15 08:47:07 -05:00 |
digital-gnome
|
dee976cf1a
|
parseRows just needs to recreate the php logic
|
2017-12-15 08:47:06 -05:00 |