6843 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Isaac Connor	e4171855bb	add padding for nabar to body	2016-05-07 18:12:31 -04:00
Isaac Connor	ae40dc8b1b	revert to fixed navbar	2016-05-07 18:11:58 -04:00
Isaac Connor	5b8f713037	fix libavutils -> libavutil	2016-05-07 11:28:53 -04:00
Isaac Connor	654d4d2bee	Merge branch 'api_fixes' into storageareas	2016-05-07 10:56:47 -04:00
Isaac Connor	15977f1a3c	Don't pass request data as a monitor array to daemonControl	2016-05-07 10:56:38 -04:00
Isaac Connor	5158bbc670	add non-ffmpeg versions of libraries to depends list. ubunutu1604 doesn't seem to list them with the ffmpeg specification	2016-05-07 09:43:30 -04:00
Isaac Connor	e064af4214	Merge branch 'merge_db_connects' into storageareas	2016-05-07 09:35:14 -04:00
Isaac Connor	b444c8a6b4	Move the BEGIN from ZoneMinder to ZoneMinder/Base.	2016-05-07 09:34:45 -04:00
Isaac Connor	6e32b5d266	Use fully specified COnfig hash to simplify Symbol tables	2016-05-07 09:34:04 -04:00
Isaac Connor	1d63062188	Merge branch 'merge_db_connects' into storageareas	2016-05-07 09:30:18 -04:00
Isaac Connor	f55f979cc9	use fully specified Config to simplify symbol tables	2016-05-07 09:30:03 -04:00
Isaac Connor	51e6372362	remove extra hidden fields	2016-05-06 18:20:05 -04:00
Isaac Connor	dcdefac48a	fix styles in header, move footer back into header	2016-05-06 16:08:32 -04:00
Isaac Connor	7219e0624b	Merge branch 'iconnor-updated-console' into storageareas	2016-05-06 15:56:07 -04:00
Isaac Connor	9756f59a2c	still trying to fix eventcounts	2016-05-06 15:56:01 -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	fc191dfaa5	fixes	2016-05-06 15:52:07 -04:00
Isaac Connor	38877f802c	Merge branch 'iconnor-updated-console' into storageareas	2016-05-06 15:47:48 -04:00
Isaac Connor	905b69a394	fix too many {	2016-05-06 15:47:29 -04:00
Isaac Connor	a4a23a9494	Merge branch 'iconnor-updated-console' into storageareas	2016-05-06 15:47:10 -04:00
Isaac Connor	7c3a7a6fda	fix i to monitor_i in for loop	2016-05-06 15:46:47 -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	f8d7f9906d	fixup merging of Event data into the monitor array	2016-05-06 15:44:23 -04:00
Isaac Connor	2ccefdb23c	Merge branch 'iconnor-updated-console' into storageareas	2016-05-06 15:30:25 -04:00
Isaac Connor	f4df9e053d	port sidebar css over from classic to flat	2016-05-06 15:30:10 -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	b67ea65fcb	Merge branch 'iconnor-updated-console' into storageareas	2016-05-06 14:34:02 -04:00
Isaac Connor	297f27af8c	fix missing {	2016-05-06 14:33:56 -04:00
Isaac Connor	f1e22f9265	Merge branch 'iconnor-updated-console' into storageareas	2016-05-06 14:32:57 -04:00
Isaac Connor	7acf6cb694	fix colon to semi colon	2016-05-06 14:32:52 -04:00
Isaac Connor	01397b6695	Merge branch 'iconnor-updated-console' into storageareas	2016-05-06 14:31:27 -04:00
Isaac Connor	83795805f2	Move state getting into index.php	2016-05-06 14:30:50 -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	b333b8ebee	Merge branch 'iconnor-updated-console' into storageareas	2016-05-06 12:06:47 -04:00
Isaac Connor	ee015ee674	whitespace/codestyle. Also remove duplicate form iput runState which I think is left over from it being a popup	2016-05-06 12:06:13 -04:00
Isaac Connor	44e5b566b8	Merge branch 'iconnor-updated-console' into storageareas	2016-05-06 11:56:24 -04:00