Commit Graph

3050 Commits

Author SHA1 Message Date
Kevin Crider 5178d4fa37 Added "Function" column to the $monitors array to fix issue 140 2013-09-18 17:24:52 -04:00
Kevin Crider d7fd5566a7 Fixes issue 129 - Bandwidth is now updated in the UI after changing it 2013-09-18 17:10:17 -04:00
Kevin Crider bf8f799c4c Moved delete button to the sidebar 2013-09-18 16:46:44 -04:00
Kevin Crider 0cf11adb99 Removed logging line from deleteSelected function 2013-09-18 15:55:50 -04:00
Kevin Crider c6bbdac0d7 Added ability to delete multiple events at once 2013-09-18 15:53:35 -04:00
Kyle Johnson d0a8d86e3c Merge pull request #155 from WDKevin/modern
Added missing jquery-2.0.1.min.map file and fix monitor sorting
2013-09-18 10:58:00 -07:00
Kevin Crider 0f25bec1d6 Fixes to monitor sorting and reordering 2013-09-18 13:23:16 -04:00
Kevin Crider bcaa0ac36c Added missing jquery-2.0.1.min.map file 2013-09-18 13:16:10 -04:00
Isaac Connor b80ac24c76 Merge branch 'master' of github.com:ZoneMinder/ZoneMinder 2013-09-18 13:00:06 -04:00
Isaac Connor eba8b0dde0 move this into the distros dir 2013-09-18 12:51:10 -04:00
Kyle Johnson 08e224f2af Merge pull request #154 from WDKevin/modern
Add support to change order of monitors
2013-09-18 09:43:08 -07:00
Kevin Crider 4430399b1e Removed logging of post data 2013-09-18 12:37:01 -04:00
Kevin Crider b0c5732620 Merge branch 'modern' of https://github.com/WDKevin/ZoneMinder into modern 2013-09-18 12:25:04 -04:00
Kevin Crider 6dfdba7023 Added ability to reorder monitors on the dashboard 2013-09-18 12:22:14 -04:00
Kevin Crider 20def177ef Added ability to reorder monitors on the dashboard 2013-09-18 12:14:15 -04:00
Andy Bauer d02f6ee0d3 Merge branch 'debian2' of https://github.com/knnniggett/ZoneMinder into knnniggett-debian2 2013-09-17 18:39:33 -05:00
Andy Bauer 4123f2be1c Can't seem to catch a break tonight. Moving dian files into correct folder. 2013-09-17 18:32:53 -05:00
Andy Bauer d7dc4ce4ed Merge branch 'debian' of https://github.com/knnniggett/ZoneMinder into knnniggett-debian 2013-09-17 18:02:24 -05:00
Andy Bauer e30a43bc0a Move debian folder under distros 2013-09-17 17:50:50 -05:00
Kyle Johnson f716fbb237 Open the Config Option tab by default 2013-09-17 12:48:38 -04:00
Kyle Johnson f7b7a49616 shoNoImage was always being called as the $mon variable was incorrect 2013-09-17 09:43:48 -04:00
Kyle Johnson ddec9a0dd8 Fixes 147 - there were unescaped quotes 2013-09-17 09:28:42 -04:00
Kyle Johnson 17b60bf25f Merge branch 'modern' of github.com:ZoneMinder/ZoneMinder into modern 2013-09-17 09:13:03 -04:00
Kyle Johnson e694616702 Reworked the Config view to display options in rows using bootstrap.
This commit fixes #134
2013-09-17 09:07:35 -04:00
Kyle Johnson 064b86c95f Added my events dir to the gitignore list 2013-09-17 08:54:53 -04:00
Kyle Johnson e0423570bd Added classes to take care of smaller and larger displays 2013-09-17 08:50:46 -04:00
mastertheknife 5a9364703c a better fix for the sign comparison warnings during compilation 2013-09-17 10:28:59 +03:00
Andy Bauer 7d5e0d3ba2 Update README.Fedora
Update README.Fedora installation instructions. Fixes issue #145.
2013-09-16 08:21:37 -05:00
Chris Wiggins dc316b0aee Add static image when the monitor/system is not enabled/running 2013-09-16 22:00:27 +12:00
Chris Wiggins 6c60813a6f Merge branch 'modern' of github.com:ZoneMinder/ZoneMinder into modern 2013-09-16 13:13:07 +12:00
Chris Wiggins 7f1589a74e Search for a different string in zmdc.pl to correctly determine if ZM is running or not 2013-09-16 13:11:01 +12:00
Andy Bauer 46aa2e0ebb Merge pull request #141 from knnniggett/redhat
Removing the redhat folder from the root for real this time
2013-09-15 15:07:39 -07:00
abauer 2858a58f79 Removing the redhat folder from the root for real this time 2013-09-15 17:03:40 -05:00
Andy Bauer ee5413f5d9 Merge pull request #136 from knnniggett/redhat
Add Redhat rpm dev files to distros/redhat
2013-09-15 14:41:37 -07:00
abauer efc729110a Move redhat folder to a subfolder called distros 2013-09-15 16:33:09 -05:00
Isaac Connor ab4c091693 change eq's to le's so that it runs scripts for upgrading from 1.26.0 2013-09-15 12:59:45 -04:00
Kyle Johnson 021b775f4a Merge branch 'modern' of github.com:ZoneMinder/ZoneMinder into modern 2013-09-14 22:11:35 -04:00
Kyle Johnson c6d1715948 Removed an unneeded div in the Events view. 2013-09-14 22:10:49 -04:00
Kyle Johnson 3738c3866d Added a link to each event row to delete that event.
This fixes #126 however that issue was not specific enough.  This
commit allows a user to delete individual events.  There is currently
no way to delete multiple events.
2013-09-14 22:09:28 -04:00
Kyle Johnson bf2e46f512 Added a function to delete events.
Currently this only allows single events to be deleted.
2013-09-14 22:05:08 -04:00
mastertheknife c3f7af7cd1 Fix sign warning during compilation 2013-09-15 04:13:09 +03:00
Kyle Johnson 0b5a215dca Use the HtmlHelper::tableHeaders helper to display the table headers 2013-09-14 21:03:31 -04:00
Kyle Johnson f0006404cc Merge pull request #121 from rkojedzinszky/master
Rewrote the logState() sql query to allow mysql to use indexes
2013-09-14 17:43:43 -07:00
Andy Bauer 4cc80d4cc5 Update zoneminder.1.26.el6.spec
Removed reference to a patch that has been added upstream
2013-09-14 12:14:08 -05:00
Andy Bauer a6d3b35996 Delete zoneminder-1.25.0-installfix.patch
no longer needed.  Fix has been added to latest branch.
2013-09-14 12:11:49 -05:00
Kyle Johnson 4cb89e7883 Moved these over to github issues 2013-09-13 15:20:49 -04:00
Kyle Johnson 79d408f028 Update STATUS.md 2013-09-13 15:17:17 -04:00
Kyle Johnson 7b0e4e0a3f Fix formatting 2013-09-13 15:12:37 -04:00
Kyle Johnson 54d25513ff Add basic acceptance criteria for release of this UI. 2013-09-13 15:11:40 -04:00
Kyle Johnson 7496d3e932 Create STATUS.md 2013-09-13 14:59:26 -04:00