ZaneYork
/
zoneminder
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
6,670 Commits 20 Branches 69 Tags 131 MiB
Commit Graph

81 Commits

Author SHA1 Message Date
Isaac Connor 272e1da958 rough in Server object support 2016-05-02 10:37:19 -04:00
Isaac Connor 4aafd1d417 Make api use zm.conf 2016-04-30 13:50:09 -04:00
Isaac Connor c9a1a9020d Merge h264 2016-03-31 11:03:36 -04:00
Isaac Connor 3a8352eb6b Merge branch 'master' into storageareas 2016-03-21 10:25:03 -04:00
arjunrc 8a47241e18 address issue #1335 2016-03-12 08:07:25 -05:00
Isaac Connor 86c223668d Merge branch 'master' into storageareas 2016-02-25 19:11:38 -05:00
SteveGilvarry b294f210dc Update to CakePHP 2.8.0 copy in lib folder 2016-02-25 23:25:24 +11:00
Isaac Connor eccfced6d4 Merge branch 'multi-server' into newpointone 
Conflicts:
	distros/ubuntu1204/apache.conf
 2015-12-22 09:54:13 -05:00
Isaac Connor 658e130d33 sync up to c39 version 2015-12-22 09:44:46 -05:00
Isaac Connor dfd7986c01 Merge branch 'master' into multi-server 
Conflicts:
	distros/debian_cmake/links
	distros/ubuntu1504_cmake/zoneminder.postinst
 2015-12-21 12:57:45 -05:00
Isaac Connor ca07b951cb Merge branch 'master' into newpointone 
Conflicts:
	docs/installationguide/ubuntu.rst
 2015-12-21 12:41:25 -05:00
arjunrc 6e606aa74b removed issue # 2015-12-19 19:04:27 -05:00
arjunrc 38b4785557 PP - Gone,flitted away, Taken the starts from the night and sun, From the day! Gone, and a cloud in my heart. - Tennyson 2015-12-19 18:36:38 -05:00
arjunrc c4461c328e initial user role support 2015-12-19 17:45:03 -05:00
arjunrc b4fdaa9b4d initial user role support 2015-12-19 17:44:46 -05:00
arjunrc e812398fb9 initial user role support 2015-12-19 17:44:39 -05:00
arjunrc f56688e7c2 initial user role support 2015-12-19 17:44:16 -05:00
arjunrc 028c9b956c check for opt_use_api, also pull in user roles support 2015-12-19 17:44:02 -05:00
Isaac Connor 14cde582cf Merge branch 'multi-server' into multiserverplusstorage 
Conflicts:
	src/zm_monitor.h
 2015-12-14 16:55:26 -05:00
Isaac Connor b2b1afa8ad Merge master 2015-12-14 15:49:32 -05:00
Isaac Connor f7cc2fb44f Merge branch 'master' into multi-server 
Conflicts:
	src/zm_monitor.cpp
 2015-11-23 10:42:14 -05:00
Kyle Johnson 5add10289b Merge pull request #1136 from pliablepixels/1135-events-API-prev-next 
added prev/next event ids
 2015-11-16 09:23:36 -07:00
Pliable Pixels 7cbad44ae4 also return the prev and next events for the same monitor as the current event 2015-11-04 14:23:28 -05:00
Pliable Pixels e3d06ca103 added prev/next event ids 2015-11-02 16:54:52 -05: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 e4d51e1819 Merge branch 'master' into multi-server 2015-09-28 10:04:23 -04:00
Pliable Pixels ee78ae5c49 restart monitor when edited via APIs 2015-09-28 09:31:57 -04:00
Isaac Connor e4b0e74f69 merge master 2015-09-24 10:01:27 -04:00
Isaac Connor ba1100fc03 continue conversion from array to class of Monitor 2015-09-17 16:06:47 -04:00
Andy Bauer 827eebd38c remove core.php, modify core.php.default 2015-08-29 14:53:39 -05:00
Isaac Connor f5ba7cb208 restore 2015-08-27 11:39:16 -04:00
Isaac Connor c48bd3ebca restore 2015-08-27 11:37:33 -04:00
Isaac Connor 75919c9cd5 Merge branch 'master' into multi-server 
Conflicts:
	docs/installationguide/ubuntu.rst
	misc/apache.conf.in
	src/zm_monitor.cpp
 2015-08-27 10:34:47 -04:00
Isaac Connor 22275e661c Tell cake to use the same session id as classic ui 2015-08-21 09:03:44 -04:00
tikismoke 52d3fdf471 Update README.md 
little correction
 2015-08-21 11:29:35 +02:00
Isaac Connor 41637278c9 merge master 2015-08-19 16:08:12 -04:00
Isaac Connor 880e77b096 Merge branch 'master' into multi-server 
Conflicts:
	src/zm_monitor.cpp
	src/zm_monitor.h
 2015-08-19 13:30:48 -04: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
Andrew Bauer 66ec84fdea Merge pull request #1008 from pliablepixels/993-API-Auth 
Included logic to not enforce authentication in API layer if ZM auth is off
 2015-08-11 14:51:02 -05:00
Pliable Pixels a64f7c0036 Included logic to not enforce authentication in API layer if ZM_OPT_USE_AUTH is disabled 
If ZM auth is off, API won't work. Changed this to make sure API disables auth if ZM disables auth
 2015-08-11 14:47:49 -04:00
Isaac Connor 3e5170678e Merge pull request #1006 from pliablepixels/993-API-Auth 
I was using the wrong field to check for portal authentication
 2015-08-10 15:58:50 -04:00
Pliable Pixels f7025aaa26 I was using the wrong field to check for portal authentication 
Should be user.Username instead of username
 2015-08-10 15:55:44 -04:00
Pliable Pixels 2b0a975fef Bumped up # of events per API to 100 instead of 25 2015-08-07 16:25:48 -04:00
Pliable Pixels 38799050ef APIs will be served only if user is logged into the ZM portal 2015-08-07 16:14:02 -04:00
Pliable Pixels e332fc36a9 Fixed Configs API to return all values 2015-07-21 13:28:37 -04:00
Isaac Connor ace8597b8d Merge branch 'master' into multi-server 2015-07-14 16:10:51 -04:00