Commit Graph

10382 Commits

Author SHA1 Message Date
Isaac Connor 56e879da7b should only cpoy sizeof(path)-1 to leave space for null terminator 2017-12-12 12:37:04 -05:00
Isaac Connor a9bbe3e85c remove debug lines 2017-12-12 12:36:35 -05:00
Isaac Connor 16ac341642 locallist return code vars, they don't need to be class members 2017-12-12 12:35:54 -05:00
Isaac Connor a0f79b7bf7 add CFG_UNKNOWN and use it in the .cpp to quiet coverity 2017-12-12 12:35:28 -05:00
Isaac Connor 49be06d641 move freeaddrinfo up before a return to prevent memleak 2017-12-12 12:35:05 -05:00
Isaac Connor 475d39f1c6 move closedir down so that it always happens. Make coverity quiet 2017-12-12 12:34:43 -05:00
Isaac Connor 819c2e5190 fix possible not null-terminated strncpy. Wouldn't actually happen because we are copying from the db field which is 1 smaller than the variable but Coverity doesn't know that. 2017-12-12 11:48:12 -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 eebc7ce856 code doc 2017-12-12 11:16:17 -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 f64d65e6d7 Make db errors not fatal when deleting an event 2017-12-12 10:55:09 -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
Isaac Connor de10eaf4fe
Merge pull request #64 from digital-gnome/storageareas-controlcss
Storageareas controlcss
2017-12-10 14:18:32 -05:00
Andrew Bauer 0d9f330356 call zmcamtool during postinst (#2021) 2017-12-10 14:14:39 -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
Andy Bauer a2d266f8f9 fix floreen ptz control sql 2017-12-09 16:05:42 -06:00
Isaac Connor a867c488e0 ned to actually remove the MonitorIds column 2017-12-09 14:05:18 -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
Isaac Connor 3b5e70c51a
Merge pull request #62 from digital-gnome/storageareas-robotsmerge
Storageareas robotsmerge
2017-12-07 21:50:09 -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 bbe75762e7 remove boost 2017-12-07 09:40:00 -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
Isaac Connor afdff762fc
Merge pull request #60 from digital-gnome/storageareas-fixmissing
Storageareas fixmissing
2017-12-06 11:06:55 -05: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
Isaac Connor d4cf9ec66a
Merge pull request #59 from digital-gnome/storageareas-css
Storageareas css
2017-12-05 21:46:59 -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 e46f75c130 fix db update 2017-12-05 15:22:15 -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
Isaac Connor 6b2eb89a61
Merge pull request #58 from digital-gnome/storageareas-view-button
Storageareas view button & popups
2017-12-05 14:39:03 -05:00
digital-gnome 6edb0247ef Fix popup detection 2017-12-05 13:27:39 -05:00
Isaac Connor 073b055b4c fix Event Moving 2017-12-05 10:21:43 -08:00
Isaac Connor b1a887dbd8 fixes to move Event 2017-12-05 10:02:21 -08:00
digital-gnome 37cdcb89c4 Fix view button in events view 2017-12-05 12:50:49 -05:00
Isaac Connor 82bed8f3fa actually delete the old files when we move an event 2017-12-05 08:43:13 -08:00