7321 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Isaac Connor	ab85239d82	fix braces, invert control directions when camera is flipped	2017-05-30 19:49:30 -04:00
Isaac Connor	0bb2bed32c	remove blank lines, do some better escaping	2017-05-30 19:47:35 -04:00
Isaac Connor	cca2c624f9	fix spelling mistake	2017-05-30 19:42:38 -04:00
Isaac Connor	83d6f415b3	cleanup whitespace	2017-05-30 14:07:37 -04:00
Isaac Connor	b96f5cf49d	more merges/fixes from SA	2017-05-30 13:50:24 -04:00
Isaac Connor	8b3b9eb30e	more merges/fixes from SA	2017-05-30 13:47:30 -04:00
Isaac Connor	1a43334113	Use NULLs instead of '' when saving things	2017-05-30 13:38:57 -04:00
Isaac Connor	c7b52bd998	fix logging dirs	2017-05-30 13:14:43 -04:00
Isaac Connor	e9a0474cf7	add back required lines with a comment	2017-05-30 12:04:12 -04:00
Isaac Connor	c5288a172d	fix merge problem	2017-05-30 11:57:20 -04:00
Isaac Connor	5bbe13f98f	update cycle from SA	2017-05-30 11:53:05 -04:00
Isaac Connor	a75488e0f3	flat and dark skins add some padding to the header, which makes it extend beyond 99%. These lines are not needed	2017-05-30 11:52:04 -04:00
Isaac Connor	5c5aafb1e8	white space and a check for mid being set to quiet error messages	2017-05-30 11:37:48 -04:00
Isaac Connor	59d00b20b1	fix fetchImage	2017-05-30 11:35:52 -04:00
Isaac Connor	f88abfcb4d	the liveStream element now has the monitorId appended to it, to be consistent with montage so we can reuse code	2017-05-30 11:26:57 -04:00
Isaac Connor	3062fe43f3	revert csrf on login page. csrf needs to be off in order for zmNinja to work	2017-05-30 11:25:25 -04:00
Isaac Connor	fe2155dd1a	merges from SA	2017-05-30 11:15:00 -04:00
Isaac Connor	e5616d5719	Merge ../ZoneMinder.connortechnology	2017-05-30 10:53:20 -04:00
Isaac Connor	8b0b938fc8	Merge branch 'master' of github.com:ConnorTechnology/ZoneMinder	2017-05-30 10:51:15 -04:00
Isaac Connor	772df5b41b	add a cast to quiet compiler warning	2017-05-30 10:31:02 -04:00
Isaac Connor	b948bc5403	fix a few extra )	2017-05-30 10:21:34 -04:00
Isaac Connor	b979712892	fix inconsistent whitespace	2017-05-30 10:01:02 -04:00
Isaac Connor	3c9d8f4ec6	Don't do the qqq thing to remove whitespace from the config descriptions. HTML doesn't care about it. That kind of parsing should be done at display time.	2017-05-30 09:44:43 -04:00
Isaac Connor	c616a3b3b7	fix some bad to '' changes	2017-05-30 09:39:01 -04:00
Isaac Connor	ff08843d68	replace with ''	2017-05-30 09:10:41 -04:00
Isaac Connor	b23c45c9bc	bump version to 1.31.0	2017-05-29 10:00:46 -04:00
Isaac Connor	77d068fc48	merge updates from SA relating to building debian packages	2017-05-26 22:25:59 -04:00
Isaac Connor	94151b0318	put back changelog	2017-05-26 14:30:21 -04:00
Isaac Connor	9f25495844	Merge branch 'master' of github.com:ZoneMinder/ZoneMinder	2017-05-26 14:19:22 -04:00
Isaac Connor	86361b59c7	convert double quotes to single quotes	2017-05-26 14:17:28 -04:00
Isaac Connor	0c25cecb93	Fix some spacing	2017-05-26 13:36:20 -04:00
Isaac Connor	368567335b	remove some quotes	2017-05-26 13:33:34 -04:00
Isaac Connor	a2bf5df2d4	remove some quotes	2017-05-26 13:27:55 -04:00
Isaac Connor	4dee84f799	More updates from SA (#1895) ... * merge from SA, includes StorageAreas support * merge from SA. Adds the ability to pass in additional options when connecting * fix options, to remove indexes * remove StorageAreas stuff * put back AutoMessage and AutoVideo logic * fixup docs, cleanup	2017-05-26 13:21:32 -04:00
Isaac Connor	ed12dab648	fixup docs, cleanup	2017-05-26 13:13:34 -04:00
Isaac Connor	cc83582a90	put back AutoMessage and AutoVideo logic	2017-05-26 13:04:08 -04:00
Isaac Connor	8fde33ee1b	remove StorageAreas stuff	2017-05-26 12:30:20 -04:00
Isaac Connor	a18079c1cc	Merge branch 'master' of github.com:ZoneMinder/ZoneMinder	2017-05-25 14:30:15 -04:00
Isaac Connor	043d722651	braces,whitespace	2017-05-25 14:26:49 -04:00
Isaac Connor	1bd3369909	Merge branch 'master' of github.com:ZoneMinder/ZoneMinder	2017-05-25 14:13:37 -04:00
Isaac Connor	9cbafde1ac	add libboost to build-depends	2017-05-25 13:54:43 -04:00
Isaac Connor	242c8fc0ab	fix options, to remove indexes	2017-05-23 15:01:22 -04:00
Isaac Connor	94ce60aa1b	Merge branch 'master' of github.com:ZoneMinder/ZoneMinder	2017-05-23 14:57:54 -04:00
Isaac Connor	b92f05672a	No reason to watch upstream, when we are upstream	2017-05-23 14:56:53 -04:00
Isaac Connor	099e099352	We need boost for the packetqueue	2017-05-23 14:51:25 -04:00
Isaac Connor	392ade2e1a	change default logrotate policy to rotate daily and compress	2017-05-23 14:51:09 -04:00
Isaac Connor	7756d5067c	the changelog entries are irrelevant, so don't keep them. Package scripts will generate their contents	2017-05-23 14:46:54 -04:00
Isaac Connor	51946da564	add a -f so that removing the directories actually removes the contents	2017-05-23 14:44:21 -04:00
Isaac Connor	c4d7703867	Merge a new apache.conf that supports fcgid	2017-05-23 14:42:31 -04:00
Isaac Connor	48ad0b77fc	merge updates for newer releases of packages	2017-05-23 14:39:31 -04:00