Commit Graph

6156 Commits

Author SHA1 Message Date
Andrew Bauer c0b357ec59 Merge pull request #1539 from knnniggett/onvifProbeType
zmonvif-probe - fixes syntax error reported on some (older) Perls
2016-06-18 11:59:05 -05:00
Andrew Bauer 9dd5e34dc8 Merge pull request #1541 from altaroca/zmonvif-probe-1397
zmonvif-probe: Set $transport->message to prevent undef error
2016-06-18 09:10:25 -05:00
Jan M. Hochstein 2157f22669 Set ->message to prevent undef error 2016-06-18 15:46:05 +02:00
Andrew Bauer 0fd42abd87 fixes syntax error reported on some (older) Perls 2016-06-17 14:12:14 -05:00
Isaac Connor 0c82e82ae2 Don't update x in updateY and don't update y in updateX as they are not defined. 2016-06-16 12:00:00 -04:00
Steve Gilvarry d0e08b32f5 Merge pull request #1506 from Disassembler0/master
Change encoding of web/lang/cs_cz.php from ISO-8859-2 to UTF-8
2016-06-17 00:01:08 +10:00
Isaac Connor baa7da086a Merge pull request #1520 from knnniggett/zmlocalcamera
Set VIDEO_MAX_FRAME if it is not defined
2016-06-16 09:31:24 -04:00
Steve Gilvarry f393f3a6f0 Merge pull request #1528 from ZoneMinder/deprecate_configadmin
Removes current issue in master so it wins.
Disclaimer: This action in no way indicates alliance with Team Isaac over Team Andy 👬
2016-06-16 07:43:14 +10:00
Isaac Connor 99c13628fe Merge pull request #1531 from SteveGilvarry/FixLogExport
Adjust download file path to swap path to match the file generated.
2016-06-14 07:11:49 -04:00
Steve Gilvarry f804f7739d Adjust download file path to swap path to match the file generated. 2016-06-14 20:49:38 +10:00
Isaac Connor 83ac4cd061 change the input handler from onchange to oninput. Disable form submit when hitting enter 2016-06-13 09:40:04 -04:00
Isaac Connor 632ec38d7d Put back in neccessary callt o updateArea 2016-06-12 16:10:24 -04:00
Isaac Connor 472973e975 connect needs a +1 2016-06-12 15:45:24 -04:00
Isaac Connor 1069b301a0 functions have been moved from ConfigAdmin to Config 2016-06-12 15:38:59 -04:00
Isaac Connor 4f2e0edb44 remove unnecssary updateAreas
remove unnecessary updateZoneImage
2016-06-07 21:23:30 -04:00
Isaac Connor dbdd1ae51e remove debug logging 2016-06-07 16:26:58 -04:00
Isaac Connor f26c9168c4 if user=&pass= are in request, use them for auth 2016-06-07 16:25:35 -04:00
Andrew Bauer f9de3215dd Merge pull request #1515 from ZoneMinder/fix_version_problems
Have cmake take the version from the version file
2016-06-07 14:42:38 -05:00
Isaac Connor 593fe2b0c5 update area when points move 2016-06-07 11:40:53 -04:00
Isaac Connor 1930b18100 Move the session start down to where it is actually needed so that we don't hold it open while generating videos 2016-06-07 10:38:37 -04:00
Andrew Bauer f289b84901 move VIDEO_MAX_FRAME up 2016-06-06 19:04:02 -05:00
Andy Bauer 06923d44ba Set VIDEO_MAX_FRAME if it is not defined 2016-06-06 16:27:13 -05:00
Andy Bauer fb6c129f8b bump version to 1.30.0 2016-06-04 13:46:23 -05:00
Isaac Connor 4045211b36 Have cmake take the version from the version file 2016-06-03 09:51:50 -04:00
Isaac Connor 2385575c56 fix +1 being outside bind() 2016-06-02 16:23:04 -04:00
Toby 6a097393ba Run Docker db/apache setup once, not on every startup; kill mysql cleanly 2016-06-02 12:06:21 +10:00
Toby d2e83d197d Improve Docker build; reduce image size & layer count
Reducing layer count improves Docker performance, and is best-practice.
Avoid packing & sending .git tree into Docker build system.
Clean up apt archives to reduce image size.
2016-06-02 10:51:41 +10:00
Andrew Bauer 74a011fb4d Update version
This needs to stay at 1.29.0 until we release!
2016-06-01 08:05:45 -05:00
Isaac Connor 40c5e5c4b9 bump version file to 1.30 2016-06-01 08:54:33 -04:00
Andy Bauer 58e1a9ac4a rpm README changes 2016-06-01 07:30:41 -05:00
Andy Bauer 6950e3385a bump project to 1.30.0 2016-05-31 19:41:17 -05:00
Andrew Bauer a57a3d3186 Merge pull request #1501 from ZoneMinder/fix_zone_edit
Fix zone edit
2016-05-31 10:33:31 -05:00
Isaac Connor cc949bb6fb Merge pull request #1507 from Disassembler0/apache_php_register_globals
Remove deprecated register_globals from Apache/PHP configs
2016-05-30 08:49:32 -04:00
Disassembler 8eee25795a Remove deprecated register_globals from Apache/PHP configs 2016-05-30 14:02:46 +02:00
Disassembler 883b323528 Change encoding of web/lang/cs_cz.php from ISO-8859-2 to UTF-8 2016-05-29 22:16:00 +02:00
Isaac Connor 9f6f5100fe also copy Name from the request on update and only show delete button if it has a name 2016-05-29 11:32:18 -04:00
Isaac Connor 101c93d422 When the filter is not being loaded, copy the auto fields in the request params into the dbFilter object 2016-05-27 12:45:36 -04:00
Isaac Connor c4e5299943 sync up auto to Auto 2016-05-27 12:45:04 -04:00
Isaac Connor 65e33d6c19 synchronize on capitalizing the word Auto. This should fix the losing of the checkboxes when you change a filter 2016-05-27 11:11:30 -04:00
Isaac Connor f8f8dbe9fe Merge branch 'master' of github.com:ZoneMinder/ZoneMinder 2016-05-27 09:01:09 -04:00
Isaac Connor 1983f106f4 Add a missing sth->finish 2016-05-27 09:01:01 -04:00
Isaac Connor b0116f25e9 put back in the lines that populate ZM_SERVER_ID. They got lost somehow in the perl db undo 2016-05-27 08:59:46 -04:00
Isaac Connor f461bc1e80 get rid of extra ) 2016-05-26 12:18:58 -04:00
Isaac Connor f969186abb add the ZM_WEB_ID_ON_CONSOLE option and use it to show the ID column on the console 2016-05-26 11:15:13 -04:00
Andrew Bauer 730abc9789 make zones unclickable when zm is not running 2016-05-26 09:35:36 -05:00
Andrew Bauer 1972c4116b Merge pull request #1486 from connortechnology/update_image_view
Update image view
2016-05-26 09:05:14 -05:00
Andrew Bauer ceaacf91bf Merge pull request #1470 from connortechnology/api_improvements
Api improvements
2016-05-25 12:45:03 -05:00
Andrew Bauer 575f8ec265 Merge pull request #1488 from ZoneMinder/hide_rtspdescribe
Hide rtspdescribe
2016-05-25 08:44:17 -05:00
Isaac Connor 8f1596d683 use setStyle('display','table-row') since mootools suck and .show() will use display:block on a tr 2016-05-25 09:08:28 -04:00
Isaac Connor a8e407172a split out versus get functionality in includes/functions. Fix positioning of svg over image stream 2016-05-24 15:50:22 -04:00