dbxe/fusionpbx
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
5,366 Commits 3 Branches 10 Tags
506a829202be45c511caa4df4e7c5a4c4d0c26da
Commit Graph
100 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
markjcrane ae4a9d499f Add style white-space: nowrap; to destination edit. 2015-11-19 22:42:33 -07:00
markjcrane c4db1a48f0 Merge branch 'master' of https://github.com/fusionpbx/fusionpbx 2015-11-19 22:32:52 -07:00
markjcrane 8db0341392 Time condition fix alignment of the arrow button by adding style nowrap and 3 pixel padding. 2015-11-19 22:32:34 -07:00
FusionPBX 899eaa797e Merge pull request #1248 from blackc2004/master 
vlan id's in yealink
 2015-11-19 17:40:11 -08:00
markjcrane 8e048019d1 Add underscore between the words in the variables. 
{$ldap_name_filter}
{$ldap_number_filter}
{$yealink_directory_setting_url}
 2015-11-19 15:20:14 -07:00
FusionPBX 63a04ee4d5 Merge pull request #1250 from blackc2004/patch-12 
Update y000000000028.cfg
 2015-11-19 14:17:29 -08:00
FusionPBX bb7d8f1718 Merge pull request #1244 from mafoo/BugFix_Provision 
BugFix + Optional Enable extensions appear in directory
 2015-11-19 09:40:27 -08:00
markjcrane 1d51571364 Change setting enable_background_images to background_image_enabled. This keeps the code consistent as 'enabled' is used throughout the code as a suffix. It also displays this setting next to the background_image setting. 2015-11-19 10:34:28 -07:00
FusionPBX d6fc9d8701 Merge pull request #1243 from mafoo/Enhance-Theme 
Optimized control of background images
 2015-11-19 09:25:47 -08:00
FusionPBX 9069a229ce Merge pull request #1245 from mafoo/Enhance-Sip_Profiles 
Enhance sip profiles
 2015-11-19 09:17:22 -08:00
FusionPBX 71c3b124b4 Merge pull request #1247 from mafoo/Enhance-Vars 
Enhance vars
 2015-11-19 09:15:44 -08:00
FusionPBX ec3c9f125b Merge pull request #1239 from mafoo/Enhance-Languages 
Enhance languages
 2015-11-18 08:51:03 -08:00
markjcrane 44ec8d5942 Add voicemail record-silence-threshold variable and change the default threshold from 30 to 300. 2015-11-16 16:59:11 -07:00
markjcrane a0b5c5105f Fix the call center dialplan creation when adding a call center queue. 2015-11-14 20:18:31 -07:00
markjcrane 608a826d13 Correct the consistency of the indentation. 2015-11-14 17:56:20 -07:00
markjcrane b428f570de Merge branch 'master' of https://github.com/fusionpbx/fusionpbx 2015-11-14 17:18:58 -07:00
markjcrane e52339fc8f Fix call center queue delete. 2015-11-14 17:18:32 -07:00
FusionPBX ebbf6fb259 Merge pull request #1235 from moteus/fax_send 
Fix. multiple calls fax_send caused error.
 2015-11-13 09:17:09 -07:00
markjcrane d03db31518 Add the additional key types to the device key profile. 2015-11-12 19:27:29 -07:00
markjcrane f58328fa39 Polycom key type capitalize the first letter of Automata and Normal. 2015-11-12 19:11:31 -07:00
markjcrane e7530e2447 Correct polycom template logic and change the && (and) to || (or). 2015-11-12 18:51:44 -07:00
markjcrane 0406afbdb8 Merge branch 'master' of https://github.com/fusionpbx/fusionpbx 2015-11-12 16:40:48 -07:00
markjcrane 88858a1c8b Add additional Polycom key types. 2015-11-12 16:40:02 -07:00
FusionPBX 21a2a4fa5b Merge pull request #1236 from mafoo/Enhance-Template 
made button elements render the same as input.btn
 2015-11-12 08:34:23 -07:00
