Commit Graph

5301 Commits

Author SHA1 Message Date
markjcrane 2a90eb7926 Merge branch 'master' of https://github.com/fusionpbx/fusionpbx 2015-11-14 17:18:58 -07:00
markjcrane 8273ba4e59 Fix call center queue delete. 2015-11-14 17:18:32 -07:00
FusionPBX 057b358f12 Merge pull request #1235 from moteus/fax_send
Fix. multiple calls fax_send caused error.
2015-11-13 09:17:09 -07:00
markjcrane 7581e81522 Add the additional key types to the device key profile. 2015-11-12 19:27:29 -07:00
markjcrane ffe25a3d2e Polycom key type capitalize the first letter of Automata and Normal. 2015-11-12 19:11:31 -07:00
markjcrane 286283bcf0 Correct polycom template logic and change the && (and) to || (or). 2015-11-12 18:51:44 -07:00
markjcrane d729d77f4d Merge branch 'master' of https://github.com/fusionpbx/fusionpbx 2015-11-12 16:40:48 -07:00
markjcrane c13ed1323f Add additional Polycom key types. 2015-11-12 16:40:02 -07:00
FusionPBX c6ef9d0fbf 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 8958d85c7e 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
Alexey Melnichuk 31a0392577 Fix. Call intercept - a scenario where an outgoing call can be intercepted
This is same changes as in #1209.
2015-11-12 14:11:05 +03:00
Matthew Vale 04fbd896df made button elements render the same as input.btn 2015-11-12 11:10:34 +00:00
Alexey Melnichuk 4fde7dfc80 Fix. multiple calls fax_send caused error.
Fix. require EventSocket implicitly.
Fix. require `test` class.
2015-11-12 14:00:01 +03:00
FusionPBX 7bb1079dd6 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 c385f5fc0f 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 0215800778 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 ca48132e40 Change enquote to quote. 2015-11-10 13:37:25 -07:00
FusionPBX 14970d2cc8 Merge pull request #1231 from moteus/intercept_search_channel
Fix. Intercept can find wrong channel.
2015-11-10 13:20:08 -07:00
Alexey Melnichuk bea4a02056 Fix. Intercept can find wrong channel. 2015-11-10 22:41:34 +03:00
FusionPBX c5cb52707f 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 fdae758e1f Merge pull request #1230 from moteus/windows_hungup_rx
Fix. hungup_rx.lua works on Windows
2015-11-10 11:51:34 -07:00
Alexey Melnichuk 5506d7ce80 Fix. function name 2015-11-10 20:49:46 +03:00
Alexey Melnichuk 2fe16021a1 Fix. always escape quote. 2015-11-10 19:33:01 +03:00
Alexey Melnichuk 5be99e2801 Fix. hungup_rx.lua works on Windows
1. Command should use only double quotes.
2. Application should not be quoted (I am not sure may be it is bug in FS `system` command).

So I use double quote on Windows and single quote on other system.
Also I quote strings only if they contain spaces.
To escape quote in string i just double it.
`you got "some text"` become to `you got ""some text"""`
2015-11-10 19:29:06 +03:00
Alexey Melnichuk 30109b4523 Fix. IVR menu option without arguments. 2015-11-10 17:56:40 +03:00
Alexey Melnichuk 85041fabea Merge branch 'master' into intercept_load_balance
# Conflicts:
#	resources/install/scripts/intercept_group.lua
2015-11-10 12:30:45 +03:00
markjcrane 00eee7aca3 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 c3c8931d02 Merge branch 'master' of https://github.com/fusionpbx/fusionpbx 2015-11-09 16:54:16 -07:00
markjcrane aaadffea1f Update the wakeup phrases. 2015-11-09 16:53:58 -07:00
FusionPBX 8448058596 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 a073220e8f Merge pull request #1228 from mafoo/Bugfix-destination_edit
Bugfix destination_edit.php
2015-11-09 07:53:35 -07:00
Alexey Melnichuk 927e495a0e Update. call_forward.lua script
Fix. Set outbound caller id
Remove. Nested if
Use. cache class
Use. database class
2015-11-09 16:55:35 +03:00
Alexey Melnichuk 27d7369328 Merge branch 'master' into follow_me_lua 2015-11-09 16:45:57 +03:00
Matthew Vale 6339a7363d missed none when pasting new code 2015-11-09 11:49:09 +00:00
Matthew Vale 1fd61fb37e Bugfix for destinations_edit.php
the tr_fax_detecion segment is optional so causes the onchange_type javascript to stop when it can't find it.
2015-11-09 11:47:15 +00:00
markjcrane efdd731d2a Remove /scripts from the path as it is redundant. 2015-11-08 13:40:08 -07:00
markjcrane a309776883 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 80ab4cb339 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 4463016efe Secure the device mac address when the user doesn't have permission to change it. 2015-11-05 12:25:30 -07:00
markjcrane 5346599c00 Show device copy when user has device_add permission. 2015-11-05 12:11:53 -07:00
markjcrane db79cfbc30 Move the description inside the permission condition and adjust 2 of the permissions. 2015-11-05 12:05:49 -07:00
markjcrane 242ad7bc16 Add new device permissions for mac address, template, label, vendor, model, firmware, and description. 2015-11-05 11:56:50 -07:00
markjcrane 2ffd50dc81 Fix the syntax by adding a missing ). 2015-11-05 11:24:28 -07:00
markjcrane 722e442703 Add new device permissions device_username_password, device_alternate, device_enable. 2015-11-05 11:19:22 -07:00
Alexey Melnichuk dc0b71987b Update follow_me.lua
1. Use `cache` class so now it generates memcache events.
2. Do not use nested if (simplify code)
3. Use local variables.
4. Remove redundant checks.
2015-11-05 18:02:08 +03:00
markjcrane e888f1d1ff Add the provision.path.text to default settings. 2015-11-04 20:01:11 -07:00
markjcrane 98bec06c59 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 f28b6aab4c 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 be5a8a31dd Add the functions to the path for channel_utils. 2015-11-03 16:44:51 -07:00
markjcrane 9e25d4d49a Add functions to the config require 'resources.functions.config' 2015-11-03 16:41:59 -07:00