abb6d4f7d9
fixup some logic, remove redundant call to clearQueue, increase first_video_packet_index when clearing video frames from front in queuePacket
2018-08-17 16:06:03 -04:00
53eae61883
Mostly spacing, but simplified logic removing assumption that local cameras give keyframes. They might not in future.
2018-08-17 16:05:02 -04:00
376e15b763
trylock was interesting for debugging, but really logging should wait for the lock
2018-08-17 16:04:12 -04:00
96a1ac14e8
Don't do all the event notes stuff if notes is empty
2018-08-17 16:02:40 -04:00
4297d39df6
spacing, code style, remove useless debug logging
2018-08-11 18:49:48 -04:00
b2c9c2961d
spacing, code style, remove useless debug logging
2018-08-11 18:49:30 -04:00
979b31ffc3
Merge branch 'storageareas' into zma_to_thread
2018-08-11 10:08:30 -04:00
cf5eab4dbc
Merge branch 'zma_to_thread' of github.com:connortechnology/ZoneMinder into zma_to_thread
2018-08-09 12:50:08 -04:00
3962c52288
Merge branch 'storageareas' of github.com:connortechnology/ZoneMinder into storageareas
2018-08-09 11:23:37 -04:00
9f183f5df7
google code style, improve debugging, add bandwidth code
2018-08-09 11:23:13 -04:00
2ad4b17d36
Merge branch 'master' into storageareas
2018-08-08 16:24:55 -04:00
037abd4916
Merge branch 'master' of github.com:ZoneMinder/ZoneMinder
2018-08-08 15:11:42 -04:00
d87a41b629
Set button types so that they do things in all browsers.Fix Delete button when translated
2018-08-08 15:11:30 -04:00
23ddc83ad4
fix_2167 ( #2168 )
...
* Populate a global from the session on every request. Use the object instead of using allowedMonitors in session.
* fix when gets loaded.
* use for auth, and add Monitor Edit checks to Zone add/delete/edit
* add back the ZM_OPT_USE_AUTH test for being logged in in AppController
* Update permissions code to use
* change quotes
* Update permission code to use
* Use instal of session for systemPermission
* deprecate montiorPermision in session
* use instead of session streamPermission
* move login code back into AppController. Has to be done for every request
* deprecate eventPermission, controlPermission and systemPermission in session.
* handle auth params in query string as well as post
* exit on HUP to free up memory.
* add missing global user
* system should be System
2018-08-08 09:59:46 -04:00
6db55a24d3
Merge branch 'master' of github.com:ZoneMinder/ZoneMinder
2018-08-07 11:32:35 -04:00
dbdb9680c0
exit on HUP to free up memory.
2018-08-07 11:32:17 -04:00
328277536e
Update README.md
2018-08-03 10:18:11 -05:00
af7c81bda1
Merge branch 'fix_2167' into storageareas
2018-08-03 11:02:56 -04:00
c8741f1fcc
Merge branch 'fix_2167' of github.com:ConnorTechnology/ZoneMinder into fix_2167
2018-08-03 11:02:47 -04:00
683789eb41
Merge branch 'master' into storageareas
2018-08-03 10:27:48 -04:00
a1c8d1300e
Merge branch 'master' of github.com:ZoneMinder/ZoneMinder
2018-08-03 10:27:40 -04:00
b51ff8492b
Merge branch 'master' of github.com:ZoneMinder/ZoneMinder
2018-08-03 10:02:53 -04:00
b72d520e02
implement the ability to pass a disabled option to htmlSelect. Use it to disable the h264 passthrough option for non-ffmpeg monitors. Instead of disappearing it.
2018-08-03 10:02:42 -04:00
e935570a40
Merge branch 'fix_2167' into storageareas
2018-08-02 18:08:54 -04:00
a44df858be
Merge branch 'master' into storageareas
2018-08-02 15:40:44 -04:00
a0e67da51d
Improve loging around writing out analysis frames
2018-08-02 15:40:33 -04:00
c8ed12f573
Update ISSUE_TEMPLATE.md
2018-08-02 09:49:40 -05:00
82833a152e
exit on HUP to free up memory.
2018-08-02 06:53:18 -04:00
3de6b764e2
exit on HUP to free up memory.
2018-08-02 06:52:36 -04:00
50c7eec0ff
Merge branch 'storageareas' of github.com:connortechnology/ZoneMinder into storageareas
2018-08-02 05:25:53 -04:00
2c1a3348af
handle auth params in query string as well as post
2018-08-01 12:40:12 -04:00
5b878d5e89
deprecate eventPermission, controlPermission and systemPermission in session.
2018-08-01 12:10:43 -04:00
434c1508bc
Merge branch 'master' into fix_2167
2018-08-01 10:01:51 -04:00
1534934b20
move login code back into AppController. Has to be done for every request
2018-08-01 10:01:35 -04:00
b85f74bb99
when selecting auto, we need to remove the width & height css key
2018-07-31 16:55:54 -04:00
c934295bf9
we shall always pass width & height as pixels without units.
2018-07-31 16:55:13 -04:00
b20d61e0df
fix onclick when editing layout
2018-07-31 16:47:25 -04:00
d50e95fe9b
redirect to montage instead of montagereview
2018-07-31 16:46:36 -04:00
6ad732e419
retrieve greip data rather than the ip ( #2173 )
2018-07-31 14:01:01 -04:00
246070793b
Fix crash in zma dur to images array not being allocated when analysis_fps not being set
2018-07-31 13:36:03 -04:00
63153f05be
bump version in rpm specfile
2018-07-31 12:25:00 -05:00
908f81c6ef
Add some more debug
2018-07-31 13:22:52 -04:00
639717eb7b
If mysql gets restarted, and there is no change in fps, then the monitor_status record never gets updated. So just always update it.
2018-07-31 12:07:57 -04:00
588ca2cf62
Merge branch 'master' into storageareas
2018-07-31 10:52:24 -04:00
11cedb4335
repeat the update that adds Refresh to Monitors. Bump version.
2018-07-31 10:27:34 -04:00
ee97dc39dc
Add Refresh column to Monitors table. Explicitly put it after ZoneCount in the update.sql
2018-07-31 10:22:13 -04:00
886391a547
Merge branch 'master' of github.com:ZoneMinder/ZoneMinder
2018-07-31 10:16:05 -04:00
363e1dda97
Add some more Monitor defaults, mainly Refresh which gets called in watch.js.php
2018-07-31 10:15:26 -04:00
48b91c5544
Bugfix in Control and added new Camera ( #2171 )
...
* fixed control typos
missing word "s" for "Controls" Table for database queries
* added Dericam P2 camera Control
* fixed missing CanReset column
* Update DericamP2.pm
* added some more missing controls
CanSleep, CanWake
* Update DericamP2.pm
* Update DericamP2.pm
* Update DericamP2.pm
* Update DericamP2.pm
* Update DericamP2.pm
* Update DericamP2.pm
* Update DericamP2.pm
* Update zm_create.sql.in
2018-07-28 09:26:02 -04:00
2ff47e04da
the updated video-js.css puts the fonts into a font dir.
2018-07-25 17:04:42 -04:00
Isaac Connor
Isaac Connor
Andrew Bauer
Isaac Connor
Roman Dissertori