06923d44ba
Set VIDEO_MAX_FRAME if it is not defined
2016-06-06 16:27:13 -05:00
fb6c129f8b
bump version to 1.30.0
2016-06-04 13:46:23 -05:00
4045211b36
Have cmake take the version from the version file
2016-06-03 09:51:50 -04:00
2385575c56
fix +1 being outside bind()
2016-06-02 16:23:04 -04:00
6a097393ba
Run Docker db/apache setup once, not on every startup; kill mysql cleanly
2016-06-02 12:06:21 +10:00
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
74a011fb4d
Update version
...
This needs to stay at 1.29.0 until we release!
2016-06-01 08:05:45 -05:00
40c5e5c4b9
bump version file to 1.30
2016-06-01 08:54:33 -04:00
58e1a9ac4a
rpm README changes
2016-06-01 07:30:41 -05:00
6950e3385a
bump project to 1.30.0
2016-05-31 19:41:17 -05:00
a57a3d3186
Merge pull request #1501 from ZoneMinder/fix_zone_edit
...
Fix zone edit
2016-05-31 10:33:31 -05:00
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
8eee25795a
Remove deprecated register_globals from Apache/PHP configs
2016-05-30 14:02:46 +02:00
883b323528
Change encoding of web/lang/cs_cz.php from ISO-8859-2 to UTF-8
2016-05-29 22:16:00 +02:00
f8f8dbe9fe
Merge branch 'master' of github.com:ZoneMinder/ZoneMinder
2016-05-27 09:01:09 -04:00
1983f106f4
Add a missing sth->finish
2016-05-27 09:01:01 -04:00
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
730abc9789
make zones unclickable when zm is not running
2016-05-26 09:35:36 -05:00
1972c4116b
Merge pull request #1486 from connortechnology/update_image_view
...
Update image view
2016-05-26 09:05:14 -05:00
ceaacf91bf
Merge pull request #1470 from connortechnology/api_improvements
...
Api improvements
2016-05-25 12:45:03 -05:00
575f8ec265
Merge pull request #1488 from ZoneMinder/hide_rtspdescribe
...
Hide rtspdescribe
2016-05-25 08:44:17 -05:00
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
a8e407172a
split out versus get functionality in includes/functions. Fix positioning of svg over image stream
2016-05-24 15:50:22 -04:00
89f58daf89
Merge branch 'master' into fix_zone_edit
2016-05-24 15:30:56 -04:00
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
0052bb080c
unlink only if file exists
2016-05-24 12:13:17 -05:00
00abd36af8
fix the other case of the wrong case of rtsp
2016-05-24 12:19:31 -04:00
056eed6df9
fix to show RTSP describe option when switching back to rtsp
2016-05-24 12:15:59 -04:00
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
d12b9dc16d
fix typo. needs }
2016-05-24 09:24:18 -05:00
11701357aa
remove one unlink, add better error reporting to the rest
2016-05-24 09:01:32 -05:00
6e82f2c9a9
add messages back with debug 3
2016-05-24 08:50:09 -05:00
bc49aa6aa6
add missing ; and remove extra )
2016-05-24 09:34:36 -04:00
5eac0559e2
Merge branch 'master' into hide_rtspdescribe
2016-05-24 09:32:41 -04:00
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
bc163b33fc
move multiserver message to once during startup only
2016-05-23 20:06:29 -05:00
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
d18bbc032f
Merge pull request #1495 from pliablepixels/update-api-docs
...
added alarm apis
2016-05-22 10:15:00 -04:00
68bc10eb93
Merge pull request #1497 from ZoneMinder/zmtelemetry
...
fix invalid key name in config hash
2016-05-22 10:14:12 -04:00
8bbb443c67
fix invalid key name in config hash
2016-05-20 10:35:03 -05:00
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
bb5dbf3e4a
Need to import Config Data into Config
2016-05-20 09:29:40 -04:00
182fa9a5cd
revert the bulk of the merge_db_connects changes.
2016-05-20 08:53:53 -04:00
e0c5b2a78f
added consoleEvents API
2016-05-19 15:15:48 -04:00
13feb96811
added alarm apis
2016-05-19 15:06:41 -04:00
924acf4284
fix zmdc.pl hang due to needing to connect to db after fork
2016-05-19 15:01:31 -04:00
4018cab743
don't pass partial data to daemoncontrol
2016-05-19 14:53:16 -04:00
8e06c0ec63
Merge branch 'master' of github.com:ZoneMinder/ZoneMinder
2016-05-19 12:08:56 -04:00
183f9c70a4
Must use ZoneMinder instead of ZoneMinder::Logger
2016-05-19 12:08:45 -04:00
8bac5fbdfb
typo - remove extra comma
2016-05-18 16:58:04 -05:00
Andy Bauer
Isaac Connor
Toby
Isaac Connor
Disassembler
Andrew Bauer
Isaac Connor
arjunrc