FusionPBX 1f89195f70 Merge pull request #1237 from moteus/intercept_outbound 
Fix. Call intercept - a scenario where an outgoing call can be intercepted
 2015-11-12 08:31:55 -07:00
FusionPBX cd6a52b1af Merge pull request #1229 from moteus/ivr_menu_exec_without_args 
Fix. IVR menu option without arguments.
 2015-11-10 18:12:03 -07:00
markjcrane 7bb50d03a0 New database class was implemented in call_forward.lua when using first_value must change select * from with the specific value desired. 2015-11-10 17:26:39 -07:00
markjcrane 71ea6a8328 Change the Database:query to make the fn optional which will make it more backwards compatible with current code. This fixes an issue with recent movement to the database class in call_forward.lua. 2015-11-10 17:04:42 -07:00
markjcrane 6cc9040787 Change enquote to quote. 2015-11-10 13:37:25 -07:00
FusionPBX 6ac3917f2f Merge pull request #1231 from moteus/intercept_search_channel 
Fix. Intercept can find wrong channel.
 2015-11-10 13:20:08 -07:00
FusionPBX 573078e5bb Merge pull request #1174 from moteus/intercept_load_balance 
Add. Support intercept FIFO/CallCenter/Enterprise in load balancing mode
 2015-11-10 11:55:18 -07:00
FusionPBX 3bbaca8439 Merge pull request #1230 from moteus/windows_hungup_rx 
Fix. hungup_rx.lua works on Windows
 2015-11-10 11:51:34 -07:00
markjcrane 53702b1973 Fix a problem where the ring group is only calling one external number when there are multiple to call. 2015-11-09 18:42:29 -07:00
markjcrane f47a717f9d Merge branch 'master' of https://github.com/fusionpbx/fusionpbx 2015-11-09 16:54:16 -07:00
markjcrane bf86c7acff Update the wakeup phrases. 2015-11-09 16:53:58 -07:00
FusionPBX 15c2d54778 Merge pull request #1226 from moteus/follow_me_lua 
Update follow_me.lua/call_forward.lua
 2015-11-09 08:00:57 -07:00
FusionPBX 20eff9739a Merge pull request #1228 from mafoo/Bugfix-destination_edit 
Bugfix destination_edit.php
 2015-11-09 07:53:35 -07:00
markjcrane a01a61e02c Remove /scripts from the path as it is redundant. 2015-11-08 13:40:08 -07:00
markjcrane 4ef7b049b0 Change base_dir to script_dir in <param name="script-directory" value="$${script_dir}/scripts/?.lua"/> 2015-11-08 07:44:45 -07:00
markjcrane 7cda301460 Add the following to all yealink provisioning templates. 
account.1.nat.udp_update_enable = 3
In order to setup keep alive with sip notify.
 2015-11-08 07:30:29 -07:00
markjcrane cca5c118df Secure the device mac address when the user doesn't have permission to change it. 2015-11-05 12:25:30 -07:00
markjcrane d39d58e6f6 Show device copy when user has device_add permission. 2015-11-05 12:11:53 -07:00
markjcrane 2750163d6d Move the description inside the permission condition and adjust 2 of the permissions. 2015-11-05 12:05:49 -07:00
markjcrane ef5a1eb455 Add new device permissions for mac address, template, label, vendor, model, firmware, and description. 2015-11-05 11:56:50 -07:00
markjcrane 5f7fd707c2 Fix the syntax by adding a missing ). 2015-11-05 11:24:28 -07:00
markjcrane 78b65831ec Add new device permissions device_username_password, device_alternate, device_enable. 2015-11-05 11:19:22 -07:00
markjcrane f87195204c Add the provision.path.text to default settings. 2015-11-04 20:01:11 -07:00
markjcrane 503461fca1 Change switch.provision.dir to provision.path.text. This indicates where to save the provisioning files on the file system. 2015-11-04 19:59:27 -07:00
markjcrane d3d62295d6 This renables polycom line key value of 2 would use 2 keys or a value of 3 would be 3 keys. 2015-11-03 19:28:10 -07:00
markjcrane e7530d8bec Add the functions to the path for channel_utils. 2015-11-03 16:44:51 -07:00
markjcrane 758d6b9f53 Add functions to the config require 'resources.functions.config' 2015-11-03 16:41:59 -07:00
FusionPBX 8de13769f0 Merge pull request #1224 from mafoo/Enhance-Time_Conditions 
Enhance time conditions
 2015-11-03 14:29:33 -07:00
