nsinnovations/fusionpbx
2
0
Fork 0
mirror of https://github.com/fusionpbx/fusionpbx.git synced 2025-12-31 09:33:48 +00:00
Code Issues Packages Projects Releases Wiki Activity
4,946 Commits 4 Branches 11 Tags
893efba8af8317ddb2c8deed5cb2ea04d0be035b
Commit Graph

519 Commits

Author SHA1 Message Date
markjcrane
10312a912a Update ring group rollover so that it works like standard roll over. If busy it moves to the next line. If not busy and timeout it moves to the timeout action. 2015-08-14 15:27:48 -06:00
markjcrane
8fdd55c917 IVR Menu allow one of the options to override direct dial to an extension. 2015-08-14 11:26:11 -06:00
markjcrane
5fe418910d Remove an extra line and change the console message. 2015-08-14 09:47:00 -06:00
FusionPBX
7ff1ed2124 Merge pull request #1098 from moteus/toll_allow_forward 
Set Toll Allow for call forward/follow me
 2015-08-14 08:34:17 -06:00
FusionPBX
8703dc1ab7 Merge pull request #1097 from moteus/toll_allow 
Change. toll_allow use ordered template-list.
 2015-08-14 08:33:19 -06:00
Alexey Melnichuk
bfe2fb97f6 Change. Use toll_allow of extension who set call forward. 2015-08-14 13:27:47 +04:00
Alexey Melnichuk
3f3240e7c8 Fix. Off debug output 2015-08-14 12:26:34 +04:00
Alexey Melnichuk
8a5ad23d55 Change. toll_allow use ordered template-list. 
Add. Russian toll_allow templates.

This needs because we need
89%d is mobile except 8940%d which one is international.
 2015-08-14 12:07:38 +04:00
markjcrane
a666d65be7 Remove hostname on the acl memcache variable name. 2015-08-13 19:49:09 -06:00
markjcrane
b0ea34d38d Abbreviation for variables are discouraged because they aren't intuitive especially for those from other languages. Replace 'ep' variable no idea what it represented to 'user' which is what freeswitch calls ans extension that you register to. 2015-08-13 11:34:48 -06:00
FusionPBX
3c7e6e16fd 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
ebe55cf7c8 Fix. Use number alias to forward call to VM when DND is on (Lua part) 2015-08-13 13:14:46 +04:00
markjcrane
e032e5815b 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
46e9bdc49f Remove outbound restriction for intercept. 2015-08-12 23:38:46 -06:00
FusionPBX
6987bf9c49 Merge pull request #1091 from moteus/intercept_outbound 
Fix. Allow intercept only outbound calls.
 2015-08-12 23:34:43 -06:00
markjcrane
e5d7a7c7b9 Add expire["acl.conf"] = "3600"; 2015-08-12 23:31:21 -06:00
markjcrane
941415fe13 Add acl.conf.lua to the xml handler. 2015-08-12 23:21:10 -06:00
Alexey Melnichuk
1bac6fa097 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
e6a85e776b 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
907a04a6da XML Handler - directory.lua change ext to username. 2015-08-11 20:36:01 -06:00
FusionPBX
1364725916 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
77fd3dfc7b 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
82b7d6fd79 Change '//' to '/'. This fixes a problem where its calling require when it should call dofile. 2015-08-11 20:25:34 -06:00
FusionPBX
237d6c5d90 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
32872d8c0d 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
87eb5a0399 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
5b291a896a Fix. Include config file. 2015-08-11 14:40:02 +04:00
Alexey Melnichuk
024abb1ac1 Fix. Group intercept extension with number alias 2015-08-11 14:18:25 +04:00
Alexey Melnichuk
69717e31d5 Revert "Revert "Change. Use require "resources.functions.config" to load co…" 2015-08-11 05:06:33 +03:00
FusionPBX
d1f3b05cf6 Revert "Change. Use require "resources.functions.config" to load config file." 2015-08-10 11:50:29 -06:00
FusionPBX
8d9430352b 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
9b885b807d Merge branch 'master' of https://github.com/fusionpbx/fusionpbx 2015-08-10 11:22:11 -06:00
markjcrane
51b398f984 Ring group external destinations use the | as the delimiter for fail-over. 2015-08-10 11:21:48 -06:00
FusionPBX
0bff93f3a4 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
e78d4dc370 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
c27e9cef9a Fix. add functions/count.lua to preview commit. 2015-08-10 13:01:49 +04:00
Alexey Melnichuk
a8142f527a Change. Use only require to load function. 
Fix. Remove multiple definition of same function.
 2015-08-10 12:43:06 +04:00
Alexey Melnichuk
c5432630f3 Fix. Allow monitoring page conferences via Active Conferences app. 2015-08-10 11:43:32 +04:00
Luis Daniel Lucio Quiroz
780b69a253 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
b42aa40677 Fix. Use number-alias as caller_id_number variable. 2015-08-07 16:17:25 +04:00
Alexey Melnichuk
596cdb1184 Fix. Use number_alias in dial-string. 2015-08-07 15:18:52 +04:00
Alexey Melnichuk
59c1fbe2ef 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
73e0e7a3a8 Fix. Use temp_dir variable instead of hard coded /tmp 2015-08-07 11:52:18 +04:00
markjcrane
2a4621daaf Fix a problem with custom public context and XMl handler. 2015-07-31 21:03:22 -06:00
markjcrane
c4639445d9 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
7e481f20b6 Fix. Correct path when user on group_confirm_file 2015-07-28 15:59:04 +04:00
markjcrane
4243764010 Remove trailing tabs. 2015-07-23 17:50:16 -06:00
markjcrane
5ff664246b Prevent nil errors in settings.lua. 2015-07-22 09:42:35 -06:00
Alexey Melnichuk
2234b42c07 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
a4b0b2d271 Merge branch 'master' into number_alias_as_vm_id 
Conflicts:
	app/hot_desking/extension_edit.php
 2015-07-21 11:19:13 +04:00