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

1793 Commits

Author SHA1 Message Date
markjcrane 0deda1db2e Rolling back PHPMailer from version 5.2.14 to 5.2.2. The latest version had a problem with smtp authentication set to false it still tried to authenticate. 2016-03-15 02:58:23 -06:00
markjcrane d8aeecad35 Update the Cisco 79xx templates to work with the new contacts array. 2016-03-14 18:56:00 -06:00
markjcrane 1c9ee3a8ff Add a missing semi-colon. 2016-03-12 22:16:22 -07:00
markjcrane afe19e8a40 Change $language_name to $text['language-name'] this will follow current naming standards in app_languages.php and reduces code needed in the text class. 2016-03-12 22:06:57 -07:00
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 c529dcdac1 Merge pull request #1475 from mafoo/WhitespaceClean-resources/provision/polycom 
WhitespaceClean-resources/provision/polycom
 2016-03-11 13:34:49 -07:00
FusionPBX 9e1564b967 Merge pull request #1476 from mafoo/WhitespaceClean-resources/provision/yealink 
WhitespaceClean-resources/provision/yealink
 2016-03-11 13:34:22 -07:00
FusionPBX 275ebe290a Merge pull request #1474 from mafoo/WhitespaceClean-resources/provision/grandstream 
WhitespaceClean-resources/provision/grandstream
 2016-03-11 13:32:31 -07:00
FusionPBX c0a43d3cd3 Merge pull request #1477 from mafoo/WhitespaceClean-resources/provision/mitel 
WhitespaceClean-resources/provision/mitel
 2016-03-11 13:32:01 -07:00
FusionPBX 534b6d9384 Merge pull request #1478 from mafoo/WhitespaceClean-resources/provision/others 
WhitespaceClean-resources/provision/others
 2016-03-11 13:31:33 -07:00
FusionPBX 6011bb3b0f Merge pull request #1481 from mafoo/WhitespaceClean-resources/jquery 
WhitespaceClean-resources/jquery
 2016-03-11 13:27:02 -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 9987681740 Merge pull request #1472 from mafoo/WhitespaceClean-resources/classes 
WhitespaceClean-resources/classes
 2016-03-11 13:22:57 -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
FusionPBX 4219954db5 Merge pull request #1473 from mafoo/WhitespaceClean-resources/provision/cisco 
WhitespaceClean-resources/provision/cisco
 2016-03-11 13:19:13 -07:00
FusionPBX db41938a54 Merge pull request #1480 from mafoo/WhitespaceClean-resources/templates/conf 
WhitespaceClean-resources/templates/conf
 2016-03-11 13:18:21 -07:00
FusionPBX 0784e64bcb Merge pull request #1482 from mafoo/WhitespaceClean-resources/edit_area 
WhitespaceClean-resources/edit_area
 2016-03-11 13:16:31 -07:00
FusionPBX c147c958bc Merge pull request #1483 from mafoo/WhitespaceClean-resources/templates/engine/smarty 
WhitespaceClean-resources/templates/smarty
 2016-03-11 13:16:14 -07:00
FusionPBX 353843a64f Merge pull request #1484 from mafoo/WhitespaceClean-resources/others 
WhitespaceClean-resources/others
 2016-03-11 13:15:09 -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 2b39287bdc WhitespaceClean-resources/others 
whitespace pass over files
for reference regex that was used s/[ \t]+(\r?\n)/\1/
 2016-03-11 13:57:01 +00:00
mafoo 5de8363e78 WhitespaceClean-resources/templates/smarty 
whitespace pass over files
for reference regex that was used s/[ \t]+(\r?\n)/\1/
 2016-03-11 13:45:32 +00:00
mafoo ee948572a0 WhitespaceClean-resources/edit_area 
whitespace pass over files
for reference regex that was used s/[ \t]+(\r?\n)/\1/
 2016-03-11 13:29:29 +00:00
mafoo c5463d6ed3 WhitespaceClean-resources/jquery 
whitespace pass over files
for reference regex that was used s/[ \t]+(\r?\n)/\1/
 2016-03-11 13:26:36 +00:00
mafoo 0d2cc7f124 WhitespaceClean-resources/templates/conf 
whitespace pass over files
for reference regex that was used s/[ \t]+(\r?\n)/\1/
 2016-03-11 13:24:27 +00: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
mafoo e894c49823 WhitespaceClean-resources/provision/others 
whitespace pass over files
for reference regex that was used s/[ \t]+(\r?\n)/\1/
 2016-03-11 12:22:24 +00:00
mafoo cf465f4ef3 WhitespaceClean-resources/provision/mitel 
whitespace pass over files
for reference regex that was used s/[ \t]+(\r?\n)/\1/
 2016-03-11 12:20:37 +00:00
mafoo a7a3fc6a69 WhitespaceClean-resources/provision/yealink 
whitespace pass over files
for reference regex that was used s/[ \t]+(\r?\n)/\1/
 2016-03-11 12:18:50 +00:00
mafoo 6cb28a1516 WhitespaceClean-resources/provision/polycom 
whitespace pass over files
for reference regex that was used s/[ \t]+(\r?\n)/\1/
 2016-03-11 12:16:24 +00:00
mafoo e3c2c38532 WhitespaceClean-resources/provision/grandstream 
whitespace pass over files
for reference regex that was used s/[ \t]+(\r?\n)/\1/
 2016-03-11 12:12:47 +00:00
mafoo 0bbc506d41 WhitespaceClean-resources/provision/cisco 
whitespace pass over files
for reference regex that was used s/[ \t]+(\r?\n)/\1/
 2016-03-11 12:10:46 +00:00
mafoo e0fdf41320 WhitespaceClean-resources/classes 
whitespace pass over files
for reference regex that was used s/[ \t]+(\r?\n)/\1/
 2016-03-11 12:08:26 +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 847a9e926d Merge branch 'master' of https://github.com/fusionpbx/fusionpbx 2016-03-04 12:36:19 -07:00
markjcrane fb8046accb Prevent a nil error for xml handler languages. 2016-03-04 12:35:37 -07:00
reliberate ce2490dafc User Dashboard: Minor layout optimizations. 
Follow Me: Added search and minimized paging controls.
Extensions: Added minimized paging controls.
 2016-03-03 19:01:58 -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
Alexey Melnichuk 7e1481b747 Fix. FreeSWITCH also breaks loop if return string value which contain number. 
```Lua
dbh:query(sql, function()
  return "1" -- breaks loop
end)
 2016-02-26 14:17:28 +03:00
Alexey Melnichuk ebfcdc38be Fix. LuaSQL db backend breaks loop only on positive numbers. 2016-02-26 13:57:32 +03:00
Alexey Melnichuk c96a5bee48 Fix. ODBC db backend should breaks loop only when callback returns number ~= 0 
```Lua
dbh:query(sql, function(row)
  -- return 0     -- should not break loop
  -- return true  -- should not break loop
  return 1 -- should break loop
end)
```
 2016-02-26 13:52:27 +03:00
reliberate d9c6a1df4f Languages: Corrected capitalization on 'false'. 2016-02-25 11:13:18 -07:00