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

111 Commits

Author SHA1 Message Date
Isaac Connor 0bc50810de only add the development h3 if it has contents, otherwise it pushes the header size down 2016-09-13 10:25:49 -04:00
Isaac Connor 09ebcfb7f8 only put in the development h3 tag if the value has been set 2016-08-22 11:42:44 -04:00
Isaac Connor 2451768295 Merge branch 'master' into storageareas 2016-08-08 18:08:46 -04:00
Isaac Connor fff54e4086 update export to use event object, which automatically fixes storage path issues. Include mp4's in the list of video files to include 2016-05-18 09:02:14 -04:00
Isaac Connor 5e419e85d7 move logger down, as thisURL gets set in the skin.js and comment out overlay.js 2016-05-16 14:37:35 -04:00
Isaac Connor 9a1b0b79b9 don't use a dropdown for montage, etc 2016-05-13 11:43:38 -04:00
Isaac Connor 85f950d80a put jquery into no conflict mode so it doesn't overwite mootools use of $ 2016-05-13 09:45:24 -04:00
Isaac Connor ae40dc8b1b revert to fixed navbar 2016-05-07 18:11:58 -04:00
Isaac Connor dcdefac48a fix styles in header, move footer back into header 2016-05-06 16:08:32 -04:00
Isaac Connor 97a1d5a648 Merge branch 'iconnor-updated-console' into storageareas 2016-05-06 15:53:48 -04:00
Isaac Connor 52b4e98e5a fixes 2016-05-06 15:53:19 -04:00
Isaac Connor 38e02db9cf Merge branch 'iconnor-updated-console' into storageareas 2016-05-06 15:46:00 -04:00
Isaac Connor daf10c1b84 make displayMonitors global 2016-05-06 15:44:35 -04:00
Isaac Connor 2ccefdb23c Merge branch 'iconnor-updated-console' into storageareas 2016-05-06 15:30:25 -04:00
Isaac Connor fb1b8000ec fix the use of when specifying a skin 2016-05-06 15:24:20 -04:00
Isaac Connor 02b5cd6b6c Merge branch 'iconnor-updated-console' into storageareas 2016-05-06 15:17:10 -04:00
Isaac Connor 5d8eeb5b56 deprecate header, just the getNavBarHTML function 2016-05-06 15:16:48 -04:00
Isaac Connor da97dfd9cf Merge branch 'iconnor-updated-console' into storageareas 2016-05-06 14:59:10 -04:00
Isaac Connor ed5cb2f3ed fix global language problems 2016-05-06 14:58:41 -04:00
Isaac Connor 99d9f98244 Merge branch 'iconnor-updated-console' into storageareas 2016-05-06 14:40:08 -04:00
Isaac Connor 956b971719 put back maxWidtha nd maxHeight 2016-05-06 14:39:48 -04:00
Isaac Connor b3b63ec1d9 Merge branch 'iconnor-updated-console' into storageareas 2016-05-06 14:38:17 -04:00
Isaac Connor 829202b42a move more eventcounting stuff to console.php. 2016-05-06 14:38:08 -04:00
Isaac Connor 01397b6695 Merge branch 'iconnor-updated-console' into storageareas 2016-05-06 14:31:27 -04:00
Isaac Connor 1d673a0b8c move header into a function in functions.php. Move event population into console.php 2016-05-06 14:30:32 -04:00
Isaac Connor 7df2685223 Merge branch 'iconnor-updated-console' into storageareas 2016-05-06 12:51:40 -04:00
Isaac Connor e87a35b04d Merge branch 'always_show_ptz' into storageareas 2016-05-06 12:51:15 -04:00
Isaac Connor c9f1614e32 If the camera has no centering control, don't make it look like it does. This also removes a logged error 2016-05-06 12:51:03 -04:00
Isaac Connor d5f1519829 Can't externally reference .js.php, they have to be inline js 2016-05-06 12:40:23 -04:00
Isaac Connor 4defe92911 Merge branch 'master' into updated-console 2016-05-03 14:22:37 -04:00
Isaac Connor 516bacdfd3 Merge branch 'updated-console' into storageareas 2016-05-03 13:38:57 -04:00
Kyle Johnson c2fd3dd84a Also don't load additional JS to Log view 
Another issue with mootools & jquery conflicts
 2016-05-03 13:25:39 -04:00
Kyle Johnson 6768fe5554 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:06:28 -04:00
Kyle Johnson f2d43de137 Revert "Include Chart.js" 
This reverts commit 33d6d311b0.

Didn't mean to add this code in yet.  For a future feature.
 2016-04-24 00:52:19 -04:00
Kyle Johnson ca0ba4a5f8 Add state view's js and php to all pages as it is now part of header 2016-04-23 22:59:50 -04:00
Isaac Connor 2ff01b6bcb remove unneeded global 2016-04-22 13:36:12 -04:00
Isaac Connor 30b746c603 Add missing ()'s 2016-04-22 13:35:40 -04:00
Isaac Connor 60642c1fff Merge branch 'iconnor_video' into storageareas 2016-04-05 12:32:33 -04:00
Isaac Connor 564f189416 Merge branch 'always_show_ptz' into storageareas 2016-04-04 16:45:54 -04:00
Isaac Connor 5f3e7134fb split power out of the Panel box so that I can style it better 2016-04-04 13:22:26 -04:00
Isaac Connor 197ae67313 Merge branch 'always_show_ptz' into storageareas 2016-04-04 11:47:29 -04:00
Isaac Connor 2233747fcb add a missing t 2016-04-04 11:38:16 -04:00
Kyle Johnson 33d6d311b0 Include Chart.js 2016-04-02 00:48:58 -04:00
Kyle Johnson 8fdf3291b4 Load jquery and bootstrap js in classic skin 2016-03-16 00:49:51 -04:00
Kyle Johnson d01ef25f82 Update doctype to html5, and add additional meta tags 2016-03-16 00:17:05 -04:00
Kyle Johnson a403c1db8c Move recaptcha javascript to actual <head> tag 
The way it was handled previously resulted in invalid html, with an
extra <head> tag being inserteed inside the <body>.
 2016-03-12 19:14:07 -05:00
Kyle Johnson c9441ec8c0 Local copy of bootstrap 3.3.6, included in classic skin. 2016-03-12 01:16:19 -05:00
SteveGilvarry 5ff427d9e9 Removed Autotools Makefile.am 
Conflicts:
	Makefile.am
	misc/Makefile.am
	src/Makefile.am
	web/includes/Makefile.am
	web/js/Makefile.am
	web/skins/classic/css/classic/views/Makefile.am
	web/skins/classic/css/flat/views/Makefile.am
	web/skins/classic/views/Makefile.am
	web/skins/classic/views/js/Makefile.am
 2016-02-26 22:19:02 +11:00
Isaac Connor f2065e2fcb Merge branch 'one_eighth' into multi-server 2015-12-08 08:47:35 -05:00
Isaac Connor d6b2e1959f add a 1/8th scale option, which is useful for 1920x1080 streams 2015-12-08 08:40:44 -05:00