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

6162 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 169220439f Merge pull request #1459 from moteus/operator_panel_short_number 
Fix. Use operator panel with short extension.
 2016-03-11 13:38:18 -07:00
FusionPBX b53164ac93 Merge pull request #1468 from mafoo/WhitespaceClean-app/batch_1 
WhitespaceClean-app/batch_1
 2016-03-11 13:35:41 -07:00
FusionPBX 5a8a19af39 Merge pull request #1469 from mafoo/WhitespaceClean-app/batch_2 
WhitespaceClean-app/batch_2
 2016-03-11 13:35:24 -07:00
FusionPBX 80063e00bf Merge pull request #1471 from mafoo/WhitespaceClean-core/batch 
WhitespaceClean-core/batch
 2016-03-11 13:35:06 -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 e2f06cf8f3 Merge pull request #1466 from mafoo/WhitespaceClean-app/sip_profiles 
WhitespaceClean-app/sip_profiles
 2016-03-11 13:27:38 -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 8b7c0ffe6d Merge pull request #1467 from mafoo/WhitespaceClean-app/xml_cdr 
WhitespaceClean-app/xml_cdr
 2016-03-11 13:25:49 -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 970c1d54e2 Merge pull request #1460 from mafoo/Enhance-Add_mod_translate 
added mod_translate to the modules list
 2016-03-11 13:24:43 -07:00
FusionPBX 68a121cd66 Merge pull request #1462 from mafoo/BugFix-Translation-True_False 
BugFix-Translation-True_False
 2016-03-11 13:24:13 -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 15b432ab52 Merge pull request #1470 from mafoo/WhitespaceClean-core/install 
WhitespaceClean-core/install
 2016-03-11 13:22:30 -07:00
FusionPBX 61e9010319 Merge pull request #1465 from mafoo/WhitespaceClean-app/dialplan 
WhitespaceClean-app/dialplan
 2016-03-11 13:22:02 -07:00
FusionPBX 2a358bb517 Merge pull request #1463 from mafoo/WhitespaceClean-root 
WhitespaceClean-root
 2016-03-11 13:21:22 -07:00
FusionPBX e21dfcb69c Merge pull request #1464 from mafoo/WhitespaceClean-app/access_controls 
WhitespaceClean-app/access_controls
 2016-03-11 13:21:00 -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
FusionPBX 1e2ec83129 Merge pull request #1485 from mafoo/WhitespaceClean-others 
WhitespaceClean-others
 2016-03-11 13:12:41 -07:00
markjcrane b135f6b120 Change device_provision_enable to device_enabled to make it consistent with the rest of the fields that are used for to enable and disable something. 2016-03-11 11:46:02 -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 7c01967366 WhitespaceClean-others 
whitespace pass over files
for reference regex that was used s/[ \t]+(\r?\n)/\1/
 2016-03-11 13:58:35 +00: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
mafoo 1f609dc806 WhitespaceClean-core/batch 
whitespace pass over files
for reference regex that was used s/[ \t]+(\r?\n)/\1/
 2016-03-11 12:06:20 +00:00