Commit Graph

495 Commits

Author SHA1 Message Date
markjcrane
ed2898aa33 Merge branch 'master' of https://github.com/fusionpbx/fusionpbx 2016-03-11 14:21:28 -07:00
markjcrane
8588a4caea Get the domain_name from the array. 2016-03-11 14:21:08 -07:00
FusionPBX
93c4c56da2 Merge pull request #1461 from mafoo/BugFix-ring_groups
corrected function definition
2016-03-11 13:25:20 -07:00
FusionPBX
c6a68388a1 Merge pull request #1479 from mafoo/WhitespaceClean-resources/install/scripts
WhitespaceClean-resources/install/scripts
2016-03-11 13:20:17 -07:00
markjcrane
3898a18f42 Prevent custom sip port from breaking provision.lua and add prevent nil concatenation errors. 2016-03-11 10:31:11 -07:00
mafoo
b7555579bf WhitespaceClean-resources/install/scripts
whitespace pass over files
for reference regex that was used s/[ \t]+(\r?\n)/\1/
2016-03-11 13:21:52 +00:00
markjcrane
11c2176a15 The last two changes to xml handler dialplan.lua did not work well with global dialplans. Removed some of the changes to fix the regression. 2016-03-11 00:58:52 -07:00
markjcrane
ad7e9336dd Add missing call_direction for ring group destinations. 2016-03-10 18:10:49 -07:00
markjcrane
56c3bde940 Use a more efficient way to get the domain name for xml handler - dialplan. 2016-03-10 08:18:46 -07:00
markjcrane
39b38738d8 Increase efficiency xml handler section dialplan. 2016-03-09 13:09:25 -07:00
mafoo
49fe51710c corrected function definition
fixed bug introduced on 2/1/2016 in destination.lua
fixed bug introduced on 2/1/2016 in ring_member.lua
2016-03-09 17:54:44 +00:00
markjcrane
47ea47710c Fix the phrases_dir if statement. If the phrases_dir is not null then need to include xml from the file system. 2016-03-07 10:30:29 -07:00
markjcrane
010a237c09 Handle the phrases_dir nil in a more flexible way. 2016-03-04 15:51:10 -07:00
markjcrane
7cbb32dcd3 Ensure the phrases_dir is not nil. 2016-03-04 15:08:58 -07:00
markjcrane
fb8046accb Prevent a nil error for xml handler languages. 2016-03-04 12:35:37 -07:00
markjcrane
49c3b3e991 Add ring_member.lua to app/ring_groups/resources/scripts/ring_member.lua. 2016-02-29 18:52:04 -07:00
markjcrane
de53ae149e Fix a spelling mistake in the log message in dialplan.lua. 2016-02-22 13:17:04 -07:00
FusionPBX
6e3792bf05 Merge pull request #1420 from moteus/fix_partial_dialplan
Fix. Do not build context if there error.
2016-02-03 21:32:15 -07:00
markjcrane
f525d2bbda Remove trailing whitespaces. 2016-02-03 19:03:16 -07:00
markjcrane
4bb748a300 Base64 - Make sure the directory structure exists. 2016-02-03 10:01:43 -07:00
Alexey Melnichuk
48b3aa2917 Add. debug message to log. 2016-02-02 19:32:27 +03:00
Alexey Melnichuk
057d487ee7 Fix. Do not build context if there error. 2016-02-02 19:08:19 +03:00
FusionPBX
012655ab23 Merge pull request #1415 from mafoo/Enhance-ringback
Enhance ringback
2016-01-29 07:24:14 -07:00
mafoo
02566294cb converted callcenter to use common function 2016-01-29 11:26:21 +00:00
mafoo
ef31b4082d Converted uses of ringback to common function 2016-01-28 15:51:50 +00:00
markjcrane
495bafd3f5 Remove the recordings_dir with automatic domain_name and add domain_name in a few places where it was missing. 2016-01-25 16:53:09 -07:00
markjcrane
7d375d05de Add recording file handling to the ivr xml handler. 2016-01-25 16:32:27 -07:00
markjcrane
19945b5095 Change the comment in check_password.lua. 2016-01-22 12:24:18 -07:00
Alexey Melnichuk
e4e6fe92a9 Fix. Do not prompt password if there no mailbox. 2016-01-22 11:37:34 +03:00
FusionPBX
fad8343802 Merge pull request #1387 from mafoo/BugFix-Languages
BugFixes in languages.lua
2016-01-15 21:42:48 -07:00
Matthew Vale
0111fff25b BugFixes in languages.lua
removed extra ;'s
fix file_handle:close to be inside the if null check
2016-01-15 10:35:19 +00:00
Alexey Melnichuk
49a6a760dd Change. Move fax_queue_* scripts to app/fax/resources/scripts 2016-01-13 10:22:32 +03:00
markjcrane
2a04a88b69 Add dsn_callcenter and improve the indentation. 2016-01-12 01:48:11 -07: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
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
5f3cc182fe Move ring_member.lua to ring_groups/resources/scripts/ring_member.lua. 2016-01-02 13:21:34 -07:00
Matthew Vale
4fdb6e9916 cherry picked changes from 4.0 branch 2015-12-31 10:11:31 +00: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