dbxe/fusionpbx
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
6,190 Commits 3 Branches 10 Tags
bdcd499b2c514982fc586bf1c7487a362aca0456
Commit Graph
100 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
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
markjcrane 7cbb32dcd3 Ensure the phrases_dir is not nil. 2016-03-04 15:08:58 -07:00
markjcrane b4b86b0478 Fix indentation on the editor. 2016-03-04 13:18:30 -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
markjcrane a7525a1bc7 Merge branch 'master' of https://github.com/fusionpbx/fusionpbx 2016-03-03 14:04:32 -07:00
markjcrane 66f194fecf Make the .htaccess more flexible for Apache2. 2016-03-03 14:04:02 -07:00
markjcrane 449dc0dfa7 Add the missing .php extension. 2016-02-29 20:07:32 -07:00
markjcrane 289a7b892c Fix title-install translation. 2016-02-29 19:53:13 -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
markjcrane 112a239902 Minor change remove trailing tab. 2016-02-29 18:47:51 -07:00
markjcrane 9547292524 Add a call limit dialplan disabled for now. 2016-02-29 18:46:50 -07:00
markjcrane 3ab5976328 Merge branch 'master' of https://github.com/fusionpbx/fusionpbx 2016-02-29 11:43:48 -07:00
markjcrane f7be0cc943 Fix the comment on install_switch.php. 2016-02-29 11:43:32 -07:00
markjcrane d110fe8f7e install_first_time.php rename to install.php. 2016-02-29 11:28:43 -07:00
markjcrane 093556cd42 Rename install_first_time variable and file name. Remove the install/upgrade_switch.php which isn't being used anymore. Update the indentation and remove inconsistent white spaces. 2016-02-29 09:24:05 -07:00
markjcrane 990a8e766c If follow me is enabled then show it by default. 2016-02-26 14:35:58 -07:00
markjcrane 46ea1de348 Add a new permission follow_me_ignore_busy. 2016-02-26 14:13:32 -07:00
FusionPBX a0c35e92f9 Merge pull request #1453 from moteus/db_break_loop 
Fix. Break query loop accordin FS documentation
 2016-02-26 08:57:20 -07:00
FusionPBX d111ae4630 Merge pull request #1443 from moteus/database_backend 
Database backend
 2016-02-25 08:39:07 -07:00
FusionPBX a16f6efed7 Merge pull request #1451 from moteus/edit_short_open_tag 
Fix. Works on php < 5.4.0 and short_open_tag=Off
 2016-02-25 08:38:22 -07:00
markjcrane 9b2d02a569 Merge branch 'master' of https://github.com/fusionpbx/fusionpbx 2016-02-24 10:43:16 -07:00
markjcrane 2e43f50d72 Update the wallpaper variable yealink_t29g_wallpaper. 2016-02-24 10:42:50 -07:00
FusionPBX d6bf296ace Merge pull request #1447 from moteus/ivr_cid_prefix 
Fix. Add `#` to caller ID name when call from IVR
 2016-02-24 07:42:29 -07:00
markjcrane 3e1e822fbd Add domain_uuid to the CDR result set. 2016-02-23 19:42:10 -07:00
markjcrane e44cfabcb9 If show all is used on the export then remove the domain name from the file name. 2016-02-23 19:33:16 -07:00
markjcrane 2874807570 Add showall hidden option to the regular CDR search form. 2016-02-23 19:19:03 -07:00
markjcrane 7437048eb4 Fix the SQL command when using the advanced search and improve security on how showall is being used. 2016-02-23 19:05:52 -07:00
markjcrane d58122aa56 Change a POST to a GET on the advanced search for CDR. 2016-02-23 18:15:07 -07:00
markjcrane bfd2d791b9 Fix the checkbox on the show all for the advanced search. 2016-02-23 18:09:00 -07:00
markjcrane eb5c341383 Additional work to get the CDR to allow the show all to work with the regular search and advanced search. 2016-02-23 17:53:21 -07:00
markjcrane 2adb0147a9 Allow admin access to the menu for dialplan -> destinations. 2016-02-23 11:10:27 -07:00
markjcrane e1cd2f8b3a Add translations for the install. 2016-02-22 22:27:53 -07:00
markjcrane 251a1530be Update PHPMailer 5.2.2 to 5.2.14. 2016-02-22 15:00:57 -07:00
markjcrane 88e6d0599c Add round brackets around the condition destination_number for inbound routes generated by destinations. 2016-02-22 14:28:45 -07:00
markjcrane 5a06f486af Rename .project.ROOT to project_root.php this conforms better with current file naming standards. 2016-02-22 14:01:18 -07:00
markjcrane 106d107d9e Increase the HTTPS security. 2016-02-22 13:18:37 -07:00
markjcrane de53ae149e Fix a spelling mistake in the log message in dialplan.lua. 2016-02-22 13:17:04 -07:00