9669fede18
fix merge by putting back my dbRow object
2017-06-09 10:18:15 -04:00
c75215ad29
fix merge problems
2017-06-09 09:13:30 -04:00
371b86300a
Merge branch 'master' into storageareas
2017-06-08 14:23:40 -04:00
0e4485c013
Merge ../ZoneMinder.connortechnology
2017-06-08 14:03:52 -04:00
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
cac5819331
update call to getStreamSrc to use ->getStreamSrc. Also remove extraneous canView(Event)
2017-06-08 14:02:27 -04:00
2c1f576da4
Don't need to check for values in args, beacuse we set one above
2017-06-08 14:01:44 -04:00
405078686a
update getStreamSrc to take a hash instead of an array of thing=thing
2017-06-08 14:01:22 -04:00
d7b291f933
add more debug
2017-06-08 13:44:22 -04:00
81c2216eb6
spaces/quotes
2017-06-08 13:37:26 -04:00
02b2d8a968
put in ffmpeg version test
2017-06-08 12:22:28 -04:00
84fd80b242
undo cake log path changes
2017-06-08 12:21:51 -04:00
f67584ebf9
remove references to incomplete icon work
2017-06-08 08:39:49 -04:00
86b3b10d5a
Merge branch 'master' of github.com:ZoneMinder/ZoneMinder
2017-06-07 15:28:35 -04:00
c55814647c
fix spacing, braces, quotes
2017-06-07 15:28:31 -04:00
175e6921f9
use version-generic urls to jquery and jquery-ui
2017-06-07 14:13:03 -04:00
b4bdc1fd6b
Merge branch 'master' into dragndrop_monitor_sorting
2017-06-06 20:39:58 -04:00
01717a5c14
Merge branch 'master' into filter_by_runstate
2017-06-06 20:34:47 -04:00
d524f98d43
add find_all function
2017-06-06 20:29:17 -04:00
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
a9ebcd6e8a
set email address to send complaints to
2017-06-06 16:03:10 -04:00
070f0d5d62
don't init converted_input_samples
2017-06-06 15:57:42 -04:00
1ab5e0e374
Merge branch 'master' of github.com:ZoneMinder/ZoneMinder
2017-06-06 15:36:10 -04:00
7d97267dd2
fix compile on old ffmpeg
2017-06-06 15:35:17 -04:00
0892be3970
further consolidation of ZM_TARGET_DISTRO
2017-06-06 11:59:56 -05:00
54312fa994
consolidate ZM_TARGET_DISTRO parameters
2017-06-06 11:56:53 -05:00
04aa01ba0c
add login css files
2017-06-05 21:41:39 -04:00
cfa292a204
update widths of monitors when selecting a layout
2017-06-05 19:53:19 -04:00
46f23efa01
increaes height of eventdetail popup
2017-06-05 19:52:32 -04:00
831bec3398
Merge pull request #1901 from jedelbo/1900-update_danish-translation
...
Update danish translation file
2017-06-05 15:57:09 -05:00
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
523f3f4fca
Merge branch 'master' of github.com:ConnorTechnology/ZoneMinder
2017-06-05 16:29:35 -04:00
bedc1d3e13
fix spacing
2017-06-05 16:29:04 -04:00
c71a4fd690
fix spacing
2017-06-05 15:36:37 -04:00
08d505360d
spacing
2017-06-05 15:22:32 -04:00
ad4264dad7
spacing
2017-06-05 15:21:27 -04:00
36ae355a2c
spacing, braces
2017-06-05 15:21:07 -04:00
e1da754ff1
scale zones svg as well when changing width/height/scale
2017-06-05 13:25:27 -04:00
b45da97416
need a blank line
2017-06-05 13:11:09 -04:00
9a317725c0
remove extra space
2017-06-05 13:10:16 -04:00
a1940935d5
build system - track the version file rather than git tag
2017-06-05 12:04:29 -05:00
2a45cd02ca
sync some missing styles from classic
2017-06-05 12:49:39 -04:00
bfa724d06c
fix spacing
2017-06-05 11:11:34 -04:00
a9183a1599
more quotes
2017-06-05 09:40:19 -04:00
b9f65c9f50
remove merge marker
2017-06-05 09:26:05 -04:00
9534c725d6
Merge branch 'master' into storageareas
2017-06-05 09:21:37 -04:00
837c6ba137
Merge branch 'master' of github.com:ZoneMinder/ZoneMinder
2017-06-05 09:20:36 -04:00
457a3273b1
Merge branch 'master' of github.com:ZoneMinder/ZoneMinder
2017-06-05 09:05:28 -04:00
187bec40ec
Fix #1906
2017-06-05 09:05:17 -04:00
451714a403
Merge branch 'master' into storageareas
2017-06-04 21:42:56 -04:00
Isaac Connor
Isaac Connor
Ravaka Razafimanantsoa
Andy Bauer
Andrew Bauer
Isaac Connor