FusionPBX 616e6c1cde Merge pull request #1223 from mafoo/bugfix_languages.lua 
fix to use phrases_dir
 2015-11-03 04:40:12 -07:00
FusionPBX 747722da5b Merge pull request #1179 from moteus/call_flow 
Fix small bugs and clear code in call_flow.
 2015-11-03 03:30:02 -07:00
FusionPBX e008fbd8c2 Merge pull request #1186 from moteus/cache_emit_event 
Add. `cache` class emit MEMCACHE events.
 2015-11-03 03:19:36 -07:00
FusionPBX 62fcbb925a Merge pull request #1176 from moteus/callcenter_config_clear_cache 
Fix. Clear the cache when callcenter config changed.
 2015-11-03 03:17:26 -07:00
FusionPBX 5ca779d08c Merge pull request #1202 from moteus/show_channels 
Fix. Use `api show channels like` did not work on fusion with BDR.
 2015-11-03 03:13:27 -07:00
FusionPBX 9c13a321b6 Merge pull request #1219 from mafoo/bugfix_voicemail 
Bugfix voicemail
 2015-11-02 20:18:58 -07:00
FusionPBX 9ea40a45d1 Merge pull request #1218 from mafoo/bugfix_languages.lua 
changed phrases_dir to be dealt with inside app_defaults.php so it is retrieved once like the other paths
 2015-11-02 11:15:28 -07:00
FusionPBX 6024364a40 Merge pull request #1216 from mafoo/bugfix_languages.lua 
Bugfix languages.lua
 2015-10-30 16:53:37 -06:00
FusionPBX 82fcbbcbce Merge pull request #1210 from blackc2004/patch-8 
Update extension_edit.php
 2015-10-30 09:37:23 -06:00
FusionPBX 9c5fee3dc8 Merge pull request #1211 from blackc2004/patch-7 
Update app_languages.php
 2015-10-30 09:36:55 -06:00
FusionPBX b42f054e9e Merge pull request #1212 from blackc2004/patch-6 
Update app_config.php
 2015-10-30 09:36:30 -06:00
FusionPBX cd63a7910d Merge pull request #1213 from blackc2004/patch-9 
Update extension.php
 2015-10-30 09:31:53 -06:00
FusionPBX a555722874 Merge pull request #1214 from blackc2004/patch-10 
Update directory.lua
 2015-10-30 09:31:06 -06:00
FusionPBX 7f01982675 Merge pull request #1215 from moteus/phrase_ivr_menu 
Fix. Get DTMF in IVR when using phrases.
 2015-10-30 09:23:58 -06:00
markjcrane 1c6f58ca03 MWI only turn on the light for new messages. 2015-10-29 17:34:39 -06:00
markjcrane 9429de42be Update translation for de-at. 2015-10-29 09:43:57 -06:00
markjcrane 3472707e96 Enable the directory for speed dial and enterprise categories. 2015-10-28 22:07:43 -06:00
markjcrane 3f2ccf8b23 Call forward presence ignore busy use a radio button to be uniform with the rest of the page. 2015-10-28 17:39:16 -06:00
markjcrane b5fcb26e6d Merge branch 'master' of https://github.com/fusionpbx/fusionpbx 2015-10-27 16:32:33 -06:00
markjcrane aeeee2433e Remove user group from call block until there is per extension call block. 2015-10-27 16:32:20 -06:00
FusionPBX e1e01dac90 Merge pull request #1206 from moteus/call_control_caller_id 
Fix. Use same Outbound Caller info in extenstion and call control.
 2015-10-26 12:05:04 -06:00
