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

3030 Commits

Author SHA1 Message Date
Kyle Johnson 62679e3ff1 Display monitors as bootstrap thumbnails in a grid view 
This will need to be reworked to dynamically determine the number
of rows
 2013-09-11 10:17:47 -04:00
Kyle Johnson dfa2d37c4d Moved the daemonStatus to the header, from the footer 2013-09-11 10:17:10 -04:00
Kyle Johnson 735f85a255 Renamed the thumb_width variable to be width as that is what my helper expects 2013-09-11 10:14:04 -04:00
Kyle Johnson 6a65bef736 Display the system load and free disk space in the nav bar 2013-09-11 09:23:55 -04:00
Kyle Johnson dbba80fcbf Added a function in AppModel to check the free disk space in the events directory 2013-09-11 09:23:13 -04:00
Kyle Johnson 646b511cd4 Added a function in AppModel to check the System Load 2013-09-11 09:22:53 -04:00
Kyle Johnson c41810bbf1 Reworked the paginator number display to play nice with Bootstrap 2013-09-10 20:27:30 -04:00
Kyle Johnson fa3725d377 Put the sidebar into the Bootstrap sidebar 2013-09-10 20:19:03 -04:00
Kyle Johnson d9b6140bf8 Convert the Logs index view to use a bootstrap sidebar 2013-09-10 20:18:25 -04:00
Kyle Johnson 09a3b9e353 Convert the default layout to use Bootstrap 2013-09-10 20:17:44 -04:00
Kyle Johnson 88b8534efb Adding bootstrap CSS and JS files 2013-09-10 19:06:10 -04:00
Andy Bauer 0dd98ccdd1 Merge pull request #119 from knnniggett/zmupdate_zm.1.26.3 
Update zmupdate.pl.in for 1.26.3 release
 2013-09-10 11:16:10 -07:00
Andy Bauer 1d664f22ac exclude zm_update-1.26.3.sql since it has already been added 2013-09-10 13:14:16 -05:00
Andy Bauer 0bf9aacab2 Update zmupdate.pl.in for 1.26.3 release 2013-09-10 12:46:33 -05:00
Kyle Johnson 57ce1bed8d Adding the db/zm_update file so that the upgrade script works 2013-09-10 13:42:56 -04:00
mastertheknife a44bc63d29 Merge branch 'master' of github.com:ZoneMinder/ZoneMinder into mybranch 2013-09-10 19:23:04 +03:00
Kyle Johnson 219f21a904 Bumping the version numbers. 2013-09-10 11:50:39 -04:00
mastertheknife 2b568906e5 Fixed greyscale four field deinterlacing not processing last line, broken ssse3 color->greyscale conversion and improved error handling when reading\decoding jpegs 2013-09-10 18:37:56 +03:00
Isaac Connor f8c4897031 put this back so we can get on with life 2013-09-10 08:52:59 -04:00
Kyle Johnson 64ec75b7a5 Updated AUTHORS to reflect recent changes to the project 2013-09-09 10:06:36 -04:00
mastertheknife c9cf31b271 Merge branch 'master' of github.com:ZoneMinder/ZoneMinder 2013-09-09 17:04:02 +03:00
Kyle Johnson 45c32951b7 Point to the GitHub issues page for the list of current bugs 2013-09-09 09:45:29 -04:00
mastertheknife caa73f608b Merge remote-tracking branch 'origin/develop' 2013-09-09 16:44:58 +03:00
Isaac Connor 1b2b21d1bb rough in a quick script to help people generate the build files 2013-09-08 15:15:58 -04:00
Kyle Johnson 6c134f9b4b Merge pull request #116 from knnniggett/zmupdate_newrelease 
Add 1.26.1 and 1.26.2 releases to zmupdate
 2013-09-07 19:07:37 -07:00
Knniggett 0268389907 initial upload of files used to build rpm 2013-09-07 16:51:54 -05:00
Knniggett 8f3d95fd38 modify zmupdate.pl.in 2013-09-07 15:11:57 -05:00
Knniggett d4179035de Modify zmupdate for 1.26.1 and 1.26.2 releases 2013-09-07 15:08:09 -05:00
Kyle Johnson 2a0613a370 Bunch of updates to css 2013-09-06 15:39:37 -04:00
Kyle Johnson 5c857029ce Merged the JS from config.js and events.js into main.js 2013-09-06 15:07:08 -04:00
Kyle Johnson 9b22dae624 Adding the loading AJAX image to the header 2013-09-06 15:02:43 -04:00
Kyle Johnson c4283ad72e Adding some base HTML to make the ajax view work 2013-09-06 15:01:59 -04:00
Kyle Johnson 48d162d432 Adding a function to control the daemons (start, stop, etc) 2013-09-06 15:01:05 -04:00
Kyle Johnson 6a9ce02870 Moving some of the monitor options to the controller 2013-09-06 15:00:01 -04:00
Isaac Connor 9c7f02e8c0 Merge branch 'develop' of github.com:ZoneMinder/ZoneMinder into develop 
Conflicts:
	scripts/zmupdate.pl
 2013-09-06 14:44:21 -04:00
Isaac Connor 0a9e63ca2c remove autogenerated files 2013-09-06 14:40:55 -04:00
Isaac Connor b37606ed9a update link to README to be README.md 2013-09-06 14:35:08 -04:00
Kyle Johnson f604872eb3 Forgot to bump the version number for 1.26.1. Fixes #113 2013-09-06 13:29:05 -04:00
Chris Wiggins fbbce3700d Merge pull request #111 from chriswiggins/master 
Use GitHub repo for version check
 2013-09-05 18:51:29 -07:00
Kyle Johnson c8ad6ae656 Fixes #107 for real this time. 2013-09-05 20:31:52 -04:00
Kyle Johnson 96b5887e69 Include missing make and configure files. Fixes #107 2013-09-05 20:08:22 -04:00
Kyle Johnson 4cc878e930 Merge branch 'release-1.26' into develop 
Conflicts:
	scripts/ZoneMinder/lib/ZoneMinder/ConfigData.pm
 2013-09-05 11:40:38 -04:00
Kyle Johnson f00372ee94 Merge branch 'release-1.26' 2013-09-05 11:33:08 -04:00
Kyle Johnson a4c399a217 Pointed the ChangeLog to the commits url 2013-09-05 11:32:48 -04:00
Kyle Johnson c02d496d23 More CakePHP cleanup - missed it in 2c04d0774f 2013-09-05 10:52:55 -04:00
Chris Wiggins d6440ca70e Change repo to ZoneMinder for pull request 2013-09-05 23:50:51 +12:00
Chris Wiggins e792c8eb44 Move version check from zoneminder.com to repository 2013-09-05 23:40:03 +12:00
Kyle Johnson d47aaec775 Merge pull request #92 from knnniggett/patch-9 
Update getBrowser() to match IE10
 2013-09-03 06:38:13 -07:00
Kyle Johnson c5196407a9 Moved all of the Monitors HTML to elements 2013-09-01 17:50:26 -04:00
Kyle Johnson 93631c0ac4 Fixing AM_CONFIG_HEADER is deprecated in automake > 1.13. Should fix #94. 2013-08-30 21:57:52 -04:00