Commit Graph

17 Commits

Author SHA1 Message Date
Andrew Bauer a5cbc8abd1 buildsystem - update git submodules 2018-04-18 19:21:14 -05:00
Andrew Bauer f6540aeba1 point git submodules to our own forks 2018-04-18 14:00:00 -05:00
Isaac Connor 0b0fbae1c5 Add output of paused image when paused 2018-04-12 18:43:57 -04:00
Isaac Connor f9f78e9aa3 Convert event_id to a 64bit unsigned int 2018-04-12 13:40:11 -07:00
Isaac Connor 989ed65f52 spacing and braces, remove a dead unused function 2018-04-11 10:50:28 -04:00
Isaac Connor f1a8d5f1ff start of work on .41. Adding foreign keysy 2018-04-05 13:41:24 -07:00
Isaac Connor 489f11bd07 empty contents of zone.css because it is no different from base. 2018-04-03 21:18:29 -04:00
Isaac Connor 7ec71868a6 Switch CakePHP-Enum-Behavior to my fixed version 2018-01-29 21:25:40 -05:00
Isaac Connor 456f29fcba Rename column Id OF Monitor_Statuses to simplify JOINS. 2018-01-26 13:39:37 -05:00
Isaac Connor 348fdafa4e Update submofule 2018-01-26 11:34:45 -05:00
Isaac Connor 1b1b93f811 use CakePHP-Enum-Behavior to add support for ENUMs to the Monitor model. This should fix #48 2018-01-01 14:43:02 -05:00
Andy Bauer 2dda2d9e1e remove unneeded, empty files 2016-12-26 09:49:14 -06:00
Andrew Bauer 68adcc9e67 Merge branch 'large-timestamp' of https://github.com/schrorg/ZoneMinder into schrorg-large-timestamp
Conflicts:
	CMakeLists.txt
	configure.ac
	src/zm_monitor.cpp
	src/zm_monitor.h
	version
2015-08-18 14:07:38 -05:00
Isaac Connor 04366e752a add Servers to options, a server editing popup and a server selection to monitors 2015-07-09 11:41:46 -04:00
Andrew Bauer d915d859ed Convert Crud to submodule 2015-06-11 11:56:39 -05:00
Ubuntu dd9603f70f Merged Angular UI branch API to master 2015-06-11 02:58:58 +00:00
Kyle Johnson f1f3de6d7d Moved the api to underneath the web directory 2014-04-29 20:41:04 +00:00