684 Commits

Author	SHA1	Message	Date
Isaac Connor	48ff480907	whitespace	2018-04-03 10:36:14 -07:00
Isaac Connor	b26707b647	fix resetting DiskSpace	2018-04-03 09:57:14 -07:00
Isaac Connor	793f630ee0	Merge branch 'storageareas' of github.com:connortechnology/ZoneMinder into storageareas	2018-04-02 10:43:07 -07:00
Isaac Connor	df3a5b7d58	must reopen the session before destorying it	2018-03-29 19:19:08 -04:00
Isaac Connor	3fe5bb6fe2	open and close the session around user login	2018-03-29 11:30:20 -04:00
Isaac Connor	f8457e04e2	clean out commented out code	2018-03-29 11:30:09 -04:00
Isaac Connor	914de097db	Fix typo	2018-03-23 13:34:46 -07:00
Isaac Connor	61d438511f	Fixes to delete	2018-03-21 11:32:54 -07:00
Isaac Connor	a037974e26	Fix automatic server selection	2018-03-21 11:25:42 -07:00
Isaac Connor	f64ef370c9	Merge branch 'storageareas' of github.com:connortechnology/ZoneMinder into storageareas	2018-03-20 12:18:42 -07:00
Isaac Connor	eade5316b9	Move Monitor delete logic to the object. Don't fixSequences when deleting monitors	2018-03-20 12:18:07 -07:00
Isaac Connor	27736fb5d9	Merge ../ZoneMinder.master into storageareas	2018-03-15 11:04:41 -04:00
Andrew Bauer	16a2c173cb	fix Column 'Method' cannot be null	2018-03-10 20:29:25 -06:00
Andrew Bauer	0df59c26b8	fix typo ... Fix unable to enable camera	2018-03-10 19:48:53 -06:00
Andrew Bauer	ed4dac761a	Merge pull request #2049 from ZoneMinder/fix_2044 ... Fix 2044	2018-03-03 12:49:57 -06:00
Isaac Connor	3fc7ebee6c	Merge ../ZoneMinder.master into storageareas	2018-03-03 09:32:23 -08:00
Isaac Connor	2864876d28	fix spacing, add code comment	2018-03-03 09:25:04 -08:00
Isaac Connor	9a157bf4ca	add Type, MaxFPS, AlarmMaxFPS to field defaults	2018-03-01 19:23:27 -08:00
Isaac Connor	debe4607bc	add Parent and Parents functions	2018-03-01 19:23:03 -08:00
Isaac Connor	0312dc3c2d	Add Group saving to Monitor saving	2018-02-27 11:20:52 -08:00
Isaac Connor	67cc7dcf7c	Add a GroupIds function to return the groups	2018-02-27 11:20:41 -08:00
Isaac Connor	735e36c2a8	split htmlSelect into htmlOptions	2018-02-26 17:08:30 -08:00
Isaac Connor	944298428a	break out get_groups_dropdown to call a function called get_dropdown_options to populate thje options	2018-02-26 16:10:10 -08:00
Isaac Connor	bfbefc4c32	Use our new Control object to do the saving instead of a generic function	2018-02-26 07:31:48 -08:00
Isaac Connor	c6f632325e	create an object for Controls entries, with appropriate defaults	2018-02-26 07:31:22 -08:00
Isaac Connor	464b588f08	add a case for toggle, which are booleans and default them to false	2018-02-26 07:29:49 -08:00
Isaac Connor	9480adcc31	include authentication info when building the link to mp4	2018-02-22 13:05:53 -05:00
Isaac Connor	c5081d1e4e	drop session before executing filter	2018-02-21 13:54:06 -05:00
Isaac Connor	7d88e25ef9	simplify thumbnail/snapshot usage a bit	2018-02-19 17:25:49 -05:00
Isaac Connor	505e726636	turn off debug	2018-02-14 13:51:49 -05:00
Isaac Connor	a09bf3b097	slightly improve auth debugging	2018-02-14 11:58:00 -05:00
Isaac Connor	9fa28106e5	return proper hostname when not using multiple servers	2018-02-12 14:44:58 -05:00
Isaac Connor	6b6fdc7cee	Log the sql before running it	2018-02-09 07:29:10 -08:00
Isaac Connor	93996402d9	turn off debug	2018-02-02 13:24:07 -05:00
Isaac Connor	b0f755b5fc	put unarchive, archive, delete in a transaction for speed	2018-02-02 12:14:01 -05:00
Isaac Connor	68521aa0d4	spacing, remove debug lines	2018-02-02 10:27:50 -05:00
Isaac Connor	929e49c301	early return if there is no rows returned. Improve debug when there is a row but the specified column isn't present	2018-02-02 10:27:30 -05:00
Isaac Connor	212882efb9	db errors should NOT BE FATAL!	2018-02-01 11:31:25 -05:00
Isaac Connor	018523134e	use ZM_BASE_PROTOCOL when loading plugins. https can't load http content	2018-01-31 14:35:23 -05:00
Isaac Connor	31b7deb101	Return NULL on error in dbQuery	2018-01-29 10:41:24 -08:00
Isaac Connor	c9e32fb344	Check for successful Monitor db Insertion	2018-01-29 10:41:09 -08:00
Isaac Connor	e638817cb9	Check for ServerId exists in MonitorObject	2018-01-29 10:40:50 -08:00
Isaac Connor	73d84c6b08	fix typo	2018-01-29 07:53:48 -08:00
Isaac Connor	fc4edefd81	Merge branch 'storageareas' of github.com:connortechnology/ZoneMinder into tesla	2018-01-29 07:35:24 -08:00
Isaac Connor	8c4a786114	Move status fields out of the object fields	2018-01-29 10:27:46 -05:00
Isaac Connor	2dcb0d183f	Merge branch 'storageareas' of github.com:connortechnology/ZoneMinder into tesla	2018-01-28 18:07:33 -08:00
Isaac Connor	f2b335c7b2	SORT auto server selection in ascending order	2018-01-28 18:07:01 -08:00
Isaac Connor	8a4b17fb50	turn into a url instead of boolean. Use it to refresh the options page on change so that changes are instantly noticable	2018-01-28 15:13:57 -05:00
Isaac Connor	2ea2f46ec8	braes	2018-01-25 09:13:31 -08:00
Isaac Connor	703cd332df	Merge branch 'storageareas' of github.com:connortechnology/ZoneMinder into tesla	2018-01-25 08:43:53 -08:00