2dd8b5df1f
in dark and flat, the buttons use a larger font. The fixed size is not appropriate
2017-07-07 09:59:41 -04:00
39745e49d4
I think we switch to border-box model or something, anyways, the box that the pantilt buttons go in needs to be 100px not 96px
2017-07-07 09:51:51 -04:00
4128f5861f
Merge pull request #1940 from connortechnology/montagereview_rework
...
Montagereview rework
2017-07-07 08:34:01 -05:00
50adec45c5
Strip non 7-bit ascii chars from log message
2017-07-06 11:45:17 -04:00
c372787882
fix typo
2017-07-06 10:50:56 -04:00
6b2e23e1a5
Merge branch 'montagereview_rework' of ../ZoneMinder.master into montagereview_rework
2017-07-05 14:27:46 -04:00
d61dfcd410
scale in montagereview is 1 based instead of 100, so multiply by 100 when asking for the streamSrc.
2017-07-05 14:23:01 -04:00
720748a731
code cleanup mostly. scale in montagereview is 1 based instead of 100, so multiply by 100 when asking for the streamSrc.
2017-07-05 14:22:44 -04:00
0b4a2b41cc
fix scale on initial montage load. Replace calls to functions.php/getStreamSrc with object based call
2017-07-05 14:20:50 -04:00
3068987308
Merge branch 'master' into montagereview_rework
2017-07-05 13:53:00 -04:00
8c19b129d7
more wip
2017-07-04 12:33:01 -04:00
f87a89a5ce
more fixes
2017-07-04 11:51:23 -04:00
f782aeccd9
fix view is view_video, not action=niew_video
2017-06-26 21:09:54 -04:00
3a113899ed
whitespace and braces fixing
2017-06-26 14:29:45 -04:00
c1b8105c0e
only include csrf if it's going to be used. This fixes view_video using up all ram sending a video file
2017-06-26 14:23:54 -04:00
d97d156efb
Don't do csrf for view_video
2017-06-26 11:48:26 -04:00
b5565bb16a
fix filters, refreshparent in wrong block
2017-06-23 09:04:46 -04:00
892f3a06c7
wip
2017-06-23 08:32:09 -04:00
119f8fc86c
Fix version checks to fix build on yaketty
2017-06-15 13:02:54 -04:00
e2139920a8
change some more quotes
2017-06-14 15:09:21 -04:00
4219bcd1ca
add the missing .map file for bootstrap
2017-06-14 09:36:49 -04:00
ce6a6a41a8
fix gif->png and the path for arrow-s-u and arrow-s-d
2017-06-14 09:34:03 -04:00
bf04a68085
Merge pull request #1752 from connortechnology/filter_by_runstate
...
rough in the ability to filter on RunState
2017-06-12 20:54:17 -05:00
c11a219b9f
Merge pull request #1896 from connortechnology/dragndrop_monitor_sorting
...
Dragndrop monitor sorting
2017-06-12 20:49:51 -05:00
bacf65ae9a
Migrate values from Options -> Paths to zm.conf ( #1908 )
...
* initial commit to migrate contents of Options->Paths to zm.conf
* remove paths items from configdata.pm
* remove paths tab from options
* update deb packaging scripts with new cmake vars
* remove extraneous file
* save custom paths variables to config file before dB is freshened
* don't check configs if the dB version is >= 1.31.0
2017-06-12 21:39:37 -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
81c2216eb6
spaces/quotes
2017-06-08 13:37:26 -04:00
84fd80b242
undo cake log path changes
2017-06-08 12:21:51 -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
1ab5e0e374
Merge branch 'master' of github.com:ZoneMinder/ZoneMinder
2017-06-06 15:36:10 -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
a9183a1599
more quotes
2017-06-05 09:40:19 -04:00
07835969f1
get rid of viewport line that prevents zooming in and out
2017-06-04 17:31:17 -04:00
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
555a667035
fix filter button
2017-06-02 12:12:59 -04:00
352ea6b6ae
spacing
2017-06-02 12:12:41 -04:00
cbc1636b11
Update danish translation file
2017-06-02 13:26:30 +02:00
e47adcf6cc
the tfoot has to come after the tbody
2017-06-01 09:36:00 -04:00
a1af422d29
the [filter][terms] etc part needs to be urlencoded as well. Becase [] are not valid in urls.
2017-06-01 09:35:38 -04:00
73ca07792b
double quotes to single quotes
2017-05-31 22:11:54 -04:00
5c67c87147
remove deprecated cellspacing attr on table
2017-05-31 22:08:44 -04:00
a940fe429c
deprecate the use of the center tag, and only put in the development h3 if it has contents
2017-05-31 22:08:05 -04:00
1df147e183
adjust spacing
2017-05-31 22:01:35 -04:00
17c8224733
begin to ahndle imageData not being populated
2017-05-31 20:55:10 -04:00
Isaac Connor
Andrew Bauer
Jørgen Edelbo