Commit Graph

3993 Commits

Author SHA1 Message Date
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 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
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 dcfae11fc7 fix typos 2017-12-18 13:16:54 -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
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
digital-gnome 2cba20ab46 Make form validation not reload page 2017-12-15 08:47:05 -05:00
digital-gnome 2ddb380d0d Remove submitToFilter 2017-12-15 08:47:05 -05:00
digital-gnome db59f06520 Weekday needs to detect start or end as well 2017-12-15 08:47:04 -05:00
digital-gnome 86af2269b2 Move arrays out of ifs, pass to js 2017-12-15 08:47:03 -05:00
digital-gnome a2c785f7eb Move validateForm 2017-12-15 08:47:03 -05:00
digital-gnome 04efff699a Set url when adding terms
Saves changes if reloaded or using back button
2017-12-15 08:47:02 -05:00
digital-gnome f8da9a1c1b Cleanup filter appearance
Tighten up fields and reduce jumping when adding terms.
2017-12-15 08:47:01 -05:00
digital-gnome c936e9e2a9 No longer need line 2017-12-15 08:47:00 -05:00
digital-gnome c1cf356974 Montagereview filter passing in wrong block 2017-12-15 08:47:00 -05:00
digital-gnome 51b4ddb0e4 Add js for filter handling 2017-12-15 08:46:59 -05:00
digital-gnome d5ec45eed7 Include all DateTime possibilities 2017-12-15 08:46:58 -05:00
digital-gnome d2b9614ce7 Change reset to not reload form 2017-12-15 08:46:57 -05:00
digital-gnome fe6a6bec7c Use disabled button rather than remove
Reduces page jumping
2017-12-15 08:46:57 -05:00
digital-gnome 8515e77d67 Add text type to text fields 2017-12-15 08:46:56 -05:00
digital-gnome 9eb03a881d Always have a full line on filter page.
This allows javascript to copy easily
2017-12-15 08:46:55 -05:00
digital-gnome ee5552d9f9 Redirect Events when post
Fixes broken back due to form resubmit
2017-12-13 22:25:28 -05:00
digital-gnome c87d170972 Pass montagereview filter 2017-12-13 22:25:28 -05:00
Isaac Connor 8909184e2c fix 2017-12-13 18:14:14 -05:00
Isaac Connor 7d7e73977f use stored session group 2017-12-13 16:51:56 -05:00
Isaac Connor 046a0dd6e9 need a line break 2017-12-13 16:45:51 -05:00
Isaac Connor abad266c5b introduce chosen to use it to make the filtering dropdowns awesome 2017-12-13 16:15:03 -05:00
Isaac Connor 4a1a9c48d5
Merge pull request #66 from digital-gnome/storageareas-fixBack
Storageareas fix back Redux
2017-12-13 12:40:11 -05:00
digital-gnome 0743a283da Remove back/close if opened in new tab 2017-12-13 12:34:31 -05:00
Isaac Connor 5f82f75e5d Merge branch 'storageareas' of github.com:ConnorTechnology/ZoneMinder into storageareas 2017-12-13 11:21:58 -05:00
Isaac Connor e364641d7b on initial page hit, the cookie might not be set. Use global instead. 2017-12-13 11:21:50 -05:00
Isaac Connor 27c9752f34
Merge pull request #65 from digital-gnome/storageareas-fixBack
Storageareas fix back and montagereview popup
2017-12-13 10:23:50 -05:00
digital-gnome 1f7a5f26ab Fix montagereview event popup 2017-12-13 10:22:15 -05:00
digital-gnome e0c2061954 Fix back if window is opened in new tab. 2017-12-13 10:20:02 -05:00
Isaac Connor c509b6fbf4 fix a quotes problem 2017-12-12 15:46:50 -05:00
Isaac Connor 56ace524ff Merge branch 'storageareas' of github.com:ConnorTechnology/ZoneMinder into storageareas 2017-12-12 11:16:26 -05:00
Isaac Connor 2643ac9f97 fix a quoting problem that prevented saving config 2017-12-12 11:16:08 -05:00
Isaac Connor 9bd12d5b9a set a type on the buttons 2017-12-12 11:15:53 -05:00
Isaac Connor 9fe7ba25e2 improve the download ui 2017-12-11 14:33:17 -08:00
Isaac Connor 5bd5f03611 redo buttons as button tags 2017-12-11 12:51:38 -05:00
Isaac Connor 7108e306cb add popup sizes for server and storage. Increase height of user edit popup 2017-12-11 12:50:30 -05:00
Isaac Connor dd69bc3d7b Merge branch 'master' into storageareas 2017-12-11 11:39:42 -05:00
digital-gnome 1e412af902 Fix float overlap
Avoid explicitly setting some heights, add clear float
2017-12-10 09:37:16 -05:00
digital-gnome 6974c847e5 Fix controlcss
Missing viewCssFileExtra
2017-12-10 09:37:16 -05:00
Isaac Connor ef1af9cc15 disable FilterComponent as it doesn't actually do anything. Add Groups join when needed 2017-12-09 14:03:42 -05:00
digital-gnome 19e50e2bde Also have to remove fixed width 2017-12-07 15:20:54 -05:00
Pliable Pixels 08b5c26a15 2019 maxscoreframeid (#2020)
* added MaxScoreFrameId to address #2019

* consistent quotes
2017-12-07 14:11:06 -05:00
digital-gnome 7db790ec7b Fix dom filling up with comments 2017-12-07 12:54:22 -05:00
digital-gnome 7930e1881f Fix quotes 2017-12-07 11:18:10 -05:00
Isaac Connor bd73e7c2e2 Merge branch 'robots' into storageareas 2017-12-07 10:31:25 -05:00
Isaac Connor fb424a7eef add a robots.txt to the docroot to tell bots to not scrape our ZM install. 2017-12-07 09:32:23 -05:00
kimmeld 1a5d9d5586 Fix monitor sorting (#2015)
Fixed issue #2014
2017-12-06 15:43:33 -05:00
Isaac Connor 9a7ee7a1e3 Merge branch 'storageareas' of github.com:connortechnology/ZoneMinder into storageareas 2017-12-06 10:12:09 -08:00
Isaac Connor e7a43b2618 fix, don't set the storage path to NULL 2017-12-06 10:11:59 -08:00
digital-gnome 43bba23735 Fix filteradd complaining 2017-12-06 10:36:37 -05:00
digital-gnome 11a5a47826 Fix missing popups and styles 2017-12-06 09:42:58 -05:00
digital-gnome b8660e95c9 Dark theme options menu fixes
Override bootstrap to match dark theme
2017-12-05 21:01:17 -05:00
digital-gnome f47f1a89ea Fix btn-primary css to match current themes 2017-12-05 21:01:16 -05:00
Isaac Connor a64e556047 Merge branch 'storageareas' of github.com:connortechnology/ZoneMinder into storageareas 2017-12-05 15:23:37 -08:00
Isaac Connor e0a18143ad include Group Id in list 2017-12-05 15:20:15 -08:00
Isaac Connor d621222ead fix assignment when should be test 2017-12-05 13:26:21 -08:00
digital-gnome 6edb0247ef Fix popup detection 2017-12-05 13:27:39 -05:00
digital-gnome 37cdcb89c4 Fix view button in events view 2017-12-05 12:50:49 -05:00
Isaac Connor 62cc095c98 always load the storageareas array 2017-12-05 08:31:17 -08:00
Isaac Connor 6454594633 fix popup detection and add disk usage and storage area to event. 2017-12-05 08:30:58 -08:00
digital-gnome 34b708bace Handle popups that should remain popups 2017-12-05 09:40:03 -05:00
Isaac Connor d741cc1a72 fix saving Groups 2017-12-04 22:02:56 -05:00
Isaac Connor f7a2db4e49 remove MaxScore from the sorting because it really doesn't make sense to sort by time then maxscore... time is going to be pretty much unique 2017-12-04 21:50:29 -05:00