dbxe
/
fusionpbx
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
5,796 Commits 3 Branches 10 Tags 224 MiB
Commit Graph

5796 Commits

Author SHA1 Message Date
markjcrane 40b665fefa Device File download format the mac address file name according to the requirements of the vendor. 2016-01-09 09:52:27 -07:00
markjcrane 3fddd940ec Add a missing keyword function. 2016-01-09 09:46:43 -07:00
markjcrane 97ab1c9c87 Add a new method call format_mac to make the code more reusable. 2016-01-09 09:43:14 -07:00
markjcrane 878571c927 Merge branch 'master' of https://github.com/fusionpbx/fusionpbx 2016-01-09 09:29:53 -07:00
markjcrane 01edbb30b8 Set the mitel mac address to upper case. 2016-01-09 09:29:39 -07:00
FusionPBX f2444744fb Merge pull request #1380 from daniel-lucio/patch-1 
Bill the incoming call
 2016-01-08 22:54:33 -07:00
Luis Daniel Lucio Quiroz 39cbe216df Bill the incoming call 
wrong variable, use the correct one.
 2016-01-08 23:44:06 -05:00
markjcrane ac09089f17 Fix the PostgreSQL query in cidlookup.conf.xml. 2016-01-08 18:15:45 -07:00
markjcrane e0e28180bc Update the name of the dialplan. 2016-01-08 14:13:00 -07:00
markjcrane 8a76b00d88 Add a dialplan for mod_cidlookup. 2016-01-08 14:05:59 -07:00
markjcrane 41325c0c7a Merge branch 'master' of https://github.com/fusionpbx/fusionpbx 2016-01-06 11:10:37 -07:00
FusionPBX 5d15710d37 Merge pull request #1375 from blackc2004/master 
fix another directory setting url
 2016-01-06 10:55:16 -07:00
blackc2004 06a3eb3e7e another directory setting url typo 2016-01-06 09:43:25 -08:00
blackc2004 2087c9a620 Merge pull request #8 from fusionpbx/master 
Merge pull request #1373 from blackc2004/master
 2016-01-06 09:40:37 -08:00
FusionPBX 218c0ca186 Merge pull request #1373 from blackc2004/master 
fix directory setting url typo
 2016-01-05 13:24:54 -07: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 e14d876acb Merge pull request #1366 from blackc2004/patch-25 
Update y000000000035.cfg
 2016-01-05 11:40:40 -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
FusionPBX 64298527b7 Merge pull request #1368 from blackc2004/patch-29 
Update y000000000035.cfg
 2016-01-05 11:39:29 -07:00
FusionPBX 411c18477a Merge pull request #1369 from blackc2004/patch-30 
Update xml_cdr_search.php
 2016-01-05 11:39:07 -07:00
FusionPBX 610d45c355 Merge pull request #1370 from blackc2004/patch-31 
Update xml_cdr.php
 2016-01-05 11:38:48 -07:00
FusionPBX 9f2ef55808 Merge pull request #1372 from blackc2004/patch-32 
Update app_config.php
 2016-01-05 11:38:08 -07:00
FusionPBX 78a27368d7 Merge pull request #1371 from blackc2004/patch-34 
Update emails.php
 2016-01-05 11:37:56 -07:00
blackc2004 0c7b49ed29 Update emails.php 2016-01-05 10:21:55 -08:00
blackc2004 d4e3035880 Update app_config.php 2016-01-05 10:20:12 -08:00
blackc2004 8a293a1c21 Update xml_cdr.php 2016-01-05 10:13:54 -08:00
blackc2004 68d260921c Update xml_cdr_search.php 2016-01-05 10:12:39 -08: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
blackc2004 52b71faa5f Update y000000000035.cfg 2016-01-05 09:50:10 -08:00
FusionPBX c9a7278b53 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 6788adeae4 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 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 c9396f93ea 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