dbxe/fusionpbx
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
6,249 Commits 3 Branches 10 Tags
7fa8226f8d47db7ba029fbd5edc845f69d6a34c4
Commit Graph
100 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
markjcrane 6631061d70 Set the default theme as the default. 2016-03-25 16:30:35 -06:00
FusionPBX 5906618ff3 Merge pull request #1510 from moteus/databas_role 
Add. `role` to be able select database backend in constructor.
 2016-03-25 15:52:47 -06:00
FusionPBX c5e804cb3c Update acl.conf.lua 
Change expire acl.conf to acl_conf
 2016-03-25 01:00:43 -06:00
markjcrane ab7bd4a3d3 Merge branch 'master' of https://github.com/fusionpbx/fusionpbx 2016-03-24 23:08:45 -06:00
markjcrane 66e01ef9dc Change to the new context require renaming two variables to be consistent and to prevent a problem. 2016-03-24 23:08:23 -06:00
FusionPBX e19d0ccd74 Merge pull request #1509 from fusionpbx/revert-1508-revert-1507-revert-1497-master 
Revert "Revert "Revert "search selects"""
 2016-03-24 22:26:18 -06:00
FusionPBX eb81998165 Revert "Revert "Revert "search selects""" 2016-03-24 22:25:18 -06:00
FusionPBX 1bec4aba89 Merge pull request #1508 from fusionpbx/revert-1507-revert-1497-master 
Revert "Revert "search selects""
 2016-03-24 22:03:56 -06:00
FusionPBX 90242c0c60 Revert "Revert "search selects"" 2016-03-24 22:03:37 -06:00
FusionPBX 1a576b0d6a Merge pull request #1507 from fusionpbx/revert-1497-master 
Revert "search selects"
 2016-03-24 22:02:59 -06:00
FusionPBX 68e728b0b6 Revert "search selects" 2016-03-24 22:02:41 -06:00
FusionPBX 7217d29d8b Merge pull request #1497 from blackc2004/master 
search selects
 2016-03-24 21:56:20 -06:00
FusionPBX 1eb5b54119 Merge pull request #1491 from dis45927/master 
Fix bug preventing mysql database creation
 2016-03-24 21:47:11 -06:00
FusionPBX a0e736fb34 Merge pull request #1500 from moteus/provision_contact_sql 
Fix. SQL text to query user contact in provision class
 2016-03-24 21:44:32 -06:00
markjcrane 459a5931fa Fix some of the elements in the contacts array. 2016-03-24 21:43:03 -06:00
FusionPBX 1807b37872 Merge pull request #1502 from moteus/provision_contact_category 
Fix. Export `contact_category` for provisioning template
 2016-03-24 21:38:50 -06:00
FusionPBX eeae7f0cc8 Merge pull request #1503 from blackc2004/patch-37 
Update directory_extensions.xml
 2016-03-24 21:37:06 -06:00
FusionPBX 4f068c1d7f Merge pull request #1504 from blackc2004/patch-38 
Update directory_extensions.xml
 2016-03-24 21:28:46 -06:00
FusionPBX f180be3792 Merge pull request #1505 from blackc2004/patch-39 
Update directory_extensions.xml
 2016-03-24 21:28:26 -06:00
FusionPBX 29777ef631 Merge pull request #1506 from blackc2004/patch-40 
Update directory_extensions.xml
 2016-03-24 21:28:01 -06:00
markjcrane 0e3ea02f72 Change sytnax from database["name"] to database.name in the config.lua. 2016-03-24 20:15:09 -06:00
markjcrane e1b6087e04 Use regex with is_local. 2016-03-24 18:43:51 -06:00
markjcrane b940749eb5 Merge branch 'master' of https://github.com/fusionpbx/fusionpbx 2016-03-24 15:02:30 -06:00
markjcrane 83edd6a7fd On windows force to / instead of the backslash \ as path. This fixes a problem where recording c:\pathtofusionpbx\recordings fails because the \r gets understood as a carriage return in the session:record in FreeSWITCH. 2016-03-24 15:02:04 -06:00
FusionPBX 53d609624b Merge pull request #1499 from moteus/fax_active_gateway_name 
Fix. Display correct gateway name in URI on `Fax Active` page
 2016-03-23 21:34:45 -06:00
