d716d1d686
Merge branch 'release-1.34'
2020-07-20 16:25:41 -04:00
e839919b5e
Add foreign key MonitorId validation
2020-07-20 16:25:08 -04:00
135bbb4190
remove unneeded config loading, just use defines. Spacing, remove commented out dead code
2020-07-19 17:51:28 -04:00
1d3ad05bb5
Start implementing VNC
2020-03-25 23:21:34 -07:00
d25a91ad13
Make Group containable
2019-12-20 14:56:14 -05:00
5f006421cc
fix #2771 . Correct relationship from hasMany to hasAndBelongsToMany for Monitors in Group Modelel. Use save Assiociated in Controller, and add code to handle backwards compatibility by turning MonitorIds into the appropriate Monitor array
2019-12-15 15:31:40 -05:00
393c25b4f2
fix array keys
2019-11-29 14:26:03 -05:00
4817efe17c
Add enum support for Orientation and Scheme to Events
2019-11-29 13:48:20 -05:00
d02e30ceca
Change Orientation Enum to use strings instead of numbers as values. Sync them up with what we use in C code
2019-11-29 13:48:02 -05:00
9d4c802b48
netEmpty is deprecated. Use notBlank instead
2019-11-20 09:32:19 -05:00
16a6938710
add model validation so that we don't create empty monitors
2019-11-02 08:30:25 -04:00
fa9803d819
Can't use this->data to avoid another db hit. Must load by id
2019-04-01 10:11:56 -04:00
a634d8b774
use id instead of this->data when loading Event to delete in API
2019-03-19 17:26:20 -04:00
df3e11d83c
Fix authentication in api because we no longer store the user object in the session
2019-02-26 17:01:45 -05:00
92dc7878de
Fix 2340 ( #2368 )
...
* include includes/functions.php so that we have access to all it's contents
* add a beforeDelete function which deletes the files. Add other needed functions like Path() LinkPath() etc.
* add require_once for Storage and functions because we use them in Event
* Now that ZM has namespaces use the ZM Event class to do the heavy lifting of delete
* Don't need functions in AppController anymore
2019-02-26 11:28:56 -05:00
47465260d1
Update permissions checking for Groups to not use session. Fixes #2353
2018-12-21 10:01:48 -05:00
b3bed9a28a
fix whitespace
2018-12-11 10:20:02 -05:00
e87ded35f1
rough in adding Monitor_Status to Monitors
2018-10-31 11:08:44 -04:00
bf9ff8461c
Add WebSite to the Monitor type enumeration
2018-09-24 13:20:19 -04:00
930d929427
Merge branch 'storageareas' into api_auth
2018-07-10 12:46:30 -04:00
62edca6dcb
add fileSize to the api, and use it to add remote fileSize reporting in includes/Event
2018-05-08 13:33:56 -07:00
e7bd5900bc
rough in a Storage Model
2018-05-07 14:09:05 -07:00
9c44f56f37
Add Storage to belongsTo. Implement Relative_Path and fileExists functions
2018-05-07 14:06:48 -07:00
d3350919de
Reintroduced empty check rule, closed paranthesis
2018-03-27 10:55:36 -04:00
5b7011c61b
commented out incomplete definition - please complete it if you need it
2018-03-27 03:58:28 -04:00
27736fb5d9
Merge ../ZoneMinder.master into storageareas
2018-03-15 11:04:41 -04:00
aa0a831223
Update Host.php ( #2062 )
...
Remove whitespace causing problems with session authentication
2018-03-13 22:28:38 -04:00
b4c13d56d6
Merge ../ZoneMinder.master into storageareas
2018-03-06 12:29:59 -05:00
0654c7e3b2
Adding group handling in API
2018-03-04 23:01:52 -08:00
a0892b1ffc
Whitespace
2018-01-26 10:30:59 -05:00
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
85b7baa131
Fix event Groups associations
2017-12-19 18:09:41 -05:00
6270408c8f
rework group MonitorIds and add GroupId filters to api
2017-12-04 15:52:16 -05:00
150aa5be51
Merge branch 'master' into api_auth
2017-06-09 12:33:17 -04:00
2dda2d9e1e
remove unneeded, empty files
2016-12-26 09:49:14 -06:00
6cb163c37f
Merge branch 'master' into api_auth
2016-06-07 16:23:50 -04:00
75f9fde920
rough in Server object support
2016-05-02 10:41:25 -04: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
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
e0d2a14f3c
add in User Model/Controller and rough in auth.
2015-06-30 11:27:17 -04: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
f1f3de6d7d
Moved the api to underneath the web directory
2014-04-29 20:41:04 +00:00
Isaac Connor
hax0kartik
Isaac Connor
Pliable Pixels
Isaac Connor
Isaac Connor
mcdamo
tim
Andy Bauer
Isaac Connor
Isaac Connor
Kyle Johnson
Ubuntu