FusionPBX 4fc11ee492 Merge pull request #1209 from badcrc/master 
Fix. Call intercept - a scenario where an outgoing call can be intercepted
 2015-10-26 12:02:41 -06:00
markjcrane bf3c374e13 Play the message number first then the caller id number. 2015-10-24 21:12:43 -06:00
markjcrane 8f67f2c4c1 Add vm_say_caller_id_number option for true or false. 2015-10-24 21:00:22 -06:00
markjcrane 99fb9dca10 Merge branch 'master' of https://github.com/fusionpbx/fusionpbx 2015-10-24 20:09:54 -06:00
markjcrane 128bb6d857 Add voicemail caller id number announce as iterated. 2015-10-24 20:09:36 -06:00
FusionPBX 14f0eb66a8 Merge pull request #1152 from moteus/database_class 
Add. database class
 2015-10-24 19:50:43 -06:00
markjcrane e393ea821a Move the time condition group to a location to make better use of the vertical space. 2015-10-24 18:55:24 -06:00
markjcrane c89075cc44 Merge branch 'master' of https://github.com/fusionpbx/fusionpbx 2015-10-24 16:39:37 -06:00
markjcrane ed0e78ace2 Remove the redundant public condition from the inbound route. 2015-10-24 16:39:22 -06:00
FusionPBX 2a0ef1b5af Merge pull request #1203 from badcrc/master 
Add. Ability to order the time conditions
 2015-10-24 14:37:07 -06:00
markjcrane b3669bac90 Merge branch 'master' of https://github.com/fusionpbx/fusionpbx 2015-10-23 15:24:10 -06:00
markjcrane 4ff5835cbc Change the paging extension_list to destinations. 2015-10-23 15:23:55 -06:00
FusionPBX cb6425545f Merge pull request #1205 from moteus/contact_extension_url 
Fix. Extension link on contact edit page.
 2015-10-22 09:56:35 -06:00
markjcrane 665f65642c Fix the variable syntax for the yealink templates. 2015-10-20 13:20:35 -06:00
markjcrane 4c3fa1f9e7 Change the way null last is done for Postgres. 2015-10-20 02:05:03 -06:00
markjcrane 588e4ebabc Contacts oder by last mod date null last. 2015-10-20 01:53:23 -06:00
markjcrane 7a776fadb8 Order contacts by last modified date by default. 2015-10-20 01:39:54 -06:00
markjcrane 8e2dcddbaf Fix the follow me app_config.php. 2015-10-19 21:58:23 -06:00
markjcrane 749533b479 Fix a null error and translation for select option voicemail. 2015-10-19 20:58:16 -06:00
markjcrane da91589641 Fix the Contact CSV import so it will import the phone number. 2015-10-19 20:37:13 -06:00
markjcrane 710a3fa696 Add hold music option and update the call_block dialplan. 2015-10-19 18:30:55 -06:00
markjcrane a66e1a61c3 Prevent overwriting the call block number when updating the number. 2015-10-19 17:35:09 -06:00
markjcrane e00f7783da Merge branch 'master' of https://github.com/fusionpbx/fusionpbx 2015-10-16 16:53:59 -07:00
markjcrane 1f8f627533 Remove the exit on the dialplan destination edit. 2015-10-16 16:52:58 -07:00
FusionPBX 59325c587e Merge pull request #1183 from blackc2004/patch-3 
Update {$mac}.cfg
 2015-10-16 15:17:47 -07:00
FusionPBX cfa2af6d0c Merge pull request #1200 from badcrc/master 
Changed readdir to scandir so we can get sorted template names
 2015-10-16 15:16:38 -07:00
markjcrane 654ca9ef79 Add ${time_zone} and ${time_zone_name} to several Yealink files. 2015-10-16 11:51:22 -07:00