Commit Graph

3637 Commits

Author SHA1 Message Date
Isaac Connor 15ba7d2a35 fixes 2017-10-02 11:25:51 -04:00
digital-gnome c35face630 LengthTypo 2017-10-02 10:52:55 -04:00
Isaac Connor b5a5f45e04 turn off debug 2017-10-02 10:06:07 -04:00
Isaac Connor ddb7305aab Merge branch 'storageareas' of github.com:connortechnology/ZoneMinder into storageareas 2017-10-02 09:11:55 -04:00
Isaac Connor 13b192a63e remove title and close 2017-10-02 09:03:49 -04:00
Isaac Connor eaf29d2024 add a class to the active view link to highlight it 2017-10-02 09:02:57 -04:00
digital-gnome 48a3e5eaa6 Move logic to .js file. 2017-09-30 16:35:03 -04:00
digital-gnome e339b9e12a Merge branch 'storageareas-Navigationfix' into storageareas-navigation 2017-09-30 15:09:32 -04:00
digital-gnome 7c72ff1fd9 Navigation buttons for video.ja 2017-09-30 14:25:00 -04:00
digital-gnome 0e2b7d1b52 End of video logic 2017-09-30 14:25:00 -04:00
digital-gnome 5f203fc813 JS logic for video.js navigation 2017-09-30 14:24:59 -04:00
Isaac Connor 4be133ed09 remove btn styles from buttons. make groups, cycle, montage, montage review non-popups. Add datetime filters to montagereview. Fix dark skin 2017-09-30 14:19:32 -04:00
digital-gnome 22af70601e Convert to ampersand in filters
Querys weren't working because it was passing & instead of &.  Nothing else appeared to be using these.
2017-09-29 21:49:58 -04:00
digital-gnome 5f42bf4fe5 Change CSS to class, add class to php
I needed the styling for the video.js buttons.  The fallback mjpeg player used ids.
2017-09-29 21:47:52 -04:00
digital-gnome febf15812f Add start times to getNearEvents 2017-09-29 21:44:57 -04:00
Isaac Connor 6a0da487eb add Parent Group selection to Group Edit 2017-09-28 12:37:15 -04:00
Isaac Connor 160a553fb9 Don't do csrf for frames view either. If there are a lot of frames, we run out of mem. 2017-09-27 17:33:06 -04:00
Isaac Connor 03d25ef10a more visually appearling code for hiding buttons. Remove cellspacing=0 on the table. 2017-09-27 17:32:42 -04:00
Isaac Connor b5699dcac3 google code style 2017-09-26 17:14:27 -04:00
Isaac Connor 35482ba53c Merge branch 'storageareas' of github.com:ConnorTechnology/ZoneMinder into storageareas 2017-09-26 16:13:51 -04:00
Isaac Connor d69b16df24 add group filter to montagereview 2017-09-26 11:28:19 -04:00
Isaac Connor bc1b770c14 add translation for AddNewStorage 2017-09-26 11:27:55 -04:00
digital-gnome 00c33aa758 remove extra /div
I somehow let an extra /div slip into the commit for making archive work.
2017-09-25 22:14:53 -04:00
digital-gnome cc4b6cd0b0 switch to jquery
switched both scaleslider and speedslider to jquery
2017-09-25 22:14:46 -04:00
digital-gnome 7dd95f6afe getNearEvents prev always 0
getNearEvents always returns 0 for prev event.  sortColumn is escaped with passes it with single quotes and breaks the query.  I changed it to match next event by removing the escape.
2017-09-25 22:14:36 -04:00
Isaac Connor fef503f90c Merge branch 'storageareas' of github.com:ConnorTechnology/ZoneMinder into storageareas 2017-09-23 13:42:44 -04:00
Isaac Connor aada54769f add a Group object 2017-09-23 13:42:39 -04:00
Isaac Connor 8ada30ff8c add a group filter to montage 2017-09-23 13:42:13 -04:00
Isaac Connor 4e16523cff Say Groups instead of listing the # of monitors in the header 2017-09-23 13:41:52 -04:00
digital-gnome ab3f15b7c0 Add logic for Archive link on initial load
Javascript appears to control this but it was not firing on initial load.  Added php logic.
2017-09-14 18:00:35 -04:00
digital-gnome a5f0103601 revert jquery change to speed slider
Scale was using getElementById but speed was changed to jquery.  It wasn't working so I just changed it to match scale.
2017-09-14 18:00:23 -04:00
digital-gnome a78e568378 Change storage path text box from url to text
With the text box set as url you can't use a standard unix path
2017-09-14 18:00:02 -04:00
Isaac Connor 6fe4b892ef always define auth_hash 2017-09-11 17:05:46 -04:00
Isaac Connor edb7762cf3 Merge branch 'master' into storageareas 2017-09-11 16:57:08 -04:00
Andrew Bauer 496ba70819 remove checks for empty and just check for true (#1980)
Yeah I agree.  I think the exists was from pre-object method days.
2017-09-11 13:27:17 -04:00
ralimi 58a9107675 Fix incorrect links to transparent.png and index.php (#1982)
* Fix install location for config files when building to alternate directory.

With the previous code, we ended up with a directory structure like the following:

$ find /etc/zm/conf.d/
/etc/zm/conf.d/
/etc/zm/conf.d/01-system-paths.conf
/etc/zm/conf.d/conf.d
/etc/zm/conf.d/conf.d/README
/etc/zm/conf.d/conf.d/02-multiserver.conf

* Omitted README file that should have appeared in /etc/zm/conf.d

* Fix location for configs when building to alternate directory.

* Fix works, but this should go on a branch instead.

* Fix works, but this should go on a branch instead.

* Fix location for configs when building to alternate directory.

With the previous code, we ended up with a directory structure like the following:

$ find /etc/zm/conf.d/
/etc/zm/conf.d/
/etc/zm/conf.d/01-system-paths.conf
/etc/zm/conf.d/conf.d
/etc/zm/conf.d/conf.d/README
/etc/zm/conf.d/conf.d/02-multiserver.conf

* Remove double quotes. This is a list of paths.

* Allow SSL database connection to be secured with SSL.

* Fix incorrect variable name

* Fix PHP syntax errors

* SSL connection parameters must also be passed in API.

* Fix links pointing at transparent.gif

* Use relative path to index.php instead of absolute.

The installation may not be rooted at / on the server.
2017-09-10 11:49:53 -04:00
Isaac Connor 42263bf39a pass mode when getting mp4 download link 2017-09-08 12:29:10 -04:00
Isaac Connor a81ff85fbb add ffmpeg decoding of a .mp4 to get the frames 2017-08-23 15:05:44 -04:00
Isaac Connor 676c4b7ddc Merge branch 'master' into storageareas 2017-08-22 09:52:14 -04:00
Isaac Connor 9a6bfb2d02 fix some quotes, double to single 2017-08-22 09:44:45 -04:00
Isaac Connor 9b95259567 fix deleting monitor, but passing an event Id to deleteEvent instead of a hash consisting of just the Id 2017-08-22 09:33:51 -04:00
Isaac Connor f01adc6be5 fixes 2017-08-17 10:18:51 -04:00
peruchi d71b30aff3 Images Gif to PNG (#1969)
* Images Gif to PNG

Extension change to PNG

* Images Gif to PNG

Extension change to PNG

* Images Gif to PNG

Extension change to PNG
2017-08-16 14:51:20 -04:00
Isaac Connor f573158fbb fix breakage caused by empty SSL_CERT options 2017-08-15 19:40:02 -04:00
Isaac Connor adab628af9 fix video speed, various other 2017-08-14 18:22:52 -04:00
Isaac Connor b6965a2c3f fix spacing/braces 2017-08-14 11:38:21 -04:00
Isaac Connor 49464d381a Merge branch 'master' into storageareas 2017-08-14 10:44:40 -04:00
Isaac Connor 087b7abb94 Merge branch 'master' into fix_event_viewing 2017-08-14 10:41:04 -04:00
ralimi ecb7df0e8b Support SSL for mysql connections (#1965)
* Fix install location for config files when building to alternate directory.

With the previous code, we ended up with a directory structure like the following:

$ find /etc/zm/conf.d/
/etc/zm/conf.d/
/etc/zm/conf.d/01-system-paths.conf
/etc/zm/conf.d/conf.d
/etc/zm/conf.d/conf.d/README
/etc/zm/conf.d/conf.d/02-multiserver.conf

* Omitted README file that should have appeared in /etc/zm/conf.d

* Fix location for configs when building to alternate directory.

* Fix works, but this should go on a branch instead.

* Fix works, but this should go on a branch instead.

* Fix location for configs when building to alternate directory.

With the previous code, we ended up with a directory structure like the following:

$ find /etc/zm/conf.d/
/etc/zm/conf.d/
/etc/zm/conf.d/01-system-paths.conf
/etc/zm/conf.d/conf.d
/etc/zm/conf.d/conf.d/README
/etc/zm/conf.d/conf.d/02-multiserver.conf

* Remove double quotes. This is a list of paths.

* Allow SSL database connection to be secured with SSL.

* Fix incorrect variable name

* Fix PHP syntax errors

* SSL connection parameters must also be passed in API.

* Revert fixes to build files; they should not be in this branch.
2017-08-14 10:30:42 -04:00
Isaac Connor c60939e824 fix absolute path to index.php in console.js 2017-08-11 09:08:00 -04:00
Isaac Connor 27fe468868 Don't do csrf for view=video because the output buffering will make it run out of ram 2017-08-09 11:15:00 -04:00
Isaac Connor 6562d5eb47 Merge branch 'master' of github.com:ZoneMinder/ZoneMinder 2017-08-09 09:54:34 -04:00
Isaac Connor 928c4651a6 fix braces, spacing 2017-08-09 09:54:27 -04:00
Isaac Connor b9addeecfd update deleting the events when deleting a monitor 2017-08-08 15:02:40 -04:00
Isaac Connor 7cb4090d7d can't use jquery like that 2017-08-03 12:41:43 -04:00
Isaac Connor 5a73c38237 video storage fixes (#1958)
* use a monitor object instead of just a db array.

* fix braces, spacing, move pod docs to bottom

* Fix memleak by freeing input and output frames

* Always set the packet stream_index to the id of the output stream.
2017-08-02 16:29:23 -04:00
Isaac Connor 6d46b36c80 Hide close button if not in a popup 2017-08-01 14:21:50 -04:00
Isaac Connor 259b7f7655 fix memleak 2017-07-31 15:49:27 -04:00
Isaac Connor 792d8640c2 use the analyze file if exists as thumbnail 2017-07-28 09:54:33 -04:00
Isaac Connor 33ce55584f Merge branch 'master' into storageareas 2017-07-26 10:48:42 -04:00
Isaac Connor 30057ddffe Merge branch 'master' of github.com:ZoneMinder/ZoneMinder 2017-07-26 10:38:25 -04:00
Isaac Connor 1cfd657168 put back the preg_replace that strips usernames and passwords from monitor source 2017-07-26 10:22:57 -04:00
Isaac Connor cfbfc0dd44 Merge branch 'master' into storageareas 2017-07-21 11:04:32 -04:00
Isaac Connor 3bd9d96027 Merge branch 'master' of github.com:ZoneMinder/ZoneMinder 2017-07-21 10:54:57 -04:00
Isaac Connor efb02f3368 fix indent 2017-07-21 10:54:48 -04:00
Isaac Connor 457d909c88 fix quotes 2017-07-21 10:54:33 -04:00
Andrew Bauer 5cf2be528a Merge pull request #1950 from connortechnology/fix_api_logs
fix path to logs for api
2017-07-14 13:19:12 -05:00
Andrew Bauer c98255dd75 Merge pull request #1948 from connortechnology/fix_empty_monitor_source_column
Fix empty monitor source column
2017-07-14 13:10:52 -05:00
Isaac Connor b030fee429 don't do csrf checks for control commands 2017-07-14 12:29:24 -04:00
Isaac Connor 240a990c7f fix writing to config 2017-07-14 12:19:43 -04:00
Isaac Connor e203064bf7 updates bootstrap.php.in to match config.php's conf.d loading 2017-07-14 12:03:00 -04:00
Isaac Connor 13a72b7a99 fix path to logs for api 2017-07-14 11:58:15 -04:00
Isaac Connor 1a8638f3dd Merge branch 'master' of github.com:ConnorTechnology/ZoneMinder 2017-07-14 11:50:01 -04:00
Isaac Connor 9824049c0c fix conf.d loading in api 2017-07-14 11:46:36 -04:00
Andrew Bauer 89bcfc4e28 fix incorrect gpl license text mailing address 2017-07-14 10:39:50 -05:00
Isaac Connor d13d7e9050 recode the bit that outputs the link under source so that it defaults to Monitor # under all situations 2017-07-14 09:57:25 -04:00
Isaac Connor 0e54d4e69a imposing a height on the textpanel causes the text to overflow 2017-07-14 09:26:56 -04:00
Isaac Connor df0497b3a7 always use onmouseover, as we can now pull images fairly quickly from the mp4 2017-07-14 09:25:53 -04:00
Isaac Connor 8bbad9adf8 braces, spaces 2017-07-13 17:35:06 -04:00
Isaac Connor a16d01a931 use less ram loading events 2017-07-13 17:34:45 -04:00
Isaac Connor 63e974192c handle case when no filter is specified 2017-07-13 14:57:27 -04:00
Isaac Connor 37003aebcf Merge branch 'master' into storageareas 2017-07-13 11:07:06 -04:00
Isaac Connor f7a99a1106 make montagereview not load all events and frames at once, so that it doesn't use up all memory 2017-07-13 11:06:08 -04:00
Isaac Connor 0df6ac2895 Merge branch 'master' into storageareas 2017-07-13 11:04:51 -04:00
Isaac Connor 403dca78fb break up a long line 2017-07-13 10:26:24 -04:00
Isaac Connor a5f9c01298 fixes braces and spacing and add some debug lines when the onvif-probe output doesn't match what is expected 2017-07-13 10:26:09 -04:00
Isaac Connor cb88952a77 braces and spacing 2017-07-13 10:25:14 -04:00
Isaac Connor aff7e94725 default to TCP for Method 2017-07-13 10:23:30 -04:00
Isaac Connor 363303efa9 use isset instead of empty to get rid of warning 2017-07-13 10:08:36 -04:00
Isaac Connor f294acde92 add global and for including the state view 2017-07-13 10:07:23 -04:00
Isaac Connor 22e957ba46 clean up state a bit, use 1 less call to daemon check by using global . When selecting a layout, set img width to 100% 2017-07-12 12:49:01 -04:00
Isaac Connor 0adc14da4e fix links to Filter and Devices 2017-07-12 11:17:07 -04:00
Isaac Connor c9689aa010 fix braces,spacing,quotes. Change form method to post 2017-07-12 10:58:20 -04:00
Isaac Connor bd681de955 fix braces 2017-07-12 10:57:45 -04:00
Isaac Connor fed4dae7e5 fix width and height in options 2017-07-11 19:13:29 -04:00
Isaac Connor 148d7066f9 Merge branch 'master' into storageareas 2017-07-11 16:15:02 -04:00
Isaac Connor dfd1c2844a remove storageId 2017-07-11 11:28:15 -04:00
Isaac Connor 0eb7bfabf2 put the ajax query back to a post 2017-07-07 12:15:09 -04:00
Isaac Connor 90882edc31 make montage images be display: block; This makes the layout not jump around when a camera feed dies 2017-07-07 10:05:20 -04:00
Isaac Connor 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
Isaac Connor 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
Andrew Bauer 4128f5861f Merge pull request #1940 from connortechnology/montagereview_rework
Montagereview rework
2017-07-07 08:34:01 -05:00
Isaac Connor 21881235f9 merge changeWidth and changeHeight 2017-07-07 09:31:53 -04:00
Isaac Connor d3ec50aa69 various fixes plus use global db functions in logger 2017-07-06 17:45:23 -04:00
Isaac Connor 50adec45c5 Strip non 7-bit ascii chars from log message 2017-07-06 11:45:17 -04:00
Isaac Connor 7533d09631 increase log query time minimum to 2 seconds. 1 is too frequent. 2017-07-06 11:42:35 -04:00
Isaac Connor c2a042c0e7 replace with $)REQUEST so that logs can be query using a GET. Strip non-asci8bit chars from log message 2017-07-06 11:42:04 -04:00
Isaac Connor c372787882 fix typo 2017-07-06 10:50:56 -04:00
Isaac Connor 4aba4178da fix spacing 2017-07-06 10:50:07 -04:00
Isaac Connor e892841d7e Fix typo 2017-07-06 10:49:54 -04:00
Isaac Connor cf0944f0ad spacing and quotes 2017-07-06 10:49:36 -04:00
Isaac Connor 48d1174dd6 hide buttons when using videojs 2017-07-06 10:49:27 -04:00
Isaac Connor 48373f0d8b fix filters on console. filter object now has terms under a Query array 2017-07-06 10:49:10 -04:00
Isaac Connor 5f03faa77e view=frame needs more vertical space 2017-07-06 10:48:52 -04:00
Isaac Connor 874dc79948 tell eventdetail popup to close on save 2017-07-06 10:48:33 -04:00
Isaac Connor 3233105d2c implement a way to tell a popup to close 2017-07-06 10:48:06 -04:00
Isaac Connor 9b4fb05d5b Fix parseFilter because terms is now under Query 2017-07-06 10:47:47 -04:00
Isaac Connor d892b94819 spacing 2017-07-06 09:38:30 -04:00
Isaac Connor c3c6459052 Merge branch 'montagereview_rework' into storageareas 2017-07-05 15:34:02 -04:00
Isaac Connor 6b2e23e1a5 Merge branch 'montagereview_rework' of ../ZoneMinder.master into montagereview_rework 2017-07-05 14:27:46 -04:00
Isaac Connor 1e21beb1cd use instead of document.getElementById 2017-07-05 14:25:44 -04:00
Isaac Connor 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
Isaac Connor 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
Isaac Connor 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
Isaac Connor 3068987308 Merge branch 'master' into montagereview_rework 2017-07-05 13:53:00 -04:00
Isaac Connor 8c19b129d7 more wip 2017-07-04 12:33:01 -04:00
Isaac Connor f87a89a5ce more fixes 2017-07-04 11:51:23 -04:00
Isaac Connor d7950bd732 Merge branch 'master' into knnniggett-configfiles 2017-07-03 21:53:47 -04:00
Isaac Connor a263de144b fixup defaults for Filter 2017-06-29 15:00:17 -04:00
Isaac Connor 6fc1581b9e use a monitor object instead of just a db array. 2017-06-28 20:33:53 -04:00
Isaac Connor 621d2e0e41 remove debug code 2017-06-28 15:18:12 -04:00
Isaac Connor 8b1459a510 fixes for cambozola on ie, and fixes to setting fixed widths 2017-06-28 15:17:55 -04:00
Isaac Connor ed4da1e8bc change to single quotes 2017-06-28 14:27:09 -04:00
Isaac Connor 90696331a9 Merge branch 'master' into storageareas 2017-06-26 21:58:11 -04:00
Isaac Connor f782aeccd9 fix view is view_video, not action=niew_video 2017-06-26 21:09:54 -04:00
Isaac Connor 3a113899ed whitespace and braces fixing 2017-06-26 14:29:45 -04:00
Isaac Connor 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
Isaac Connor d97d156efb Don't do csrf for view_video 2017-06-26 11:48:26 -04:00
Isaac Connor b5565bb16a fix filters, refreshparent in wrong block 2017-06-23 09:04:46 -04:00
Isaac Connor 892f3a06c7 wip 2017-06-23 08:32:09 -04:00
Isaac Connor 76f63686cb Merge branch 'fix_event_viewing' into storageareas 2017-06-22 09:24:31 -04:00
Isaac Connor 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
Isaac Connor c7026a1b65 requests should be csrf'd. view_video does not need to be 2017-06-20 10:56:59 -04:00
Isaac Connor 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
Isaac Connor 375e4a3e9c More filter UI fixes 2017-06-20 10:45:16 -04:00
Isaac Connor 5bdfb8ae4e add a question mark to delete confirm message and just submit the form 2017-06-20 09:09:21 -04:00
Isaac Connor 5df4494c6c make Filters a main window view instead of a popup 2017-06-20 09:08:57 -04:00
Isaac Connor 93f81daa8d Fix saving logic 2017-06-20 09:08:25 -04:00
Isaac Connor dc96ca72a8 Fix AutoDetail=>AutoDelete, add Id to defaults and remove debugging 2017-06-20 09:08:15 -04:00
Isaac Connor 965b306ebc continue redoing filters 2017-06-19 13:24:02 -04:00
Isaac Connor 1d9e0b7d69 fix saving filters 2017-06-19 10:18:44 -04:00
Isaac Connor 75c11431e6 deprecate filtersavepopup 2017-06-16 11:10:25 -04:00
Isaac Connor 3225891843 update/fix filter behaviour 2017-06-15 15:45:43 -04:00
Isaac Connor 91a070b835 Merge branch 'master' into storageareas 2017-06-15 13:13:08 -04:00
Isaac Connor 119f8fc86c Fix version checks to fix build on yaketty 2017-06-15 13:02:54 -04:00
Isaac Connor 8145f2bc4c whitespace 2017-06-15 12:13:40 -04:00
Isaac Connor 1f14870b38 updates, fix merge problems 2017-06-14 15:35:35 -04:00
Isaac Connor e2139920a8 change some more quotes 2017-06-14 15:09:21 -04:00
Isaac Connor 9f301e3c51 Merge branch 'log_no_truncate' into storageareas 2017-06-14 10:18:27 -04:00
Isaac Connor 4219bcd1ca add the missing .map file for bootstrap 2017-06-14 09:36:49 -04:00
Isaac Connor ce6a6a41a8 fix gif->png and the path for arrow-s-u and arrow-s-d 2017-06-14 09:34:03 -04:00
Isaac Connor 085d239a6e Merge branch 'master' into storageareas 2017-06-13 18:02:28 -04:00
Andrew Bauer 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
Andrew Bauer c11a219b9f Merge pull request #1896 from connortechnology/dragndrop_monitor_sorting
Dragndrop monitor sorting
2017-06-12 20:49:51 -05:00
Andrew Bauer 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
Isaac Connor 528582fec6 fix tabs 2017-06-09 10:36:38 -04:00
Isaac Connor 1788aabb6c Merge branch 'storageareas' into move_dirs 2017-06-09 10:35:58 -04:00
Isaac Connor 371b86300a Merge branch 'master' into storageareas 2017-06-08 14:23:40 -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 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 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
Isaac Connor d524f98d43 add find_all function 2017-06-06 20:29:17 -04:00
Isaac Connor 1ab5e0e374 Merge branch 'master' of github.com:ZoneMinder/ZoneMinder 2017-06-06 15:36:10 -04:00
Isaac Connor 04aa01ba0c add login css files 2017-06-05 21:41:39 -04:00
Isaac Connor cfa292a204 update widths of monitors when selecting a layout 2017-06-05 19:53:19 -04:00
Isaac Connor 46f23efa01 increaes height of eventdetail popup 2017-06-05 19:52:32 -04: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 c71a4fd690 fix spacing 2017-06-05 15:36:37 -04:00
Isaac Connor 08d505360d spacing 2017-06-05 15:22:32 -04:00
Isaac Connor ad4264dad7 spacing 2017-06-05 15:21:27 -04:00
Isaac Connor 36ae355a2c spacing, braces 2017-06-05 15:21:07 -04:00
Isaac Connor e1da754ff1 scale zones svg as well when changing width/height/scale 2017-06-05 13:25:27 -04:00
Isaac Connor 2a45cd02ca sync some missing styles from classic 2017-06-05 12:49:39 -04:00
Isaac Connor bfa724d06c fix spacing 2017-06-05 11:11:34 -04:00
Isaac Connor a9183a1599 more quotes 2017-06-05 09:40:19 -04:00
Isaac Connor 451714a403 Merge branch 'master' into storageareas 2017-06-04 21:42:56 -04:00
Isaac Connor be77269acb fix merge messup 2017-06-04 17:40:54 -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 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
Isaac Connor 555a667035 fix filter button 2017-06-02 12:12:59 -04:00
Isaac Connor 352ea6b6ae spacing 2017-06-02 12:12:41 -04:00
Jørgen Edelbo cbc1636b11 Update danish translation file 2017-06-02 13:26:30 +02:00
Isaac Connor e47adcf6cc the tfoot has to come after the tbody 2017-06-01 09:36:00 -04:00