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
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
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
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
f804f7739d
Adjust download file path to swap path to match the file generated.
2016-06-14 20:49:38 +10:00
83ac4cd061
change the input handler from onchange to oninput. Disable form submit when hitting enter
2016-06-13 09:40:04 -04:00
632ec38d7d
Put back in neccessary callt o updateArea
2016-06-12 16:10:24 -04:00
472973e975
connect needs a +1
2016-06-12 15:45:24 -04:00
1069b301a0
functions have been moved from ConfigAdmin to Config
2016-06-12 15:38:59 -04:00
4f2e0edb44
remove unnecssary updateAreas
...
remove unnecessary updateZoneImage
2016-06-07 21:23:30 -04:00
dbdd1ae51e
remove debug logging
2016-06-07 16:26:58 -04:00
f26c9168c4
if user=&pass= are in request, use them for auth
2016-06-07 16:25:35 -04:00
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
593fe2b0c5
update area when points move
2016-06-07 11:40:53 -04:00
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
f289b84901
move VIDEO_MAX_FRAME up
2016-06-06 19:04:02 -05:00
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
f461bc1e80
get rid of extra )
2016-05-26 12:18:58 -04:00
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
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
Steve Gilvarry
Isaac Connor
Isaac Connor
Andrew Bauer
Andrew Bauer
Toby
Disassembler