Commit Graph

5980 Commits

Author SHA1 Message Date
Isaac Connor 732bb5416f Merge branch 'master' into onvif_updated 2020-05-09 16:26:29 -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 1069b301a0 functions have been moved from ConfigAdmin to Config 2016-06-12 15:38:59 -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
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
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 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
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
Isaac Connor 89f58daf89 Merge branch 'master' into fix_zone_edit 2016-05-24 15:30:56 -04:00
Isaac Connor 3f880fad3a Merge pull request #1500 from knnniggett/zmdc_unlink
remove one unlink, add better error reporting to the rest
2016-05-24 14:35:39 -04:00
Andrew Bauer 0052bb080c unlink only if file exists 2016-05-24 12:13:17 -05:00
Isaac Connor 00abd36af8 fix the other case of the wrong case of rtsp 2016-05-24 12:19:31 -04:00
Isaac Connor 056eed6df9 fix to show RTSP describe option when switching back to rtsp 2016-05-24 12:15:59 -04:00
Isaac Connor 0522b03364 Merge pull request #1499 from knnniggett/mserver_msg
move multiserver message to display once during startup only
2016-05-24 11:08:11 -04:00
Andy Bauer d12b9dc16d fix typo. needs } 2016-05-24 09:24:18 -05:00
Andrew Bauer 11701357aa remove one unlink, add better error reporting to the rest 2016-05-24 09:01:32 -05:00
Andy Bauer 6e82f2c9a9 add messages back with debug 3 2016-05-24 08:50:09 -05:00
Isaac Connor bc49aa6aa6 add missing ; and remove extra ) 2016-05-24 09:34:36 -04:00
Isaac Connor 5eac0559e2 Merge branch 'master' into hide_rtspdescribe 2016-05-24 09:32:41 -04:00
Andrew Bauer bec14bf111 Merge pull request #1478 from ZoneMinder/fix_montage_server_refs
pass in the server url into the monitor object to use instead of the …
2016-05-23 20:14:35 -05:00
Andrew Bauer bc163b33fc move multiserver message to once during startup only 2016-05-23 20:06:29 -05:00
Isaac Connor 47db5819db Merge pull request #1494 from pliablepixels/1493-api-fix-add-monitor-daemonc
don't pass partial data to daemoncontrol
2016-05-22 10:15:40 -04:00
Isaac Connor d18bbc032f Merge pull request #1495 from pliablepixels/update-api-docs
added alarm apis
2016-05-22 10:15:00 -04:00
Isaac Connor 68bc10eb93 Merge pull request #1497 from ZoneMinder/zmtelemetry
fix invalid key name in config hash
2016-05-22 10:14:12 -04:00
Andrew Bauer 8bbb443c67 fix invalid key name in config hash 2016-05-20 10:35:03 -05:00
Andrew Bauer 58b5194054 Merge pull request #1496 from ZoneMinder/undo_merge_db_connects
revert the bulk of the merge_db_connects changes.
2016-05-20 09:37:53 -05:00
Isaac Connor bb5dbf3e4a Need to import Config Data into Config 2016-05-20 09:29:40 -04:00
Isaac Connor 182fa9a5cd revert the bulk of the merge_db_connects changes. 2016-05-20 08:53:53 -04:00