nsinnovations/fusionpbx
2
0
Fork 0
mirror of https://github.com/fusionpbx/fusionpbx.git synced 2026-01-01 01:33:49 +00:00
Code Issues Packages Projects Releases Wiki Activity
4,932 Commits 4 Branches 11 Tags
c4374178a445a99f9bf657a281bafbbc7510dee5
Commit Graph

509 Commits

Author SHA1 Message Date
FusionPBX
c4374178a4 Merge pull request #1093 from moteus/dnd_number_alias 
Fix. Use number alias to forward call to VM when DND is on.
 2015-08-13 11:25:08 -06:00
Alexey Melnichuk
5f67be647d Fix. Use number alias to forward call to VM when DND is on (Lua part) 2015-08-13 13:14:46 +04:00
markjcrane
d5592672f0 base_dir is not dependable as its irrelevant for freeswitch package installs replace it with settings['switch']['voicemail']['dir']. 2015-08-12 23:45:27 -06:00
markjcrane
27a72bfa59 Remove outbound restriction for intercept. 2015-08-12 23:38:46 -06:00
FusionPBX
72d489ec65 Merge pull request #1091 from moteus/intercept_outbound 
Fix. Allow intercept only outbound calls.
 2015-08-12 23:34:43 -06:00
markjcrane
47c8fb090d Add expire["acl.conf"] = "3600"; 2015-08-12 23:31:21 -06:00
markjcrane
b44cacd07a Add acl.conf.lua to the xml handler. 2015-08-12 23:21:10 -06:00
Alexey Melnichuk
ce9e2cc4d1 Fix. Allow intercept only outbound calls. 
Now it is possible intercept call from local extension to the world.

Fix. intercept channels also in EARLY state.

One of my softphones return 180 Ringing with SDP (no 183 Progress).
And FreeSWITCH shows such channel as `EARLY` not as `RINGING`)
 2015-08-12 10:09:56 +04:00
FusionPBX
81003e35d8 Merge pull request #1018 from moteus/number_alias_as_vm_id 
Change. Use number_alias as voicemail_id.
 2015-08-11 20:43:20 -06:00
markjcrane
42d9548fac XML Handler - directory.lua change ext to username. 2015-08-11 20:36:01 -06:00
FusionPBX
c117b071e6 Merge pull request #1080 from moteus/dial_number_alias 
Fix. Use number_alias in dial-string.
 2015-08-11 20:31:42 -06:00
FusionPBX
9087c09182 Merge pull request #1081 from moteus/number_alias_as_caller_id 
Fix. Use number-alias as caller_id_number variable.
 2015-08-11 20:30:19 -06:00
markjcrane
601c532013 Change '//' to '/'. This fixes a problem where its calling require when it should call dofile. 2015-08-11 20:25:34 -06:00
FusionPBX
9f4287a9b4 Merge pull request #1087 from moteus/revert-1086-revert-1053-require_config 
Change. Use `require` function to load Lua libraries
 2015-08-11 20:05:48 -06:00
FusionPBX
978bec7cbd Merge pull request #1088 from moteus/number_alis_group_intercept 
Fix. Group intercept extension with number alias
 2015-08-11 20:05:04 -06:00
markjcrane
558c82d386 Add a break to prevent call the failover bridge statement at the same time the primary bridge statement is called. 2015-08-11 13:42:46 -06:00
Alexey Melnichuk
4639001ca3 Fix. Include config file. 2015-08-11 14:40:02 +04:00
Alexey Melnichuk
c19b6cc7ee Fix. Group intercept extension with number alias 2015-08-11 14:18:25 +04:00
Alexey Melnichuk
3e16e69adb Revert "Revert "Change. Use require "resources.functions.config" to load co…" 2015-08-11 05:06:33 +03:00
FusionPBX
2a2dd209df Revert "Change. Use require "resources.functions.config" to load config file." 2015-08-10 11:50:29 -06:00
FusionPBX
559aa61fbd Merge pull request #1053 from moteus/require_config 
Change. Use `require "resources.functions.config"` to load config file.
 2015-08-10 11:31:35 -06:00
markjcrane
1d6c6463e7 Merge branch 'master' of https://github.com/fusionpbx/fusionpbx 2015-08-10 11:22:11 -06:00
markjcrane
bec13ef258 Ring group external destinations use the | as the delimiter for fail-over. 2015-08-10 11:21:48 -06:00
FusionPBX
cd21e26893 Merge pull request #1079 from moteus/temp_dir 
Fix. Use `temp_dir` variable instead of hard coded `/tmp`
 2015-08-10 10:25:22 -06:00
