1771 Commits

Author	SHA1	Message	Date
Isaac Connor	00ef849908	fix line testing for Hostname	2015-10-02 15:29:17 +00:00
Isaac Connor	ea87ffe66f	merge master, bump version to 1.28.108	2015-10-01 11:52:49 -04:00
Kyle Johnson	9c7a15daf7	use deleteAll() vs. delete() when deleting an Event's Frames	2015-09-30 13:53:23 -06:00
Kyle Johnson	1937814c82	Update API Frame Model to new Primary Key. Fixes #663	2015-09-29 14:39:24 -06:00
Isaac Connor	d39f57c4ff	Merge pull request #1073 from pliablepixels/1072-events-API-delete-fix ... Delete fixes for Events	2015-09-28 14:46:01 -04:00
Pliable Pixels	a00fed480d	Delete fixes for Events	2015-09-28 14:41:36 -04:00
Isaac Connor	cb18adef5c	increase min height of zone edit popup so that buttons are visible	2015-09-28 13:01:07 -04:00
Isaac Connor	4e2ed00027	widen zone edit popup to fit the image	2015-09-28 12:54:54 -04:00
Isaac Connor	7d52c0b784	widen events popup to fit the thumbnail	2015-09-28 12:44:58 -04:00
Isaac Connor	e4d51e1819	Merge branch 'master' into multi-server	2015-09-28 10:04:23 -04:00
Isaac Connor	b53603dee1	Merge pull request #1066 from pliablepixels/1065-recaptcha-ui-fix-when-vars-dont-exist ... fixed recaptcha showing up pre DB update	2015-09-28 10:00:46 -04:00
Pliable Pixels	ee78ae5c49	restart monitor when edited via APIs	2015-09-28 09:31:57 -04:00
Pliable Pixels	727486d8f3	recaptcha now displays translated message if secret is wrong	2015-09-25 11:11:25 -04:00
Pliable Pixels	d751c3ad61	recaptcha now displays translated message if secret is wrong	2015-09-25 11:11:15 -04:00
Pliable Pixels	e5a6889253	fixed conflict	2015-09-24 15:51:16 -04:00
Pliable Pixels	939bdc90ef	Merge branch 'master' of https://github.com/ZoneMinder/ZoneMinder into 1065-recaptcha-ui-fix-when-vars-dont-exist	2015-09-24 15:45:34 -04:00
Pliable Pixels	23b549a471	recaptcha fixes to avoid lockout	2015-09-24 15:44:35 -04:00
Isaac Connor	e4b0e74f69	merge master	2015-09-24 10:01:27 -04:00
Pliable Pixels	5ca00c2ef5	fixed constant check when not defined	2015-09-24 09:57:53 -04:00
Pliable Pixels	ae6fd7daea	fixed constant check when not defined	2015-09-24 09:57:43 -04:00
Pliable Pixels	48071d7dfc	Merge branch 'master' of https://github.com/ZoneMinder/ZoneMinder into 1065-recaptcha-ui-fix-when-vars-dont-exist	2015-09-24 09:38:57 -04:00
Pliable Pixels	25ab1f6ddd	fixed recaptcha showing up pre DB update	2015-09-23 10:54:24 -04:00
Pliable Pixels	23d5e0e95b	fixed recaptcha showing up pre DB update	2015-09-23 10:50:15 -04:00
Isaac Connor	fbc4f77491	Merge pull request #1049 from knnniggett/core.php ... remove core.php, modify core.php.default	2015-09-23 09:07:29 -04:00
Dmitry Smirnov	333e7ec67b	header typo corrections	2015-09-19 17:39:54 +10:00
Isaac Connor	ba1100fc03	continue conversion from array to class of Monitor	2015-09-17 16:06:47 -04:00
Isaac Connor	4c2545a5ca	Merge branch 'master' into multi-server	2015-09-17 15:39:26 -04:00
Isaac Connor	aac45e54b8	monitor array to class	2015-09-17 15:35:38 -04:00
Isaac Connor	c415399043	add Hostname to Server	2015-09-17 15:35:27 -04:00
Isaac Connor	366c4ec676	monitor array to class	2015-09-17 15:35:09 -04:00
Isaac Connor	4a65ae1d2a	fix error in display of Server	2015-09-17 15:34:48 -04:00
Isaac Connor	01718aaffb	consturctor just takes an id	2015-09-17 15:34:26 -04:00
Isaac Connor	13327b7651	Load Controls if appropriate	2015-09-17 15:34:09 -04:00
Isaac Connor	52cdb8a05a	add Monitor class	2015-09-17 15:29:36 -04:00
Isaac Connor	c0139e87ad	define ZM_BASE_PROTOCOL	2015-09-17 15:14:43 -04:00
Isaac Connor	ac5f42efcf	add a class for Server objects	2015-09-16 15:16:07 -04:00
Isaac Connor	a8ba32db64	add Server.php to autoconf build	2015-09-16 14:51:59 -04:00
Isaac Connor	0f181b72d1	include Server object and display the server column	2015-09-16 14:51:23 -04:00
Isaac Connor	e172911088	include Server object and fix Server dropdown	2015-09-16 14:51:05 -04:00
Isaac Connor	73badd1c2d	check for value of ZM_SERVER_NAME and ZM_SERVER_HOST and include it in the error message	2015-09-16 11:12:04 -04:00
Isaac Connor	681718e908	init to avoid error message	2015-09-16 11:07:08 -04:00
Isaac Connor	535a760f26	Merge branch 'master' into multi-server ... Conflicts: configure.ac	2015-09-16 09:12:55 -04:00
Isaac Connor	4fa6948e5c	add form validation for server editing. Currently just requires a name	2015-09-16 09:12:21 -04:00
Isaac Connor	fb872315d1	add an error log entry for unknown action	2015-09-16 08:38:53 -04:00
Isaac Connor	b680aa41c5	save should be Save	2015-09-15 17:26:31 -04:00
Isaac Connor	d235733290	Need to include logger if we are going to use Error	2015-09-14 15:57:22 -04:00
Andrew Bauer	04fcc253bd	Merge pull request #1048 from pliablepixels/1046-google-recaptcha ... Google recaptcha	2015-09-01 08:18:54 -05:00
Pliable Pixels	2481c7a22e	Handled situation where user enables captcha but forgets to supply keys	2015-08-31 20:39:43 -04:00
Pliable Pixels	22a7a1d53d	Handled situation where user enables captcha but forgets to supply keys	2015-08-31 20:39:28 -04:00
Isaac Connor	bb41ebf776	Merge branch 'master' into multi-server ... Conflicts: src/zm_monitor.cpp	2015-08-31 16:03:40 -04:00