Commit Graph

5768 Commits

Author SHA1 Message Date
Luis Daniel Lucio Quiroz
2fccf1c09e Bill the incoming call
wrong variable, use the correct one.
2016-01-08 23:44:06 -05:00
markjcrane
86b0e88d16 Fix the PostgreSQL query in cidlookup.conf.xml. 2016-01-08 18:15:45 -07:00
markjcrane
728e33bd68 Update the name of the dialplan. 2016-01-08 14:13:00 -07:00
markjcrane
b1839f08e7 Add a dialplan for mod_cidlookup. 2016-01-08 14:05:59 -07:00
markjcrane
7ea8a14384 Merge branch 'master' of https://github.com/fusionpbx/fusionpbx 2016-01-06 11:10:37 -07:00
FusionPBX
fcbf99a9a3 Merge pull request #1375 from blackc2004/master
fix another directory setting url
2016-01-06 10:55:16 -07:00
blackc2004
7269520f99 another directory setting url typo 2016-01-06 09:43:25 -08:00
blackc2004
c3ddf320c3 Merge pull request #8 from fusionpbx/master
Merge pull request #1373 from blackc2004/master
2016-01-06 09:40:37 -08:00
FusionPBX
82a5e4076c Merge pull request #1373 from blackc2004/master
fix directory setting url typo
2016-01-05 13:24:54 -07:00
markjcrane
0da3b9fe4a Merge branch 'master' of https://github.com/fusionpbx/fusionpbx 2016-01-05 13:19:18 -07:00
markjcrane
ce78189a80 Fix the FAX retry email. 2016-01-05 13:19:02 -07:00
blackc2004
9d99de26bc fix two files 2016-01-05 12:16:53 -08:00
blackc2004
868affab3a change ldap settings to be consistent across all yealink files 2016-01-05 12:14:03 -08:00
blackc2004
84a420d8df Update y000000000036.cfg 2016-01-05 11:20:33 -08:00
blackc2004
f022a5d104 Update y000000000029.cfg 2016-01-05 11:19:08 -08:00
FusionPBX
5ab294996f Merge pull request #1365 from blackc2004/patch-26
Update y000000000005.cfg
2016-01-05 11:40:50 -07:00
FusionPBX
40d2153744 Merge pull request #1366 from blackc2004/patch-25
Update y000000000035.cfg
2016-01-05 11:40:40 -07:00
FusionPBX
38861efcf7 Merge pull request #1367 from blackc2004/patch-28
Update y000000000029.cfg
2016-01-05 11:40:07 -07:00
FusionPBX
b5f9dfb69e Merge pull request #1364 from blackc2004/patch-27
Update y000000000046.cfg
2016-01-05 11:39:58 -07:00
FusionPBX
0dd27f979e Merge pull request #1368 from blackc2004/patch-29
Update y000000000035.cfg
2016-01-05 11:39:29 -07:00
FusionPBX
6cb7477952 Merge pull request #1369 from blackc2004/patch-30
Update xml_cdr_search.php
2016-01-05 11:39:07 -07:00
FusionPBX
e288318cf9 Merge pull request #1370 from blackc2004/patch-31
Update xml_cdr.php
2016-01-05 11:38:48 -07:00
FusionPBX
1aadcd7954 Merge pull request #1372 from blackc2004/patch-32
Update app_config.php
2016-01-05 11:38:08 -07:00
FusionPBX
3ca08e3f8f Merge pull request #1371 from blackc2004/patch-34
Update emails.php
2016-01-05 11:37:56 -07:00
blackc2004
52e727ed54 Update emails.php 2016-01-05 10:21:55 -08:00
blackc2004
f539ce9a29 Update app_config.php 2016-01-05 10:20:12 -08:00
blackc2004
a307a63804 Update xml_cdr.php 2016-01-05 10:13:54 -08:00
blackc2004
e3d48040f5 Update xml_cdr_search.php 2016-01-05 10:12:39 -08:00
blackc2004
f4ab98828d Update y000000000035.cfg 2016-01-05 09:58:00 -08:00
blackc2004
3303d0d907 Update y000000000029.cfg 2016-01-05 09:54:38 -08:00
blackc2004
4365535429 Update y000000000046.cfg 2016-01-05 09:53:43 -08:00
blackc2004
fe75094087 Update y000000000005.cfg 2016-01-05 09:51:58 -08:00
blackc2004
0082559650 Update y000000000035.cfg 2016-01-05 09:50:10 -08:00
FusionPBX
1f5cecf048 Merge pull request #1362 from mafoo/Enhance-Dashboard
Updated ring_group_forward for user dashboard
2016-01-05 09:46:48 -07:00
Matthew Vale
725876a0e8 Updated ring_group_forward for user dashboard
this is so the user_dashboard consistently shows the ring group name (as
used elsewhere to refer to a ring group)
2016-01-05 15:17:20 +00:00
markjcrane
98f0389947 Another adjustment to the xml. 2016-01-04 19:33:02 -07:00
markjcrane
31a395ab45 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
aa384869cc Fix a small bug with the ivr. 2016-01-04 19:19:39 -07:00
markjcrane
752a5acf8b Update the ivr menu to use memcache with the uuid as part of the key. 2016-01-04 19:09:29 -07:00
markjcrane
451b106c1e Continue work to make IVR menu work from XML handler. 2016-01-04 19:05:31 -07:00
markjcrane
2c22aea566 Rename ivr.lua to ivr.conf.lua. 2016-01-04 19:03:28 -07:00
markjcrane
1a4dc2a658 Merge branch 'master' of https://github.com/fusionpbx/fusionpbx 2016-01-04 17:16:27 -07:00
markjcrane
5daf58be72 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
e766f8a20b Merge pull request #1360 from fusionpbx/revert-1355-Merge-4.0_BugFixes
Revert "cherry picked changes from 4.0 branch"
2016-01-04 13:14:04 -07:00
FusionPBX
f062ddf289 Revert "cherry picked changes from 4.0 branch" 2016-01-04 13:13:48 -07:00
markjcrane
724afd7c17 FusionPBX source coding standard uses tabs instead of spaces for indentation. 2016-01-04 13:04:51 -07:00
markjcrane
72c1e23d56 Update destination.lua some preparation to extend it further. 2016-01-04 12:56:50 -07:00
FusionPBX
394bdfdaef Merge pull request #1358 from moteus/ring_group_dest_uuid
Fix. Definition of `uuid` function in destination.lua.
2016-01-04 12:46:15 -07:00
Alexey Melnichuk
bc9ffa431f Fix. Definition of uuid function in destination.lua. 2016-01-04 09:56:06 +03:00
markjcrane
ccc44825e8 Change lang_path to phrases_dir in languages.lua. 2016-01-03 00:42:40 -07:00