FusionPBX
983365ad41 Merge pull request #1084 from moteus/page_active_conf 
Fix. Allow monitoring page conferences via `Active Conferences` app.
 2015-08-10 10:23:03 -06:00
Alexey Melnichuk
d8b2ec5271 Fix. add functions/count.lua to preview commit. 2015-08-10 13:01:49 +04:00
Alexey Melnichuk
703b61636a Change. Use only require to load function. 
Fix. Remove multiple definition of same function.
 2015-08-10 12:43:06 +04:00
Alexey Melnichuk
b5cacea373 Fix. Allow monitoring page conferences via Active Conferences app. 2015-08-10 11:43:32 +04:00
Luis Daniel Lucio Quiroz
f1e082bc03 Use os.time instead of mysql native function 
Odd, but on some deployments LUA wont accept unixtime stamp functions (regardless it works on CLI). So, to workaround this, lets use os.time() which it returns the same value expected.
 2015-08-09 21:56:28 -06:00
Alexey Melnichuk
b97ae86283 Fix. Use number-alias as caller_id_number variable. 2015-08-07 16:17:25 +04:00
Alexey Melnichuk
bfa72cc78a Fix. Use number_alias in dial-string. 2015-08-07 15:18:52 +04:00
Alexey Melnichuk
630d9e020c Fix. Always use / separator on FS command. 
Fix. Override `temp_dir` from `config.lua` file.
 2015-08-07 12:11:27 +04:00
Alexey Melnichuk
785136eca9 Fix. Use temp_dir variable instead of hard coded /tmp 2015-08-07 11:52:18 +04:00
markjcrane
a1fdd5c220 Fix a problem with custom public context and XMl handler. 2015-07-31 21:03:22 -06:00
markjcrane
173e9ca691 Fix fax_retry.lua for domain_name and domain_uuid. Add [FAX] to the logging to the console. 2015-07-30 19:32:18 -06:00
Alexey Melnichuk
565395c44f Fix. Correct path when user on group_confirm_file 2015-07-28 15:59:04 +04:00
markjcrane
d8c9c3910f Remove trailing tabs. 2015-07-23 17:50:16 -06:00
markjcrane
32b782d3f0 Prevent nil errors in settings.lua. 2015-07-22 09:42:35 -06:00
Alexey Melnichuk
3da348fff0 Change. Use require "resources.functions.config" to load config file. 
Change. Move `script_dir` definition into config file.
 2015-07-22 13:20:51 +04:00
Alexey Melnichuk
57808740ef Merge branch 'master' into number_alias_as_vm_id 
Conflicts:
	app/hot_desking/extension_edit.php
 2015-07-21 11:19:13 +04:00
FusionPBX
a214b57f81 Merge pull request #1047 from moteus/page_concat_conf_name 
Fix. Concat conf name in page.lua
 2015-07-20 16:52:23 -06:00
markjcrane
6f9eb6ab29 After call forward has been set with feature code *72 or *74 play back the number that call forward is set to. 2015-07-20 12:59:45 -06:00
markjcrane
4fc2bbaa9f Voicemail to email send the email in the send_email.lua rather than with email.lua. So that the delete doesn't occur until after email is sent. 2015-07-20 11:40:31 -06:00
Alexey Melnichuk
4b30e652b4 Fix. Concat conf name in page.lua 2015-07-20 12:44:05 +04:00
FusionPBX
861e545541 Merge pull request #1037 from moteus/copy_voice_mail 
Fix. Use OS specific copy function.
 2015-07-18 12:55:05 -07:00
FusionPBX
59e4f6b91f Merge pull request #1023 from moteus/ext-dial-string 
Fix. Use extension to generate dial-string in xml_handler
 2015-07-18 12:54:24 -07:00
FusionPBX
064f73aa70 Merge pull request #1045 from moteus/page_domain 
Page domain
 2015-07-18 12:47:55 -07:00
FusionPBX
8e989c7fb6 Merge pull request #1040 from moteus/vm-phrase 
Change. Use predefined phrases in vm menu.
 2015-07-18 12:45:34 -07:00
Alexey Melnichuk
61f5e77cfb Fix. Use temp_dir to debug dialplan xml file 2015-07-16 12:56:13 +04:00
Alexey Melnichuk
78541b67ce Fix. Use correct conf name on originate 2015-07-16 12:11:57 +04:00