Commit Graph
100 Commits
Author SHA1 Message Date
markjcrane d5ce655a3d Fix the menu_delete add a delete to get remove data in menu_languages table. 2016-03-27 14:58:11 -06:00
markjcrane f09489599d Minor adjustment to the theme. 2016-03-27 14:56:53 -06:00
markjcrane abef8c5d3c A global domain is optional. Using public context instead. 2016-03-27 04:46:01 -06:00
FusionPBX b03d978bb0 Merge pull request #1512 from schraegervogel/master
initialize call_context
2016-03-27 04:25:22 -06:00
markjcrane f596590860 Merge branch 'master' of https://github.com/fusionpbx/fusionpbx 2016-03-27 03:34:32 -06:00
markjcrane 192b52fc55 Update themes/app_defaults to reduce database selects. 2016-03-27 03:34:16 -06:00
markjcrane 8c444b9a3a Merge branch 'master' of https://github.com/fusionpbx/fusionpbx 2016-03-27 02:31:29 -06:00
markjcrane b1b69046d4 Change the login background. 2016-03-27 02:31:13 -06:00
markjcrane 8be2b551d5 Remove the create_menus() from the install as it is now handled in the menu class. 2016-03-27 02:15:27 -06:00
markjcrane 08ba30b9ee Change the app/emails/app_languages.php to UTF-8 encoding and used a spanish dictionary to fix the translations that were broken when converting file encoding. 2016-03-27 01:18:51 -06:00
markjcrane 69fa1729e1 Merge branch 'master' of https://github.com/fusionpbx/fusionpbx 2016-03-27 01:10:49 -06:00
markjcrane 77bc05d2fa Change the encoding type for app/emails/app_menu.php to UTF-8. 2016-03-27 01:10:29 -06:00
markjcrane b5ae027bfc Merge branch 'master' of https://github.com/fusionpbx/fusionpbx 2016-03-27 00:33:38 -06:00
markjcrane ac36bf07f7 Only call the scripts class if its installed. 2016-03-27 00:33:19 -06:00
markjcrane 46cec34644 Fix v_settings update sql command in app/settings/app_defaults.php. 2016-03-26 23:59:28 -06:00
markjcrane a12b5ac43c Remove agent_admin from call_centers/app_menu.php as it doesn't exist by default and causes an error. 2016-03-26 23:36:13 -06:00
markjcrane c4aaad020d Merge branch 'master' of https://github.com/fusionpbx/fusionpbx 2016-03-26 22:59:19 -06:00
markjcrane 812f41b48e Add the menu_default method to app_defaults.php. 2016-03-26 22:59:00 -06:00
markjcrane c7e90ebd26 Change the method name to menu_default. 2016-03-26 21:22:52 -06:00
markjcrane f7aa8725e8 Add methoed 'default' to the menu class. 2016-03-26 21:18:02 -06:00
markjcrane 21143da0ef Minor adjustment to the checkbox. 2016-03-26 19:51:44 -06:00
markjcrane 2a565e9f98 Remove the include to the resources/menu.php file that is no longer in use. 2016-03-26 19:37:42 -06:00
markjcrane 6a3c9cc945 Fix two of the button labels. 2016-03-26 19:35:24 -06:00
markjcrane 7bc74b374a Fix a the name of a few of the install buttons. 2016-03-26 19:29:04 -06:00
markjcrane 651f9806fb Update the install.php. 2016-03-26 19:17:33 -06:00
markjcrane 100932656a Fix the reference to the prepared statement. 2016-03-26 14:03:44 -06:00
markjcrane ac4aef20b0 Change the code in the menu to return immediately if the database object is not ready in this case its not ready until the install.php is finished. 2016-03-26 13:36:00 -06:00
markjcrane 883a0ecdeb Remove the conflict install language is set with the radio buttons. 2016-03-26 13:14:57 -06:00
markjcrane 9c49a0ce54 Remove the fieldset and label as the alignment is not working with bootstrap. 2016-03-26 13:09:22 -06:00
markjcrane ae125390c3 Adjust the width of the language section of the install. 2016-03-26 12:35:40 -06:00
markjcrane 5eef464cf3 Additional work to improve the install, template and the menu. 2016-03-26 12:22:15 -06:00
markjcrane aa89c4fe26 Don't error if the menu is not available for the install.php. 2016-03-26 11:45:57 -06:00
markjcrane 90f30c53d7 Fix the install.php. 2016-03-26 09:18:36 -06:00
markjcrane 6b657b0ef1 Fix a spelling mistake. 2016-03-25 20:17:34 -06:00
markjcrane d7dbe2d51f Merge branch 'master' of https://github.com/fusionpbx/fusionpbx 2016-03-25 20:14:59 -06:00
markjcrane da6297918e Remove two deprecated default settings and a missing one. 2016-03-25 20:14:39 -06:00
markjcrane 92a57a73ce Merge branch 'master' of https://github.com/fusionpbx/fusionpbx 2016-03-25 19:46:00 -06:00
markjcrane 8053c07a02 Make the code more efficient adding the theme default settings. 2016-03-25 19:45:39 -06:00
markjcrane f5a1802282 Remove the extra $x++; 2016-03-25 19:27:43 -06:00
markjcrane c2d3a61a66 Remove the enhanced theme. 2016-03-25 19:24:45 -06:00
markjcrane 181e26144e Add default settings to control the new theme. 2016-03-25 19:22:26 -06:00
markjcrane 8cdadc0ea4 Move the app_defaults.php from theme/enhanced to themes/default. 2016-03-25 17:26:28 -06:00
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