Commit Graph

7575 Commits

Author SHA1 Message Date
Isaac Connor 0e4485c013 Merge ../ZoneMinder.connortechnology 2017-06-08 14:03:52 -04:00
Isaac Connor c6a1518548 remark out call to set progressBarWidth, but that should never change and it uses a var that isn't global barWidth 2017-06-08 14:03:07 -04:00
Isaac Connor cac5819331 update call to getStreamSrc to use ->getStreamSrc. Also remove extraneous canView(Event) 2017-06-08 14:02:27 -04:00
Isaac Connor 2c1f576da4 Don't need to check for values in args, beacuse we set one above 2017-06-08 14:01:44 -04:00
Isaac Connor 405078686a update getStreamSrc to take a hash instead of an array of thing=thing 2017-06-08 14:01:22 -04:00
Isaac Connor d7b291f933 add more debug 2017-06-08 13:44:22 -04:00
Isaac Connor 81c2216eb6 spaces/quotes 2017-06-08 13:37:26 -04:00
Isaac Connor 84fd80b242 undo cake log path changes 2017-06-08 12:21:51 -04:00
Isaac Connor f67584ebf9 remove references to incomplete icon work 2017-06-08 08:39:49 -04:00
Isaac Connor 86b3b10d5a Merge branch 'master' of github.com:ZoneMinder/ZoneMinder 2017-06-07 15:28:35 -04:00
Isaac Connor c55814647c fix spacing, braces, quotes 2017-06-07 15:28:31 -04:00
Isaac Connor 175e6921f9 use version-generic urls to jquery and jquery-ui 2017-06-07 14:13:03 -04:00
Isaac Connor b4bdc1fd6b Merge branch 'master' into dragndrop_monitor_sorting 2017-06-06 20:39:58 -04:00
Isaac Connor 01717a5c14 Merge branch 'master' into filter_by_runstate 2017-06-06 20:34:47 -04:00
Ravaka Razafimanantsoa 214d9898a3 Enchancing Dockerfile and docker execution (#1898)
* Enchancing Dockerfile and docker execution

* Setting database if does not exist\nSolving SQL problem when adding monitor

* Sharing events and images

* Dockerfile a little bit more flexible

* Setting better start command
2017-06-06 20:22:37 -04:00
Isaac Connor a9ebcd6e8a set email address to send complaints to 2017-06-06 16:03:10 -04:00
Isaac Connor 070f0d5d62 don't init converted_input_samples 2017-06-06 15:57:42 -04:00
Isaac Connor 1ab5e0e374 Merge branch 'master' of github.com:ZoneMinder/ZoneMinder 2017-06-06 15:36:10 -04:00
Isaac Connor 7d97267dd2 fix compile on old ffmpeg 2017-06-06 15:35:17 -04:00
Andy Bauer 0892be3970 further consolidation of ZM_TARGET_DISTRO 2017-06-06 11:59:56 -05:00
Andy Bauer 54312fa994 consolidate ZM_TARGET_DISTRO parameters 2017-06-06 11:56:53 -05:00
Andrew Bauer 831bec3398 Merge pull request #1901 from jedelbo/1900-update_danish-translation
Update danish translation file
2017-06-05 15:57:09 -05:00
Andrew Bauer 2bc6f1627e Add support for conf.d subfolder (#1902)
* cmake changes to support conf.d

* php changes to support conf.d

* perl changes to support conf.d

* C changes to support conf.d

* add conf.d support to rpmspecfile

* fix typo

* specify ZM_CONFIG_SUBDIR in relevant target distros

* put back my config_file perl definition

* remove quotes from ZM macros

* fix snprintf

* add README to conf.d folder

* adjust rpm specfile

* remove custom permissions from README in rpmspecfile

* modify rpm README documentation to reflect conf.d support

* set ZM_CONFIG_SUBDIR in debian rules file
2017-06-05 16:39:19 -04:00
Isaac Connor 523f3f4fca Merge branch 'master' of github.com:ConnorTechnology/ZoneMinder 2017-06-05 16:29:35 -04:00
Isaac Connor bedc1d3e13 fix spacing 2017-06-05 16:29:04 -04:00
Andy Bauer a1940935d5 build system - track the version file rather than git tag 2017-06-05 12:04:29 -05:00
Isaac Connor a9183a1599 more quotes 2017-06-05 09:40:19 -04:00
Isaac Connor 837c6ba137 Merge branch 'master' of github.com:ZoneMinder/ZoneMinder 2017-06-05 09:20:36 -04:00
Isaac Connor 457a3273b1 Merge branch 'master' of github.com:ZoneMinder/ZoneMinder 2017-06-05 09:05:28 -04:00
Isaac Connor 187bec40ec Fix #1906 2017-06-05 09:05:17 -04:00
Isaac Connor 90c3c40f55 Merge branch 'master' of github.com:ZoneMinder/ZoneMinder 2017-06-04 17:33:30 -04:00
Isaac Connor 07835969f1 get rid of viewport line that prevents zooming in and out 2017-06-04 17:31:17 -04:00
Isaac Connor 07704dd5d6 coments 2017-06-04 17:30:39 -04:00
Isaac Connor 7ae0b4a546 handle older versions of ffmpeg 2017-06-03 10:13:39 -04:00
Andrew Bauer c1ecbae946 Update startpackpack.sh
add an entry to the debian changelog before calling packpack
2017-06-02 21:01:59 -05:00
Isaac Connor 44eba78e40 put back empty files 2017-06-02 20:42:55 -04:00
Isaac Connor 7d6f85f9ea Merge ../ZoneMinder.connortechnology 2017-06-02 20:18:16 -04:00
Isaac Connor d910bcf121 fix quoting on config 2017-06-02 20:18:05 -04:00
Isaac Connor 7b8222f73b fix type for WEB_EVENT_DISK_SPACE to boolean. 2017-06-02 20:17:08 -04:00
Isaac Connor 5fb32d7168 Merge branch 'master' of github.com:ZoneMinder/ZoneMinder 2017-06-02 16:53:35 -04:00
Isaac Connor 6d1a8e73e8 Merge ../ZoneMinder.connortechnology 2017-06-02 16:53:24 -04:00
Isaac Connor eeefb2c8e2 need previous_pts and dts for both video and audio. I don't think they can share 2017-06-02 16:53:14 -04:00
Isaac Connor 0ac26277e3 debug, fix deprecations, fix audio 2017-06-02 16:52:52 -04:00
Isaac Connor b5c0a0eae2 the contents of these are not being maintained and should be generated by scripts 2017-06-02 12:40:32 -04:00
Isaac Connor dd029164eb Merge ../ZoneMinder.connortechnology 2017-06-02 12:39:34 -04:00
Isaac Connor 9c9eaa6851 move test for MIN_AGE up. Don't need to constantly check for it because it won't change. 2017-06-02 12:35:01 -04:00
Isaac Connor 8b91403c25 remove references to Storage object 2017-06-02 12:32:02 -04:00
Isaac Connor b6b4738b9f fix quotes 2017-06-02 12:31:54 -04:00
Isaac Connor 71b9ca97c6 no need to store filters as an array ref 2017-06-02 12:25:26 -04:00
Isaac Connor a9268d10e3 fix the use of ZM_OPT constants in javascript. Instead, check for existence of the element in the form. 2017-06-02 12:21:12 -04:00