Isaac Connor
b220b8f588
mostly white space fixes, but also, unlock on error condition
2018-03-22 10:25:47 -04:00
Isaac Connor
06f10e0ed3
fix double free of mysql_result
2018-03-22 10:04:41 -04:00
Isaac Connor
50696319cc
Always error out when stream fails, even on EOF. Just don't log EOF as an error.
2018-03-22 09:25:35 -04:00
Isaac Connor
7d4652e37b
make group and function popups bigger
2018-03-21 11:33:10 -07:00
Isaac Connor
61d438511f
Fixes to delete
2018-03-21 11:32:54 -07:00
Isaac Connor
a037974e26
Fix automatic server selection
2018-03-21 11:25:42 -07:00
Isaac Connor
e0b73e9794
Merge branch 'cake-2.10.8' into storageareas
2018-03-21 13:11:33 -04:00
Isaac Connor
eddc03db14
custom version of crud 3.0.10 with Object to CakeObject fix
2018-03-21 13:10:51 -04:00
Isaac Connor
a4fee5c91c
further merges from cakephp 2.10.8
2018-03-21 13:09:55 -04:00
Isaac Connor
1346558d59
Merge branch 'cake-2.10.8' of https://github.com/knnniggett/ZoneMinder into cake-2.10.8
2018-03-21 11:15:11 -04:00
Matthew Trescott
afc3e160a7
Fix the second part of #2064 ( #2066 )
...
* Fix postinst with mysql. See bug #2064
* Fix mistake
2018-03-21 11:05:48 -04:00
Isaac Connor
124d2b20eb
remove version control marker
2018-03-21 10:51:47 -04:00
Isaac Connor
f682e1da9e
Merge branch 'zmtelemetry_improvements' into storageareas
2018-03-21 10:40:32 -04:00
Isaac Connor
c34ab7c172
fix merge and sleep for interval instead of 1 hour
2018-03-21 09:28:39 -04:00
Isaac Connor
0d3957611a
Merge branch 'zmtelemetry_improvements' of github.com:ConnorTechnology/ZoneMinder into zmtelemetry_improvements
2018-03-21 09:26:54 -04:00
Isaac Connor
b50fd690dc
exit if not enabled, hence reducing code nesting. Must update lastCheck
2018-03-21 09:22:29 -04:00
Isaac Connor
ba7b2447a2
Merge branch 'master' into zmtelemetry_improvements
2018-03-21 09:07:43 -04:00
Andrew Bauer
f60a6c4b4f
Roll packpack back to 7cf23ee
...
fix broken rpm builds
2018-03-20 19:34:27 -05:00
Isaac Connor
f64ef370c9
Merge branch 'storageareas' of github.com:connortechnology/ZoneMinder into storageareas
2018-03-20 12:18:42 -07:00
Isaac Connor
a9f4b7899a
move session closing higher up before actions.php.
2018-03-20 12:18:29 -07:00
Isaac Connor
eade5316b9
Move Monitor delete logic to the object. Don't fixSequences when deleting monitors
2018-03-20 12:18:07 -07:00
Isaac Connor
6cfb550cf4
add cast to remove compile warning
2018-03-20 14:49:01 -04:00
Andrew Bauer
7c7002f5de
Merge pull request #2069 from sgunji/update-ja-php
...
update japanese php
2018-03-19 08:02:08 -05:00
sgunji
b6c0e1b834
update japanese php
...
added header
2018-03-19 21:37:17 +09:00
Andy Bauer
0afe1e0971
recreate bootstrap.php.in
2018-03-17 21:16:17 -05:00
Andy Bauer
f9b7f931c9
upgrade lib folder to cakephp 2.10.8
2018-03-17 20:24:15 -05:00
Isaac Connor
4bb26519f6
allow errors, and add a missing fi
2018-03-16 11:59:29 -04:00
Isaac Connor
ea38f7cca4
Merge branch 'storageareas' of github.com:connortechnology/ZoneMinder into storageareas
2018-03-15 11:43:15 -04:00
Isaac Connor
27736fb5d9
Merge ../ZoneMinder.master into storageareas
2018-03-15 11:04:41 -04:00
Isaac Connor
d82d2e7765
Merge branch 'master' of github.com:ZoneMinder/ZoneMinder
2018-03-14 10:44:57 -04:00
Isaac Connor
a73a7b438c
whitespace to google code style specs. 2 spaces
2018-03-14 10:44:43 -04:00
Andrew Bauer
280dd8b04c
Merge pull request #2063 from ZoneMinder/fix_2061
...
Use Event.Width and Event.Height instead of Monitor.Width and Monitor…
2018-03-14 09:37:34 -05:00
Isaac Connor
79b10b0166
Use Event.Width and Event.Height instead of Monitor.Width and Monitor.Height when generating video of an event.
2018-03-14 10:09:31 -04:00
mcdamo
aa0a831223
Update Host.php ( #2062 )
...
Remove whitespace causing problems with session authentication
2018-03-13 22:28:38 -04:00
Isaac Connor
6f3d16fe10
label_format can be null
2018-03-13 12:06:03 -07:00
Isaac Connor
cefd00d1ea
load User and Pass as well
2018-03-13 14:50:41 -04:00
Andy Bauer
a786e520c0
Merge branch 'master' of https://github.com/ZoneMinder/ZoneMinder
2018-03-13 09:30:25 -05:00
Andy Bauer
9c8ad35e33
Merge branch 'MTres19-ubuntu_bionic_v2'
2018-03-13 09:29:11 -05:00
Andy Bauer
00ab9b4c03
merge proposed changes in ubuntu1804 folder -> ubuntu1604 folder instead
2018-03-13 09:28:11 -05:00
Andy Bauer
389ca9e291
Merge branch 'ubuntu_bionic_v2' of https://github.com/MTres19/zoneminder into MTres19-ubuntu_bionic_v2
2018-03-13 09:27:28 -05:00
Pliable Pixels
704ccaee73
2059 alarm cause ( #2060 )
...
* added alarm_cause as a test
* initial attempt to integrate with notes
* testing sizeof
* add zone labels
* fixed typo
* fixed typo
* comments and formatting
* Downgraded invalid attribute to error
* Removed Error downgrade. Instead do a undefined check on field params
* Added help text
2018-03-12 19:38:12 -04:00
Andrew Bauer
16a2c173cb
fix Column 'Method' cannot be null
2018-03-10 20:29:25 -06:00
Andrew Bauer
0df59c26b8
fix typo
...
Fix unable to enable camera
2018-03-10 19:48:53 -06:00
Isaac Connor
fa01dbf6af
use parent's new and AUTOLOAD methods
2018-03-09 09:19:26 -05:00
Isaac Connor
7fb1c8921b
reorder functions to put them in a better order
2018-03-09 07:50:47 -05:00
Isaac Connor
d1837a96b4
Merge branch 'storageareas' of github.com:connortechnology/ZoneMinder into storageareas
2018-03-09 07:25:28 -05:00
Isaac Connor
56b2787907
reorder variables to match init order in constructor
2018-03-09 07:24:53 -05:00
Isaac Connor
dcf7c4fdde
rework loading Monitor using consistent db query
2018-03-09 07:23:40 -05:00
Isaac Connor
d777f6104f
add a method to access the underlying MYSQL_ROW
2018-03-09 07:23:14 -05:00
Isaac Connor
a1213142df
whitespace
2018-03-09 07:22:59 -05:00