Commit Graph

2281 Commits

Author SHA1 Message Date
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 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 1ab5e0e374 Merge branch 'master' of github.com:ZoneMinder/ZoneMinder 2017-06-06 15:36:10 -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 a9183a1599 more quotes 2017-06-05 09:40:19 -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
Isaac Connor 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
Isaac Connor 73ca07792b double quotes to single quotes 2017-05-31 22:11:54 -04:00
Isaac Connor 5c67c87147 remove deprecated cellspacing attr on table 2017-05-31 22:08:44 -04:00
Isaac Connor 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
Isaac Connor 1df147e183 adjust spacing 2017-05-31 22:01:35 -04:00
Isaac Connor 17c8224733 begin to ahndle imageData not being populated 2017-05-31 20:55:10 -04:00
Isaac Connor 4889f3d0e8 rework logic in GetStreamImg a bit. If no frame is specified, then we can use snapshot...otherwise it should do the frame image! 2017-05-31 20:54:34 -04:00
Isaac Connor dbeb000505 Merge ../ZoneMinder.connortechnology 2017-05-31 20:45:37 -04:00
Isaac Connor 2b9134512f remove leftover 2017-05-31 20:45:21 -04:00
Isaac Connor 06a9598755 Merge ../ZoneMinder.connortechnology 2017-05-31 12:55:35 -04:00
Isaac Connor 8596891e4d fix double to single quote mistakes 2017-05-31 12:55:27 -04:00
Isaac Connor ece10d6278 braces and whitspace 2017-05-31 11:16:55 -04:00
Isaac Connor 83d6f415b3 cleanup whitespace 2017-05-30 14:07:37 -04:00
Isaac Connor b96f5cf49d more merges/fixes from SA 2017-05-30 13:50:24 -04:00
Isaac Connor 8b3b9eb30e more merges/fixes from SA 2017-05-30 13:47:30 -04:00
Isaac Connor 1a43334113 Use NULLs instead of '' when saving things 2017-05-30 13:38:57 -04:00
Isaac Connor c7b52bd998 fix logging dirs 2017-05-30 13:14:43 -04:00
Isaac Connor e9a0474cf7 add back required lines with a comment 2017-05-30 12:04:12 -04:00
Isaac Connor c5288a172d fix merge problem 2017-05-30 11:57:20 -04:00
Isaac Connor 5bbe13f98f update cycle from SA 2017-05-30 11:53:05 -04:00
Isaac Connor a75488e0f3 flat and dark skins add some padding to the header, which makes it extend beyond 99%. These lines are not needed 2017-05-30 11:52:04 -04:00
Isaac Connor 5c5aafb1e8 white space and a check for mid being set to quiet error messages 2017-05-30 11:37:48 -04:00
Isaac Connor 59d00b20b1 fix fetchImage 2017-05-30 11:35:52 -04:00
Isaac Connor f88abfcb4d the liveStream element now has the monitorId appended to it, to be consistent with montage so we can reuse code 2017-05-30 11:26:57 -04:00
Isaac Connor 3062fe43f3 revert csrf on login page. csrf needs to be off in order for zmNinja to work 2017-05-30 11:25:25 -04:00
Isaac Connor fe2155dd1a merges from SA 2017-05-30 11:15:00 -04:00
Isaac Connor c616a3b3b7 fix some bad to '' changes 2017-05-30 09:39:01 -04:00
Isaac Connor ff08843d68 replace with '' 2017-05-30 09:10:41 -04:00
Isaac Connor 043d722651 braces,whitespace 2017-05-25 14:26:49 -04:00
Isaac Connor 4347ee1258 Merge branch 'master' of github.com:ZoneMinder/ZoneMinder 2017-05-23 10:41:40 -04:00
Isaac Connor 13265a8f4f undo StorageAreas contents 2017-05-23 10:41:21 -04:00
Isaac Connor 75dc774a08 Continue to support non-USE_DEEP_STORAGE option 2017-05-22 21:21:49 -04:00
Isaac Connor 9e3af977e2 Merge branch 'master' of github.com:ZoneMinder/ZoneMinder 2017-05-19 11:09:08 -04:00