markjcrane 785071cde6 In the IVR Menu make sure direct dial checks if the destination is an extension before sending the call to it. 2016-03-23 12:49:32 -06:00
markjcrane db3c649aaf Update the disa.lua to prevent errors when caller hangs up before the destination is called. 2016-03-23 11:42:20 -06:00
markjcrane bb379b997e Show both LAN and WAN IP in the registrations. 2016-03-23 00:14:30 -06:00
markjcrane 85263b3a00 Replace the external ip with the internal nat ip address. 2016-03-23 00:07:50 -06:00
markjcrane f5002bec99 Re-add the time condition dialplan button label. 2016-03-22 23:52:37 -06:00
markjcrane c4332db765 Time condition hide the group label as it uses too much vertical space and the group number is provided by default. 2016-03-22 23:39:23 -06:00
markjcrane fe320d40da Merge branch 'master' of https://github.com/fusionpbx/fusionpbx 2016-03-21 23:45:36 -06:00
markjcrane cb320f3734 SPA122 - Set message waiting light to No when provisioning the device. 2016-03-21 23:45:05 -06:00
markjcrane f3114cdf05 Add support for destination_number name to be customized on inbound routes. 2016-03-21 11:13:47 -06:00
markjcrane 468f4f859c Merge branch 'master' of https://github.com/fusionpbx/fusionpbx 2016-03-20 13:52:00 -06:00
markjcrane ab4fb51355 Fix the install title. 2016-03-20 13:51:17 -06:00
markjcrane 8a0331925a Fix a spelling mistake in xml handler ivr.conf.lua. 2016-03-20 00:49:21 -06:00
markjcrane bdcd499b2c Fix a minor display issue for contacts. 2016-03-19 21:57:37 -06:00
markjcrane a11ee88cd8 Hide the IVR sub menus until they are ready. 2016-03-19 21:18:07 -06:00
markjcrane 8139ddeb56 Correct the syntax for the app destinations array. 2016-03-19 19:59:52 -06:00
markjcrane e984d7e00a Update the IVR Menu class to make dialplan more modular. Add option for LUA or application IVR. 2016-03-19 19:06:06 -06:00
markjcrane b626edb480 Minor change to indent on one line. 2016-03-19 18:23:19 -06:00
markjcrane 57e212ff42 Fix direct dial for IVR using the xml handler. 2016-03-19 18:13:49 -06:00
FusionPBX ee7f8c08d7 Merge pull request #1495 from blackc2004/master 
fix some email stuff
 2016-03-19 15:17:43 -06:00
markjcrane baac930c8a Merge branch 'master' of https://github.com/fusionpbx/fusionpbx 2016-03-17 13:22:27 -06:00
markjcrane db8fa2e5f5 Add destination number regex and string_to_regex function. 2016-03-17 13:22:03 -06:00
markjcrane 36d8c7815d Change daylight_savings_start_date to daylight_savings_start_day as it is more accurate for representing the data. Add daylight_savings_start_time and daylight_savings_stop_time 2016-03-15 16:15:32 -06:00
markjcrane 6e4be852ad Update default settings add daylight_savings_start_month and date for the polycom templates. 2016-03-15 13:51:01 -06:00
markjcrane 926cda4a97 Add polycom_digitmap to provision category in default settings. 2016-03-15 12:50:04 -06:00
markjcrane 121c58ebe7 Move contact_exists to a method in the provision class. 2016-03-15 12:22:57 -06:00
markjcrane 6905b37df9 Merge branch 'master' of https://github.com/fusionpbx/fusionpbx 2016-03-15 03:23:00 -06:00
markjcrane eb5d95c5d5 Remove the body of the email from the log in the tmp directory to make it more readable and better compatibility with tail -f. 2016-03-15 03:22:38 -06:00
FusionPBX 133c0c8258 Merge pull request #1489 from mafoo/Enhance-device_edit 
Enhance device_edit
 2016-03-15 03:12:57 -06:00
markjcrane da71d80a69 Merge branch 'master' of https://github.com/fusionpbx/fusionpbx 2016-03-15 02:58:48 -06:00
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
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
markjcrane 676ef47d34 Move flags to a more standard directory. If they get used by another feature then the flags should be moved to the main fusionpbx/resources/images directory. 2016-03-09 11:12:47 -07:00
markjcrane 81e0a9c7c2 Add new default settings for http_auth_type, contact_extensions, contact_groups, and contact_users. 2016-03-07 21:35:38 -07:00
markjcrane f475437a9d Add http digest authentication and make it the default with an option to use basic if required. 2016-03-07 21:31:37 -07:00
markjcrane 2378db990f Remove the limit on the setting value of 255 as it blocks the length fax footer. 2016-03-07 12:04:07 -07: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 75780c1ec1 Add the contacts array to provisioning template to be used for the phone directory. 2016-03-04 18:37:01 -07:00
markjcrane 010a237c09 Handle the phrases_dir nil in a more flexible way. 2016-03-04 15:51:10 -07:00