Commit Graph

1637 Commits

Author SHA1 Message Date
markjcrane ac09089f17 Fix the PostgreSQL query in cidlookup.conf.xml. 2016-01-08 18:15:45 -07:00
markjcrane 41325c0c7a Merge branch 'master' of https://github.com/fusionpbx/fusionpbx 2016-01-06 11:10:37 -07:00
blackc2004 06a3eb3e7e another directory setting url typo 2016-01-06 09:43:25 -08:00
markjcrane 371368a608 Merge branch 'master' of https://github.com/fusionpbx/fusionpbx 2016-01-05 13:19:18 -07:00
markjcrane 1a49780757 Fix the FAX retry email. 2016-01-05 13:19:02 -07:00
blackc2004 cbf4a929bf fix two files 2016-01-05 12:16:53 -08:00
blackc2004 9e45cc8acc change ldap settings to be consistent across all yealink files 2016-01-05 12:14:03 -08:00
blackc2004 387157b689 Update y000000000036.cfg 2016-01-05 11:20:33 -08:00
blackc2004 ef8ba8b92b Update y000000000029.cfg 2016-01-05 11:19:08 -08:00
FusionPBX d03573fa6e Merge pull request #1365 from blackc2004/patch-26
Update y000000000005.cfg
2016-01-05 11:40:50 -07:00
FusionPBX 4765830dd6 Merge pull request #1367 from blackc2004/patch-28
Update y000000000029.cfg
2016-01-05 11:40:07 -07:00
FusionPBX 799e02d090 Merge pull request #1364 from blackc2004/patch-27
Update y000000000046.cfg
2016-01-05 11:39:58 -07:00
blackc2004 37379daf38 Update y000000000035.cfg 2016-01-05 09:58:00 -08:00
blackc2004 e6fa94fbf7 Update y000000000029.cfg 2016-01-05 09:54:38 -08:00
blackc2004 5b61d29749 Update y000000000046.cfg 2016-01-05 09:53:43 -08:00
blackc2004 95f0ca4207 Update y000000000005.cfg 2016-01-05 09:51:58 -08:00
markjcrane b9eae2a150 Another adjustment to the xml. 2016-01-04 19:33:02 -07:00
markjcrane 8ee96d3136 A few more xml adjustments for the IVR Menu and add a desription attribute for each IVR option. 2016-01-04 19:29:39 -07:00
markjcrane 23460f69c5 Fix a small bug with the ivr. 2016-01-04 19:19:39 -07:00
markjcrane 7885323d37 Update the ivr menu to use memcache with the uuid as part of the key. 2016-01-04 19:09:29 -07:00
markjcrane 499c3c8928 Continue work to make IVR menu work from XML handler. 2016-01-04 19:05:31 -07:00
markjcrane 8d604061f5 Rename ivr.lua to ivr.conf.lua. 2016-01-04 19:03:28 -07:00
markjcrane 85e28ae838 Merge branch 'master' of https://github.com/fusionpbx/fusionpbx 2016-01-04 17:16:27 -07:00
markjcrane aac6d4ff96 Using phrase uuid instead of the phrase name reason is this prevents the phrase from breaking when the phrase name is changed. 2016-01-04 17:16:14 -07:00
FusionPBX f208e06a9d Revert "cherry picked changes from 4.0 branch" 2016-01-04 13:13:48 -07:00
markjcrane 9054881d5a FusionPBX source coding standard uses tabs instead of spaces for indentation. 2016-01-04 13:04:51 -07:00
markjcrane e823b991d1 Update destination.lua some preparation to extend it further. 2016-01-04 12:56:50 -07:00
Alexey Melnichuk f50a535e02 Fix. Definition of `uuid` function in destination.lua. 2016-01-04 09:56:06 +03:00
markjcrane 8c52b1167f Change lang_path to phrases_dir in languages.lua. 2016-01-03 00:42:40 -07:00
markjcrane 16ca1ebb99 Rename ring_member.lua to destination.lua. 2016-01-02 16:38:59 -07:00
markjcrane 4be9932c45 Remove the + from the format_phone function. 2016-01-02 16:22:19 -07:00
markjcrane 5f3cc182fe Move ring_member.lua to ring_groups/resources/scripts/ring_member.lua. 2016-01-02 13:21:34 -07:00
markjcrane 98355e8084 Improve ring_member.lua with consistent indentation, notes, and more if session:ready to prevent errors. 2016-01-02 13:09:28 -07:00
Matthew Vale 4fdb6e9916 cherry picked changes from 4.0 branch 2015-12-31 10:11:31 +00:00
markjcrane 036eb31031 Add odbc-dsn to fifo.conf.xml 2015-12-29 23:47:20 -07:00
markjcrane d839b78bc0 Merge branch 'master' of https://github.com/fusionpbx/fusionpbx 2015-12-29 14:54:09 -07:00
markjcrane 60cfbf3fe0 Trim the default codecs slightly. 2015-12-29 14:53:53 -07:00
Alexey Melnichuk 85ad1fc976 Change. Reuse same esl connection to send cache event and command.
Fix. Implicitly close esl connection after do cache command.
2015-12-24 13:19:53 +03:00
markjcrane ac87b19b4f Change the .wav to ${record_ext} in the internal sip profiles. 2015-12-23 13:23:54 -07:00
markjcrane 7cc88761aa Add record_ext to the recordings.lua. 2015-12-23 12:02:14 -07:00
markjcrane 91a0f1370e Merge branch 'master' of https://github.com/fusionpbx/fusionpbx 2015-12-22 21:30:55 -07:00
markjcrane d8ca3245c5 AND r.enabled = 'true' shows up on two lines change one to m.enabled and then add m.enabled to the second query. 2015-12-22 21:30:36 -07:00
FusionPBX e060e53783 Merge pull request #1341 from moteus/directory_acl_directory
Fix. Generate XML for mod_directory.
2015-12-22 20:54:25 -07:00
Alexey Melnichuk 639426f1d2 Fix. Remove unused code. 2015-12-22 17:19:14 +03:00
markjcrane 56499a6cc3 Fix the ring back on the XML handler -> callcenter.conf.lua. 2015-12-21 23:31:46 -07:00
markjcrane b721572c56 Add session cookie httponly and set it to true. 2015-12-21 20:52:54 -07:00
Alexey Melnichuk d1c07df479 Fix. Generate XML for mod_directory.
Fix. Generate XML for ACL only for ext which contain `cidr` attr.
Fix. Do not generate entire XML with all ext when sofia request gateways
2015-12-21 17:17:06 +03:00
markjcrane d6c03f19e9 Remove this->write_debug from the recursive functions. 2015-12-21 04:31:44 -07:00
markjcrane cf7fc6954d Remove 'protected' from the function. 2015-12-21 04:28:23 -07:00
FusionPBX f156805c8c Merge pull request #1339 from mafoo/Enhance-resouce/functions.php
migrated install_switch's recursive_* routines
2015-12-21 04:25:29 -07:00