ef1af9cc15
disable FilterComponent as it doesn't actually do anything. Add Groups join when needed
2017-12-09 14:03:42 -05:00
08b5c26a15
2019 maxscoreframeid ( #2020 )
...
* added MaxScoreFrameId to address #2019
* consistent quotes
2017-12-07 14:11:06 -05:00
f7a2db4e49
remove MaxScore from the sorting because it really doesn't make sense to sort by time then maxscore... time is going to be pretty much unique
2017-12-04 21:50:29 -05:00
97c9ae02c2
cleanup
2017-12-04 17:02:38 -05:00
6270408c8f
rework group MonitorIds and add GroupId filters to api
2017-12-04 15:52:16 -05:00
03c9f88d55
fix build on trusty
2017-11-27 08:24:14 -05:00
489d3ba6ed
Merge ../ZoneMinder.master into storageareas
2017-11-21 12:23:17 -05:00
f093cfbcef
add Filtering to monitors index
2017-11-13 10:27:24 -08:00
a8fc832481
fix for monitor API edit perm ( #1995 )
2017-10-07 09:55:13 -04:00
49464d381a
Merge branch 'master' into storageareas
2017-08-14 10:44:40 -04:00
ecb7df0e8b
Support SSL for mysql connections ( #1965 )
...
* Fix install location for config files when building to alternate directory.
With the previous code, we ended up with a directory structure like the following:
$ find /etc/zm/conf.d/
/etc/zm/conf.d/
/etc/zm/conf.d/01-system-paths.conf
/etc/zm/conf.d/conf.d
/etc/zm/conf.d/conf.d/README
/etc/zm/conf.d/conf.d/02-multiserver.conf
* Omitted README file that should have appeared in /etc/zm/conf.d
* Fix location for configs when building to alternate directory.
* Fix works, but this should go on a branch instead.
* Fix works, but this should go on a branch instead.
* Fix location for configs when building to alternate directory.
With the previous code, we ended up with a directory structure like the following:
$ find /etc/zm/conf.d/
/etc/zm/conf.d/
/etc/zm/conf.d/01-system-paths.conf
/etc/zm/conf.d/conf.d
/etc/zm/conf.d/conf.d/README
/etc/zm/conf.d/conf.d/02-multiserver.conf
* Remove double quotes. This is a list of paths.
* Allow SSL database connection to be secured with SSL.
* Fix incorrect variable name
* Fix PHP syntax errors
* SSL connection parameters must also be passed in API.
* Revert fixes to build files; they should not be in this branch.
2017-08-14 10:30:42 -04:00
cfbfc0dd44
Merge branch 'master' into storageareas
2017-07-21 11:04:32 -04:00
efb02f3368
fix indent
2017-07-21 10:54:48 -04:00
5cf2be528a
Merge pull request #1950 from connortechnology/fix_api_logs
...
fix path to logs for api
2017-07-14 13:19:12 -05:00
240a990c7f
fix writing to config
2017-07-14 12:19:43 -04:00
e203064bf7
updates bootstrap.php.in to match config.php's conf.d loading
2017-07-14 12:03:00 -04:00
13a72b7a99
fix path to logs for api
2017-07-14 11:58:15 -04:00
9824049c0c
fix conf.d loading in api
2017-07-14 11:46:36 -04:00
150aa5be51
Merge branch 'master' into api_auth
2017-06-09 12:33:17 -04:00
84fd80b242
undo cake log path changes
2017-06-08 12:21:51 -04:00
c7b52bd998
fix logging dirs
2017-05-30 13:14:43 -04:00
75dc774a08
Continue to support non-USE_DEEP_STORAGE option
2017-05-22 21:21:49 -04:00
33092e4022
Allow API authentication using the `auth` query parameter containing an auth. hash. ( #1845 )
...
* Allow API authentication using the `auth` query parameter containing an auth. hash.
Fixes #1827
The same auth. hash for zms is used here. This allows consumers to use the API without sending the password in the query string and not require forging logins via the login form.
* Move logger.php's global Debug function to Logger::Debug to avoid polluting globals
This avoids a conflict with CakePHP when logger.php gets included indrectly from API code.
* Protect action=login when ZM_ENABLE_CSRF_MAGIC is enabled
2017-05-15 21:51:48 -04:00
ca1e8a13fe
Update database.php.default
2017-04-24 23:40:21 -07:00
ab4b5e6b69
Merge pull request #1853 from knnniggett/cakecache
...
change cake cache engine from File -> Apc
2017-04-14 21:10:23 -04:00
48a73f7e78
change cache engine from File -> Apc
2017-04-14 14:31:42 -05:00
3cbd32cd41
move cake log to zoneminder log folder
2017-04-14 14:24:29 -05:00
ea558c79a0
Fix check that API user is enabled
2017-03-20 17:16:24 -07:00
df4739826b
Reduce the default API debug level
2017-02-18 23:06:53 -08:00
2dda2d9e1e
remove unneeded, empty files
2016-12-26 09:49:14 -06:00
192d0dbb45
added TimeZone get API
2016-10-18 14:07:31 -04:00
92d7cad5f1
enabled utf8
2016-09-21 11:53:34 -04:00
1440dd9265
retab
2016-09-03 15:02:32 -04:00
7bf0b3c423
readded forMonitor - removed by mistake
2016-09-03 14:51:24 -04:00
9a4330eb59
#1537 Zones Controller not returning all zones
2016-09-03 14:46:47 -04:00
55f5db55dd
implement suggested code to stop the monitor when Function is set to None
2016-09-01 11:43:20 -04:00
b4aec41d3d
fix warnings and move User import up higher to where it needs to be
2016-06-21 09:09:58 -04:00
dbdd1ae51e
remove debug logging
2016-06-07 16:26:58 -04:00
f26c9168c4
if user=&pass= are in request, use them for auth
2016-06-07 16:25:35 -04:00
6cb163c37f
Merge branch 'master' into api_auth
2016-06-07 16:23:50 -04:00
ceaacf91bf
Merge pull request #1470 from connortechnology/api_improvements
...
Api improvements
2016-05-25 12:45:03 -05:00
4018cab743
don't pass partial data to daemoncontrol
2016-05-19 14:53:16 -04:00
b513bcef82
icon's gonna kill me
2016-05-10 20:09:41 -04:00
af3cae578e
fixed verbose handling bug for status command on zmu
2016-05-10 20:07:28 -04:00
8d5f2a8e5d
added iconnor's change back
2016-05-10 19:17:09 -04:00
df830a5190
resolved merge conflicts
2016-05-10 19:15:00 -04:00
2888142e68
added status command to retrieve alarmed status of monitor in addition to on/of
2016-05-10 16:55:43 -04:00
b03d2660cb
Merge pull request #1455 from ZoneMinder/api_servers
...
rough in Server object support
2016-05-10 08:00:58 +10:00
e12160456b
Support user defined MySQL Port/Socket in API
2016-05-09 00:24:08 -07:00
966a9dcd8d
Merge pull request #1467 from ZoneMinder/api_fixes
...
Don't pass request data as a monitor array to daemonControl
2016-05-07 18:25:35 -04:00
e35b0a1eb2
Merge pull request #1469 from pliablepixels/1468-api-consoleEvents-alarmedFrames
...
added alarmed frames filter
2016-05-07 17:06:37 -04:00
be329e1e0d
switched to named param format, more flexible, in line with other APIs
2016-05-07 16:28:25 -04:00
8347b69b09
added alarmed frames filter
2016-05-07 14:26:09 -04:00
6d991a1c6c
Merge pull request #1466 from pliablepixels/1465-api-alarm-on-off
...
added alarm enable/disable
2016-05-07 11:26:49 -04:00
6f9cc0f19f
to be safe, lets add system edit permissions, so rogue users can't turn alarms OFF
2016-05-07 11:01:03 -04:00
15977f1a3c
Don't pass request data as a monitor array to daemonControl
2016-05-07 10:56:38 -04:00
0280ae4dd5
added alarm enable/disable
2016-05-07 10:37:42 -04:00
01aa2c9319
change permissions to stream permissions for view
2016-05-02 19:48:24 -04:00
75f9fde920
rough in Server object support
2016-05-02 10:41:25 -04:00
ce69f24bdd
use zm.conf values for database connection
2016-04-30 08:11:39 -04:00
532fb77ecb
As well as writing zm.conf contents into the Configure object, define them, like we do in the regular UI. Also remove unneeded quotes
2016-04-30 08:09:56 -04:00
8a47241e18
address issue #1335
2016-03-12 08:07:25 -05:00
6e606aa74b
removed issue #
2015-12-19 19:04:27 -05:00
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
c4461c328e
initial user role support
2015-12-19 17:45:03 -05:00
b4fdaa9b4d
initial user role support
2015-12-19 17:44:46 -05:00
e812398fb9
initial user role support
2015-12-19 17:44:39 -05:00
f56688e7c2
initial user role support
2015-12-19 17:44:16 -05:00
028c9b956c
check for opt_use_api, also pull in user roles support
2015-12-19 17:44:02 -05:00
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
7cbad44ae4
also return the prev and next events for the same monitor as the current event
2015-11-04 14:23:28 -05:00
e3d06ca103
added prev/next event ids
2015-11-02 16:54:52 -05:00
9c7a15daf7
use deleteAll() vs. delete() when deleting an Event's Frames
2015-09-30 13:53:23 -06:00
1937814c82
Update API Frame Model to new Primary Key. Fixes #663
2015-09-29 14:39:24 -06:00
d39f57c4ff
Merge pull request #1073 from pliablepixels/1072-events-API-delete-fix
...
Delete fixes for Events
2015-09-28 14:46:01 -04:00
a00fed480d
Delete fixes for Events
2015-09-28 14:41:36 -04:00
ee78ae5c49
restart monitor when edited via APIs
2015-09-28 09:31:57 -04:00
827eebd38c
remove core.php, modify core.php.default
2015-08-29 14:53:39 -05:00
22275e661c
Tell cake to use the same session id as classic ui
2015-08-21 09:03:44 -04:00
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
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
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
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
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
2b0a975fef
Bumped up # of events per API to 100 instead of 25
2015-08-07 16:25:48 -04:00
38799050ef
APIs will be served only if user is logged into the ZM portal
2015-08-07 16:14:02 -04:00
e332fc36a9
Fixed Configs API to return all values
2015-07-21 13:28:37 -04:00
ace8597b8d
Merge branch 'master' into multi-server
2015-07-14 16:10:51 -04:00
444d978c81
Added API routing
2015-07-13 18:55:28 +00:00
04366e752a
add Servers to options, a server editing popup and a server selection to monitors
2015-07-09 11:41:46 -04:00
51631b84b4
cleanup generated files
2015-07-09 10:59:45 -04:00
fadfc01d81
TUrn on sessions and auth
2015-06-30 11:27:33 -04:00
e0d2a14f3c
add in User Model/Controller and rough in auth.
2015-06-30 11:27:17 -04:00
1b2f214340
Dumb down Crud from 4.0 -> 3.0.10
2015-06-30 10:26:29 -05:00
ba3eaf6457
Tell cake to use the same session id as classic ui
2015-06-30 11:24:14 -04:00
4be341986f
Merge pull request #897 from pliablepixels/881-api-branch
...
Fixed events API to remove thumbnail code
2015-06-22 13:01:15 -04:00
719a903d43
Fixed events API to remove thumbnail code
2015-06-20 20:08:10 -04:00
138e931e24
Fixed events API to remove thumbnail code
2015-06-20 19:57:55 -04:00
7112001b64
getVersion.json now returns both ZM version and API version
2015-06-13 16:33:15 +00:00
12ba217de0
Added API version in addition to ZM version, also added loadConfig code that was there in the angular-ui branch but not merged to master
2015-06-13 16:32:37 +00:00
bda35ed4d6
fix bootstrap.ini substitution
2015-06-12 11:12:58 -04:00
d915d859ed
Convert Crud to submodule
2015-06-11 11:56:39 -05:00
dd9603f70f
Merged Angular UI branch API to master
2015-06-11 02:58:58 +00:00
35530c627a
Initial commit of Logs MVC
2014-11-15 19:03:40 +00:00
0129ca5f74
Rework the ConfigParser component.
2014-11-15 19:03:10 +00:00
e7d726bf75
Don't print out the Config string to the file system.
2014-11-15 19:02:54 +00:00
fcaa67e3c3
Slight refactor of ConfigParser Component. Needs more work.
2014-11-15 19:02:18 +00:00
cf3d0f962c
Add view for Configs Edit
2014-11-15 19:02:03 +00:00
9f80a7d5f5
Show a list of Config Key:Value pairs
2014-11-15 19:01:32 +00:00
9268c503af
Do not display the "hidden" config category
2014-11-15 19:01:19 +00:00
b9f54056da
Add component for dumping Config table as HTML
2014-11-15 18:59:58 +00:00
de631075d3
Return possible source types ni DB via API
2014-11-15 18:59:24 +00:00
0d57306790
Find category configs only when $category is not null. API
2014-11-15 18:58:58 +00:00
9f150c4e46
Revert "Find category configs only when $category is not null. API"
...
This reverts commit efbbcadc7dad9aa52a7aab0483546eab48840ae6.
2014-11-15 18:58:51 +00:00
b88febeaee
Find category configs only when $category is not null. API
2014-11-15 18:58:43 +00:00
0a7ba112ab
API support for querying config categories.
...
Either return a list of distinct categories, or all configs under a
certain category
2014-11-15 18:55:20 +00:00
afd4e451fd
Add the web/api folder to cmake
2014-04-30 12:16:46 +03:00
f1f3de6d7d
Moved the api to underneath the web directory
2014-04-29 20:41:04 +00:00
Isaac Connor
Pliable Pixels
Isaac Connor
APHW2 MFGENG
ralimi
Andrew Bauer
Matt N
Joshua Ruehlig
Andrew Bauer
Andy Bauer
Pliable Pixels
Isaac Connor
Steve Gilvarry
Isaac Connor
Kyle Johnson
Ubuntu
Kfir Itzhak