e892841d7e
Fix typo
2017-07-06 10:49:54 -04:00
cf0944f0ad
spacing and quotes
2017-07-06 10:49:36 -04:00
48d1174dd6
hide buttons when using videojs
2017-07-06 10:49:27 -04:00
48373f0d8b
fix filters on console. filter object now has terms under a Query array
2017-07-06 10:49:10 -04:00
5f03faa77e
view=frame needs more vertical space
2017-07-06 10:48:52 -04:00
874dc79948
tell eventdetail popup to close on save
2017-07-06 10:48:33 -04:00
3233105d2c
implement a way to tell a popup to close
2017-07-06 10:48:06 -04:00
9b4fb05d5b
Fix parseFilter because terms is now under Query
2017-07-06 10:47:47 -04:00
d892b94819
spacing
2017-07-06 09:38:30 -04:00
c3c6459052
Merge branch 'montagereview_rework' into storageareas
2017-07-05 15:34:02 -04:00
6b2e23e1a5
Merge branch 'montagereview_rework' of ../ZoneMinder.master into montagereview_rework
2017-07-05 14:27:46 -04:00
1e21beb1cd
use instead of document.getElementById
2017-07-05 14:25:44 -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
d7950bd732
Merge branch 'master' into knnniggett-configfiles
2017-07-03 21:53:47 -04:00
a263de144b
fixup defaults for Filter
2017-06-29 15:00:17 -04:00
6fc1581b9e
use a monitor object instead of just a db array.
2017-06-28 20:33:53 -04:00
621d2e0e41
remove debug code
2017-06-28 15:18:12 -04:00
8b1459a510
fixes for cambozola on ie, and fixes to setting fixed widths
2017-06-28 15:17:55 -04:00
ed4da1e8bc
change to single quotes
2017-06-28 14:27:09 -04:00
90696331a9
Merge branch 'master' into storageareas
2017-06-26 21:58:11 -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
76f63686cb
Merge branch 'fix_event_viewing' into storageareas
2017-06-22 09:24:31 -04:00
5e75588bfb
Fix event viewing. Output a frame immediately on zoom in/out. Fix recursive loop on play/pause
2017-06-21 17:14:02 -04:00
c7026a1b65
requests should be csrf'd. view_video does not need to be
2017-06-20 10:56:59 -04:00
1932fa7f81
don't do CSRF for requests, and when not auth, clear the request so that we don't do it.
2017-06-20 10:52:16 -04:00
375e4a3e9c
More filter UI fixes
2017-06-20 10:45:16 -04:00
5bdfb8ae4e
add a question mark to delete confirm message and just submit the form
2017-06-20 09:09:21 -04:00
5df4494c6c
make Filters a main window view instead of a popup
2017-06-20 09:08:57 -04:00
93f81daa8d
Fix saving logic
2017-06-20 09:08:25 -04:00
dc96ca72a8
Fix AutoDetail=>AutoDelete, add Id to defaults and remove debugging
2017-06-20 09:08:15 -04:00
965b306ebc
continue redoing filters
2017-06-19 13:24:02 -04:00
1d9e0b7d69
fix saving filters
2017-06-19 10:18:44 -04:00
75c11431e6
deprecate filtersavepopup
2017-06-16 11:10:25 -04:00
3225891843
update/fix filter behaviour
2017-06-15 15:45:43 -04:00
91a070b835
Merge branch 'master' into storageareas
2017-06-15 13:13:08 -04:00
119f8fc86c
Fix version checks to fix build on yaketty
2017-06-15 13:02:54 -04:00
8145f2bc4c
whitespace
2017-06-15 12:13:40 -04:00
1f14870b38
updates, fix merge problems
2017-06-14 15:35:35 -04:00
e2139920a8
change some more quotes
2017-06-14 15:09:21 -04:00
9f301e3c51
Merge branch 'log_no_truncate' into storageareas
2017-06-14 10:18:27 -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
085d239a6e
Merge branch 'master' into storageareas
2017-06-13 18:02:28 -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
528582fec6
fix tabs
2017-06-09 10:36:38 -04:00
1788aabb6c
Merge branch 'storageareas' into move_dirs
2017-06-09 10:35:58 -04:00
371b86300a
Merge branch 'master' into storageareas
2017-06-08 14:23:40 -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
d524f98d43
add find_all function
2017-06-06 20:29:17 -04:00
1ab5e0e374
Merge branch 'master' of github.com:ZoneMinder/ZoneMinder
2017-06-06 15:36:10 -04: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
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
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
451714a403
Merge branch 'master' into storageareas
2017-06-04 21:42:56 -04:00
be77269acb
fix merge messup
2017-06-04 17:40:54 -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
502cb6a7d8
fix spacing
2017-05-31 21:34:38 -04:00
83da2dfa05
double to single quotes
2017-05-31 21:30:19 -04:00
98b49fb64d
quotes, spacing
2017-05-31 21:28:40 -04:00
17c8224733
begin to ahndle imageData not being populated
2017-05-31 20:55:10 -04:00
Isaac Connor
Isaac Connor
Isaac Connor
Andrew Bauer
Jørgen Edelbo