ZaneYork
/
zoneminder
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
6,826 Commits 20 Branches 69 Tags 131 MiB
Commit Graph

6826 Commits

Author SHA1 Message Date
Isaac Connor e64376ed02 increase debug level for Zone motion detection 2016-05-05 14:51:41 -04:00
Isaac Connor 88a0bdc026 Add some code comments. Make mocord always honour section_length 2016-05-05 14:51:26 -04:00
Isaac Connor e8cbb90125 increase log debug level for blend routing reporting 2016-05-05 14:50:50 -04:00
Isaac Connor 1f6425b1b7 Fix for SQL to load next and previous event 2016-05-05 14:50:15 -04:00
Isaac Connor 0e74778dda add find and find_all functions 2016-05-05 14:49:57 -04:00
Isaac Connor df960bb1ea rework image.php view to properly handle fid being the FrameId instead of fid. Fix scaling. 2016-05-05 14:49:40 -04:00
Isaac Connor d342b11e64 remove servers references from header, they go in console 2016-05-04 09:07:29 -04:00
Isaac Connor 36f94dddec cleanup merge problems 2016-05-03 14:46:22 -04:00
Isaac Connor d25e75f485 Merge branch 'updated-console' of github.com:ZoneMinder/ZoneMinder into updated-console 2016-05-03 14:39:59 -04:00
Isaac Connor c3628a8dfd Merge branch 'updated-console' into storageareas 2016-05-03 14:34:58 -04:00
Isaac Connor 4defe92911 Merge branch 'master' into updated-console 2016-05-03 14:22:37 -04:00
Isaac Connor 18442be77f Merge branch 'merge_db_connects' into storageareas 2016-05-03 14:09:18 -04:00
Kyle Johnson 59d0de4313 Merge branch 'updated-console' of github.com:ZoneMinder/ZoneMinder into updated-console 2016-05-03 13:56:57 -04:00
Kyle Johnson 36da4aed88 Push monitor view back to before I messed with it 2016-05-03 13:55:38 -04:00
Kyle Johnson 59af3913e7 Add additional post-compiliation files to .gitignore 2016-05-03 13:55:38 -04:00
Kyle Johnson b92c9f9be4 Add state modal to options view 2016-05-03 13:55:38 -04:00
Kyle Johnson 3271d17a3a Remove header from log view 2016-05-03 13:55:38 -04:00
Kyle Johnson bfda50b693 Also don't load additional JS to Log view 
Another issue with mootools & jquery conflicts
 2016-05-03 13:55:38 -04:00
Kyle Johnson dcd6449a9b Don't include extra js libraries for monitor view. 
This is a workaround for an issue where you couldn't change tabs
whlie in the monitor view, but probably makes sense anyway.
 2016-05-03 13:55:38 -04:00
Kyle Johnson 464db86c53 Revert "Add sidebar and top nav to Monitors popup view" 
This reverts commit 315fb3e857.
 2016-05-03 13:55:38 -04:00
Kyle Johnson 237f1c3a9c Change sidebar to lighter colors 2016-05-03 13:53:30 -04:00
Kyle Johnson 6a48b9041a Revert "Include Chart.js" 
This reverts commit 33d6d311b0.

Didn't mean to add this code in yet.  For a future feature.
 2016-05-03 13:53:30 -04:00
Kyle Johnson 44fbbee152 Major rewrite of states view. Now a modal on every page. 
Read: No longer an HTML popup window.

 * State html is now included toward the bottom of every page
 * The states.js has been rewritten in jquery
 * Applying, deleting or saving a state reloads the page after the POST is done
 2016-05-03 13:53:30 -04:00
Kyle Johnson 800378b095 Add state view's js and php to all pages as it is now part of header 2016-05-03 13:53:30 -04:00
Kyle Johnson 2e2cc3d9ab Change 'marked' row style to bootstrap 'danger' and find it with jquery 2016-05-03 13:53:30 -04:00
Kyle Johnson 62fc4dff7e Change class of delete button to be red 2016-05-03 13:53:30 -04:00
Kyle Johnson 0f5089bbf8 Fix button alignment on console page, and add button styling 2016-05-03 13:53:30 -04:00
Kyle Johnson f305a6ffc8 Replace console table css with styles from bootstrap 2016-05-03 13:53:30 -04:00
Kyle Johnson 8b5693129b Include Chart.js 2016-05-03 13:53:30 -04:00
Kyle Johnson 0bb08a6256 clean up options a bit more 2016-05-03 13:51:54 -04:00
Kyle Johnson 291179d3b1 Add side tab list to options page, and style it. 2016-05-03 13:51:54 -04:00
Kyle Johnson cf6f36b0e5 Add header to log view 2016-05-03 13:51:54 -04:00
Isaac Connor 3e51429fb0 Move skin and css changing up above the include of header.php so that the set cookie call will work 2016-05-03 13:51:54 -04:00
Isaac Connor e435b3ebed remove duplication 2016-05-03 13:51:54 -04:00
Kyle Johnson d698f2af14 Restyle the header. Full width, dark background, collapseable. 2016-05-03 13:51:54 -04:00
Kyle Johnson 6c1f53cbdc Load jquery and bootstrap js in classic skin 2016-05-03 13:51:54 -04:00
Kyle Johnson 27c9d06aee Add local copy of bootstrap.js 3.3.6 2016-05-03 13:51:54 -04:00
Kyle Johnson eb443e371f Update doctype to html5, and add additional meta tags 2016-05-03 13:51:54 -04:00
Kyle Johnson ff15fdb6d9 Make the ZM logo in header stand out 2016-05-03 13:51:54 -04:00
Kyle Johnson 7a6dae69f0 Convert options layout to side-tabs, and improve readability 2016-05-03 13:51:54 -04:00
Kyle Johnson d95cf8dae5 Push the options page down a bit to make tab look better 2016-05-03 13:51:54 -04:00
Kyle Johnson d12fc95ad1 Restyle options view with horizontal form layout 2016-05-03 13:51:54 -04:00
Kyle Johnson 2214cb6389 Add styling to delete / save / add buttons in options.php 2016-05-03 13:51:54 -04:00
Kyle Johnson b317797a6c Remove cancel button from options as it no longer makes sense. 2016-05-03 13:51:54 -04:00
Kyle Johnson 2a9b10e80e Update options.php to use bootstrap container 2016-05-03 13:51:54 -04:00
Kyle Johnson be8385535d Oops. Move Console view outside of canView(system) restriction 2016-05-03 13:51:54 -04:00
Kyle Johnson 858845e3a1 Add a link back to console in header 2016-05-03 13:51:54 -04:00
Kyle Johnson a8c7ec250d Make the Options link a standard href (not a popup). 2016-05-03 13:51:54 -04:00
Kyle Johnson 25c9328187 Move console php code to header as that code is now needed in additional views. 2016-05-03 13:51:54 -04:00
Kyle Johnson cd8e8d9685 Move the header into its own file, and include it in options view. 2016-05-03 13:51:34 -04:00