FusionPBX
41dfdcef23
Merge pull request #1483 from mafoo/WhitespaceClean-resources/templates/engine/smarty
...
WhitespaceClean-resources/templates/smarty
2016-03-11 13:16:14 -07:00
FusionPBX
2be9c13080
Merge pull request #1484 from mafoo/WhitespaceClean-resources/others
...
WhitespaceClean-resources/others
2016-03-11 13:15:09 -07:00
markjcrane
f5c2222f97
Prevent custom sip port from breaking provision.lua and add prevent nil concatenation errors.
2016-03-11 10:31:11 -07:00
mafoo
5e97c0df2c
WhitespaceClean-resources/others
...
whitespace pass over files
for reference regex that was used s/[ \t]+(\r?\n)/\1/
2016-03-11 13:57:01 +00:00
mafoo
3f5d003c71
WhitespaceClean-resources/templates/smarty
...
whitespace pass over files
for reference regex that was used s/[ \t]+(\r?\n)/\1/
2016-03-11 13:45:32 +00:00
mafoo
aca80b09c0
WhitespaceClean-resources/edit_area
...
whitespace pass over files
for reference regex that was used s/[ \t]+(\r?\n)/\1/
2016-03-11 13:29:29 +00:00
mafoo
b0f383479a
WhitespaceClean-resources/jquery
...
whitespace pass over files
for reference regex that was used s/[ \t]+(\r?\n)/\1/
2016-03-11 13:26:36 +00:00
mafoo
893216a2d2
WhitespaceClean-resources/templates/conf
...
whitespace pass over files
for reference regex that was used s/[ \t]+(\r?\n)/\1/
2016-03-11 13:24:27 +00:00
mafoo
0eb7d5ddac
WhitespaceClean-resources/install/scripts
...
whitespace pass over files
for reference regex that was used s/[ \t]+(\r?\n)/\1/
2016-03-11 13:21:52 +00:00
mafoo
d68833f588
WhitespaceClean-resources/provision/others
...
whitespace pass over files
for reference regex that was used s/[ \t]+(\r?\n)/\1/
2016-03-11 12:22:24 +00:00
mafoo
5cae1fef28
WhitespaceClean-resources/provision/mitel
...
whitespace pass over files
for reference regex that was used s/[ \t]+(\r?\n)/\1/
2016-03-11 12:20:37 +00:00
mafoo
d018f74ed3
WhitespaceClean-resources/provision/yealink
...
whitespace pass over files
for reference regex that was used s/[ \t]+(\r?\n)/\1/
2016-03-11 12:18:50 +00:00
mafoo
1f8f01cabb
WhitespaceClean-resources/provision/polycom
...
whitespace pass over files
for reference regex that was used s/[ \t]+(\r?\n)/\1/
2016-03-11 12:16:24 +00:00
mafoo
713b29998b
WhitespaceClean-resources/provision/grandstream
...
whitespace pass over files
for reference regex that was used s/[ \t]+(\r?\n)/\1/
2016-03-11 12:12:47 +00:00
mafoo
9a6cf80f06
WhitespaceClean-resources/provision/cisco
...
whitespace pass over files
for reference regex that was used s/[ \t]+(\r?\n)/\1/
2016-03-11 12:10:46 +00:00
mafoo
1726744f4e
WhitespaceClean-resources/classes
...
whitespace pass over files
for reference regex that was used s/[ \t]+(\r?\n)/\1/
2016-03-11 12:08:26 +00:00
markjcrane
66ba2802bd
The last two changes to xml handler dialplan.lua did not work well with global dialplans. Removed some of the changes to fix the regression.
2016-03-11 00:58:52 -07:00
markjcrane
7b5d8f08c5
Add missing call_direction for ring group destinations.
2016-03-10 18:10:49 -07:00
markjcrane
833860e067
Use a more efficient way to get the domain name for xml handler - dialplan.
2016-03-10 08:18:46 -07:00
markjcrane
d14d4aeb8a
Increase efficiency xml handler section dialplan.
2016-03-09 13:09:25 -07:00
mafoo
8ceec465ac
corrected function definition
...
fixed bug introduced on 2/1/2016 in destination.lua
fixed bug introduced on 2/1/2016 in ring_member.lua
2016-03-09 17:54:44 +00:00
markjcrane
6804772e06
Fix the phrases_dir if statement. If the phrases_dir is not null then need to include xml from the file system.
2016-03-07 10:30:29 -07:00
markjcrane
90a9e55b77
Handle the phrases_dir nil in a more flexible way.
2016-03-04 15:51:10 -07:00
markjcrane
9ffcf3d872
Ensure the phrases_dir is not nil.
2016-03-04 15:08:58 -07:00
markjcrane
093235cca5
Merge branch 'master' of https://github.com/fusionpbx/fusionpbx
2016-03-04 12:36:19 -07:00
markjcrane
ac0f620302
Prevent a nil error for xml handler languages.
2016-03-04 12:35:37 -07:00
reliberate
39a31432ba
User Dashboard: Minor layout optimizations.
...
Follow Me: Added search and minimized paging controls.
Extensions: Added minimized paging controls.
2016-03-03 19:01:58 -07:00
markjcrane
cb8aaac1f7
Add ring_member.lua to app/ring_groups/resources/scripts/ring_member.lua.
2016-02-29 18:52:04 -07:00
Alexey Melnichuk
f2c43cb441
Fix. FreeSWITCH also breaks loop if return string value which contain number.
...
```Lua
dbh:query(sql, function()
return "1" -- breaks loop
end)
2016-02-26 14:17:28 +03:00
Alexey Melnichuk
bd4fa2a537
Fix. LuaSQL db backend breaks loop only on positive numbers.
2016-02-26 13:57:32 +03:00
Alexey Melnichuk
b797775720
Fix. ODBC db backend should breaks loop only when callback returns number ~= 0
...
```Lua
dbh:query(sql, function(row)
-- return 0 -- should not break loop
-- return true -- should not break loop
return 1 -- should break loop
end)
```
2016-02-26 13:52:27 +03:00
reliberate
c469e12226
Languages: Corrected capitalization on 'false'.
2016-02-25 11:13:18 -07:00
FusionPBX
bb13ec5063
Merge pull request #1443 from moteus/database_backend
...
Database backend
2016-02-25 08:39:07 -07:00
Luis Daniel Lucio Quiroz
56121737a9
Wrong variable in freeswitch.email
...
https://wiki.freeswitch.org/wiki/Mod_lua#freeswitch.email
same as my other pull request
2016-02-24 19:59:54 -05:00
reliberate
baf579c03e
Edit: Added Find/Replace and Go To (Line) features in toolbar, rename Ace application folder.
2016-02-24 14:44:32 -07:00
reliberate
e736538654
Edit: Addition of Ace editor application files in /resources
2016-02-24 12:32:41 -07:00
markjcrane
cda89cd03c
Merge branch 'master' of https://github.com/fusionpbx/fusionpbx
2016-02-24 10:43:16 -07:00
markjcrane
3d61355494
Update the wallpaper variable yealink_t29g_wallpaper.
2016-02-24 10:42:50 -07:00
Alexey Melnichuk
7c225b404a
Fix. Add `#` to caller ID name when call from IVR
2016-02-24 16:28:38 +03:00
Alexey Melnichuk
466f85a0be
Move scripts to separate dirs.
2016-02-24 14:44:50 +03:00
markjcrane
fddef99e40
Update PHPMailer 5.2.2 to 5.2.14.
2016-02-22 15:00:57 -07:00
markjcrane
af18c963c0
Rename .project.ROOT to project_root.php this conforms better with current file naming standards.
2016-02-22 14:01:18 -07:00
markjcrane
976fc1bc8f
Increase the HTTPS security.
2016-02-22 13:18:37 -07:00
markjcrane
33192164ad
Fix a spelling mistake in the log message in dialplan.lua.
2016-02-22 13:17:04 -07:00
markjcrane
724ea56dd5
Set max rotate on the FreeSWITCH logs to 10.
2016-02-22 13:15:55 -07:00
Alexey Melnichuk
4735d9f41c
Fix. `unpack` moved to `table` in Lua 5.2
2016-02-20 15:22:28 +03:00
Alexey Melnichuk
6035d4033c
Fix. `connected` method on LuaSQL backend.
2016-02-20 15:20:38 +03:00
Alexey Melnichuk
80746dbe3b
Add. Support multiple database backends.
...
```Lua
local Database = require 'resources.functions.database'
-- Default backend configured via xml_handler.db_backend = 'native'
dbh = Database.new("system")
-- To use other backends you can use
dbh = Database.backend.luasql("system")
```
2016-02-19 17:03:45 +03:00
FusionPBX
7e8e1996f0
Merge pull request #1441 from moteus/page_caller_id_name
...
Fix. set caller id name in `page` application
2016-02-19 00:56:19 -07:00
markjcrane
acda022e25
Company directory allow only setting the first or last name.
2016-02-16 13:05:25 -07:00
Alexey Melnichuk
270508bf95
Fix. set caller id name in `page` application
2016-02-16 13:36:14 +03:00
markjcrane
9e029b27eb
Fix a spelling problem in the demo_ivr.xml.
2016-02-11 13:35:12 -07:00
markjcrane
4e0f3e7918
Merge branch 'master' of https://github.com/fusionpbx/fusionpbx
2016-02-10 13:49:46 -07:00
markjcrane
e18a556643
Prevent nil from crashing the lua script.
2016-02-10 13:49:31 -07:00
bdstephenson
3e5353b9aa
Update W52P Provisioning Template
...
account.1.subscribe_mwi should be set to '1' as per Yealink documentation. Not setting this may cause MWI to not work on the W52P.
2016-02-08 08:48:37 -05:00
Alexey Melnichuk
b616736a29
Fix. Declare vars in correct scope.
2016-02-05 10:20:09 +03:00
Alexey Melnichuk
b3764e21f9
Update log.
2016-02-04 20:00:12 +03:00
Alexey Melnichuk
9f818dfbbf
Fix. Infinity loop. IVR ignores `max_failures`.
2016-02-04 19:42:42 +03:00
Alexey Melnichuk
a9e4f5a3e6
Fix. Allow multiple actions in IVR
2016-02-04 19:05:24 +03:00
Alexey Melnichuk
1f9fbc6b7b
Use logger class.
2016-02-04 16:05:35 +03:00
Alexey Melnichuk
2fe1337494
Simplify code
2016-02-04 13:20:30 +03:00
Alexey Melnichuk
834c0bce86
Merge remote-tracking branch 'upstream/master' into ivr_menu
2016-02-04 12:14:27 +03:00
FusionPBX
254ecafad3
Merge pull request #1420 from moteus/fix_partial_dialplan
...
Fix. Do not build context if there error.
2016-02-03 21:32:15 -07:00
markjcrane
5f5b70891c
Update for provisioning. Add a new phone the Yealink t49g.
2016-02-03 20:02:59 -07:00
markjcrane
58bbf9ae7b
Remove trailing whitespaces.
2016-02-03 19:03:16 -07:00
markjcrane
aa020308d4
In vars.xml switch from hostname to the switchname.
2016-02-03 19:02:10 -07:00
markjcrane
b7512ecc88
Include the mkdir function for the IVR Menu.
2016-02-03 10:43:22 -07:00
markjcrane
986784e3fa
Base64 - Make sure the directory structure exists.
2016-02-03 10:01:43 -07:00
FusionPBX
a698b32b2a
Merge pull request #1421 from moteus/cache_support
...
Fix. cache.support always returns `false`
2016-02-03 08:31:27 -07:00
Alexey Melnichuk
2f8e950d34
Fix. Can not pick any options after IVR play `streamfile.lua`
...
Rewrite ivr functions to easy read code.
2016-02-03 16:53:22 +03:00
Alexey Melnichuk
a1170e1396
Fix. Use domain name in streamfile.lua.
...
Fix. Unset input callback after play file done.
2016-02-03 15:20:50 +03:00
Alexey Melnichuk
05188ffd24
Fix. cache.support always returns `false`
2016-02-02 19:54:23 +03:00
Alexey Melnichuk
69be506311
Add. debug message to log.
2016-02-02 19:32:27 +03:00
Alexey Melnichuk
b6ed2eebe9
Fix. Do not build context if there error.
2016-02-02 19:08:19 +03:00
markjcrane
1a0301f6f7
Call center used with xml handler does not have access to the session. Remove session and replace it with api global_getvar as session is not always available.
2016-02-01 11:16:23 -07:00
markjcrane
28b7905c76
LUA function format_ringback the session:getVariable must have quotes around the 'hold_music' string. Next check to see if the ringback is nil or an empty string first before trying to use 'match'.
2016-01-31 10:10:08 -07:00
markjcrane
167e3061aa
Add polycom_digitmap variable for Polycom variable for provisioning.
2016-01-29 16:02:32 -07:00
markjcrane
df78108b18
Mitel provisioning ensure the user_id is set for all keys.
2016-01-29 13:45:25 -07:00
markjcrane
b61cf0cff7
More work on the Mitel key handling.
2016-01-29 12:10:55 -07:00
markjcrane
6b2949e9b2
Fix the Mitel key type.
2016-01-29 12:04:37 -07:00
markjcrane
0f420f275f
Mitel Provisioning add a value for 'Addr'
2016-01-29 11:34:10 -07:00
markjcrane
73d2360b8a
Remove the indentation on the Mitel key assignments so the resulting provisioning file is easier to read.
2016-01-29 11:14:49 -07:00
markjcrane
147bb801fe
Update the Mitel template for Key Line use the key_id instead of key_line.
2016-01-29 11:05:05 -07:00
markjcrane
b8c0c5f2dc
Fix the syntax for the Mitel template.
2016-01-29 10:53:36 -07:00
markjcrane
861153fb05
Add Mitel 5330 provisioning templates.
2016-01-29 10:34:18 -07:00
markjcrane
e763848e1d
Merge branch 'master' of https://github.com/fusionpbx/fusionpbx
2016-01-29 10:32:03 -07:00
markjcrane
bbc49caacc
Improve the key handling in the Mitel.
2016-01-29 10:31:44 -07:00
FusionPBX
85218c9133
Merge pull request #1415 from mafoo/Enhance-ringback
...
Enhance ringback
2016-01-29 07:24:14 -07:00
mafoo
b573f65410
converted callcenter to use common function
2016-01-29 11:26:21 +00:00
markjcrane
e27ecec310
Change spandsp.conf.xml use-ecm from true to false.
2016-01-28 19:42:39 -07:00
mafoo
b655a064fd
Converted uses of ringback to common function
2016-01-28 15:51:50 +00:00
markjcrane
9787fe2087
Update the Cisco 794x personal contacts.
2016-01-25 20:42:48 -07:00
markjcrane
cf2a4601ff
Remove the recordings_dir with automatic domain_name and add domain_name in a few places where it was missing.
2016-01-25 16:53:09 -07:00
markjcrane
48d220b93e
Add recording file handling to the ivr xml handler.
2016-01-25 16:32:27 -07:00
markjcrane
46fd506ed2
Add domain name to the recordings path in ivr_menu.lua.
2016-01-25 16:31:04 -07:00
markjcrane
d3e89f0540
Change the comment in check_password.lua.
2016-01-22 12:24:18 -07:00
Alexey Melnichuk
da1aa87b9e
Fix. Do not prompt password if there no mailbox.
2016-01-22 11:37:34 +03:00
markjcrane
1b79c30ce0
Update the constructor in the vcard class.
2016-01-20 23:56:06 -07:00
markjcrane
fe14179f0f
Remove the polycom/tftp/site.cfg as its currently not working as expected.
2016-01-20 20:33:50 -07:00
markjcrane
3d687d3f39
Add a new polycom template for tftp.
2016-01-20 16:27:17 -07:00
Mafoo
56b34c34ca
changed throw Exception to die
...
nothing ever eval runs the root.php so changed to die to cause a immediate report of error and stop code processing.
2016-01-20 11:30:31 +00:00
markjcrane
5efc4dd0b7
Add personal directory array for provisioning.
2016-01-19 22:14:02 -07:00
Mafoo
87dbd6b428
Added check for if .project.ROOT is missing
...
If a installation is missing the .project.ROOT previously it would just use the last search path as the project root (wrong) this will cause a Exception should it be unable to find it
2016-01-18 09:38:16 +00:00
markjcrane
fa081456b1
Change $_SERVER['DOCUMENT_ROOT'].PROJECT_PATH to $_SERVER["PROJECT_ROOT"].
2016-01-17 00:01:13 -07:00
markjcrane
4a1c02973d
Merge branch 'master' of https://github.com/fusionpbx/fusionpbx
2016-01-16 21:42:40 -07:00
markjcrane
87b0a2344f
Rename the cisco provision files for consistency.
2016-01-16 21:42:13 -07:00
blackc2004
e842e06f53
change file name
2016-01-16 11:30:49 -08:00
FusionPBX
d298dad5cc
Merge pull request #1331 from mafoo/BugFix-root.php_logic
...
Rollout new root.php
2016-01-16 10:09:44 -07:00
markjcrane
912e9dab28
Consolidate the SQL Queries for better performance.
2016-01-16 09:54:01 -07:00
FusionPBX
6e2cc41caf
Merge pull request #1139 from joernott/master
...
Allow provisioning with internal addressbook and update snom320 tpl
2016-01-15 22:45:32 -07:00
FusionPBX
40d6c3f601
Merge pull request #1385 from blackc2004/master
...
yealink remote phone book
2016-01-15 22:40:55 -07:00
FusionPBX
697ddb08c9
Merge pull request #1384 from moteus/lua_conf_run_example
...
Add. Example of how run fax queue monitor.
2016-01-15 21:43:34 -07:00
FusionPBX
eb77a26998
Merge pull request #1387 from mafoo/BugFix-Languages
...
BugFixes in languages.lua
2016-01-15 21:42:48 -07:00
blackc2004
6dc1f9b631
Update cidlookup.conf.xml
2016-01-15 20:11:38 -08:00
markjcrane
1a896d3cd2
Fix the domain name in MN_Generic.cfg.
2016-01-15 17:54:06 -07:00
markjcrane
7d5312520a
Make the domain in MN_Generic.cfg dynamic.
2016-01-15 17:35:00 -07:00
markjcrane
4c5d644757
Mitel provisioning add MN_Generic.cfg and update the 5324 and 5340 templates.
2016-01-15 17:09:16 -07:00
markjcrane
492653b1e0
Add a line feed to the mitel/5324/MN_{$mac}.cfg template.
2016-01-15 14:27:53 -07:00
markjcrane
9d61033b87
Default mitel tftp_config to 2.
2016-01-15 14:15:53 -07:00
markjcrane
dd7f473f8d
Fix the domain_name syntax.
2016-01-15 13:45:32 -07:00
markjcrane
3da1d0b521
A few more adjustments for the Cisco 79xx directories.
2016-01-15 13:43:40 -07:00
markjcrane
725fc133ea
Fix the syntax in the 7940 and 7960 directory-personal.xml configuration.
2016-01-15 13:36:46 -07:00
Matthew Vale
b0e4f19993
BugFixes in languages.lua
...
removed extra ;'s
fix file_handle:close to be inside the if null check
2016-01-15 10:35:19 +00:00
Matthew Vale
6999198492
added logic in cli mode to chdir to the correct directory first
...
the webserver would normally do this for us, but we need to do it
2016-01-14 16:25:05 +00:00
Matthew Vale
b7e350b845
changed text.php to use $_SERVER["PROJECT_ROOT"]
2016-01-14 16:15:41 +00:00
blackc2004
526a20169e
start of local extensions as remote phone book
2016-01-13 10:08:38 -08:00
Matthew Vale
a41e89af76
Added full logic to support cli as well
2016-01-13 17:38:54 +00:00
Alexey Melnichuk
a2d29679a8
Add. Example of how run fax queue monitor.
2016-01-13 10:40:21 +03:00
Alexey Melnichuk
aaf9e52e48
Change. Move `fax_queue_*` scripts to `app/fax/resources/scripts`
2016-01-13 10:22:32 +03:00
markjcrane
3853bd85dc
Complete adding application hangup.
2016-01-12 23:16:45 -07:00
markjcrane
f0b57b1516
Add hangup to the destination select list.
2016-01-12 21:07:49 -07:00
markjcrane
56fa5dafba
Comment out the languages not in use until they are needed.
2016-01-12 21:04:39 -07:00
markjcrane
f63d786ca4
Remove the rss feed from the Mitel template.
2016-01-12 20:50:48 -07:00
markjcrane
0c39c98213
Show when we are clearing the cache for *78 or *79.
2016-01-12 19:34:57 -07:00
Matthew Vale
0176d30312
change to use '/' instead of DIRECTOR_SEPERATOR
2016-01-12 14:47:50 +00:00
Matthew Vale
e6ad46cfbf
Rollout of root.php
2016-01-12 13:55:39 +00:00
markjcrane
595f10ef2f
Change array extensins to contact_extensions and add a new extension array. Remove trailing spaces. And add a new cisco 79xx directory called Our Phones.
2016-01-12 02:42:59 -07:00
markjcrane
352a630f42
Add dsn_callcenter and improve the indentation.
2016-01-12 01:48:11 -07:00
markjcrane
86b0e88d16
Fix the PostgreSQL query in cidlookup.conf.xml.
2016-01-08 18:15:45 -07:00
markjcrane
7ea8a14384
Merge branch 'master' of https://github.com/fusionpbx/fusionpbx
2016-01-06 11:10:37 -07:00
blackc2004
7269520f99
another directory setting url typo
2016-01-06 09:43:25 -08:00
markjcrane
0da3b9fe4a
Merge branch 'master' of https://github.com/fusionpbx/fusionpbx
2016-01-05 13:19:18 -07:00
markjcrane
ce78189a80
Fix the FAX retry email.
2016-01-05 13:19:02 -07:00
blackc2004
9d99de26bc
fix two files
2016-01-05 12:16:53 -08:00
blackc2004
868affab3a
change ldap settings to be consistent across all yealink files
2016-01-05 12:14:03 -08:00
blackc2004
84a420d8df
Update y000000000036.cfg
2016-01-05 11:20:33 -08:00
blackc2004
f022a5d104
Update y000000000029.cfg
2016-01-05 11:19:08 -08:00
FusionPBX
5ab294996f
Merge pull request #1365 from blackc2004/patch-26
...
Update y000000000005.cfg
2016-01-05 11:40:50 -07:00
FusionPBX
38861efcf7
Merge pull request #1367 from blackc2004/patch-28
...
Update y000000000029.cfg
2016-01-05 11:40:07 -07:00
FusionPBX
b5f9dfb69e
Merge pull request #1364 from blackc2004/patch-27
...
Update y000000000046.cfg
2016-01-05 11:39:58 -07:00
blackc2004
f4ab98828d
Update y000000000035.cfg
2016-01-05 09:58:00 -08:00
blackc2004
3303d0d907
Update y000000000029.cfg
2016-01-05 09:54:38 -08:00
blackc2004
4365535429
Update y000000000046.cfg
2016-01-05 09:53:43 -08:00
blackc2004
fe75094087
Update y000000000005.cfg
2016-01-05 09:51:58 -08:00
markjcrane
98f0389947
Another adjustment to the xml.
2016-01-04 19:33:02 -07:00
markjcrane
31a395ab45
A few more xml adjustments for the IVR Menu and add a desription attribute for each IVR option.
2016-01-04 19:29:39 -07:00
markjcrane
aa384869cc
Fix a small bug with the ivr.
2016-01-04 19:19:39 -07:00
markjcrane
752a5acf8b
Update the ivr menu to use memcache with the uuid as part of the key.
2016-01-04 19:09:29 -07:00
markjcrane
451b106c1e
Continue work to make IVR menu work from XML handler.
2016-01-04 19:05:31 -07:00
markjcrane
2c22aea566
Rename ivr.lua to ivr.conf.lua.
2016-01-04 19:03:28 -07:00
markjcrane
1a4dc2a658
Merge branch 'master' of https://github.com/fusionpbx/fusionpbx
2016-01-04 17:16:27 -07:00
markjcrane
5daf58be72
Using phrase uuid instead of the phrase name reason is this prevents the phrase from breaking when the phrase name is changed.
2016-01-04 17:16:14 -07:00
FusionPBX
f062ddf289
Revert "cherry picked changes from 4.0 branch"
2016-01-04 13:13:48 -07:00
markjcrane
724afd7c17
FusionPBX source coding standard uses tabs instead of spaces for indentation.
2016-01-04 13:04:51 -07:00
markjcrane
72c1e23d56
Update destination.lua some preparation to extend it further.
2016-01-04 12:56:50 -07:00
Alexey Melnichuk
bc9ffa431f
Fix. Definition of `uuid` function in destination.lua.
2016-01-04 09:56:06 +03:00
markjcrane
ccc44825e8
Change lang_path to phrases_dir in languages.lua.
2016-01-03 00:42:40 -07:00
markjcrane
e83b727b7b
Rename ring_member.lua to destination.lua.
2016-01-02 16:38:59 -07:00
markjcrane
122f0bb0a2
Remove the + from the format_phone function.
2016-01-02 16:22:19 -07:00
markjcrane
2c4101e8d0
Move ring_member.lua to ring_groups/resources/scripts/ring_member.lua.
2016-01-02 13:21:34 -07:00
markjcrane
89b2da603f
Improve ring_member.lua with consistent indentation, notes, and more if session:ready to prevent errors.
2016-01-02 13:09:28 -07:00
Matthew Vale
7c74d5cf48
cherry picked changes from 4.0 branch
2015-12-31 10:11:31 +00:00
markjcrane
73b5c22b65
Add odbc-dsn to fifo.conf.xml
2015-12-29 23:47:20 -07:00
markjcrane
7d92c4e4a4
Merge branch 'master' of https://github.com/fusionpbx/fusionpbx
2015-12-29 14:54:09 -07:00
markjcrane
fe99226aa2
Trim the default codecs slightly.
2015-12-29 14:53:53 -07:00
Alexey Melnichuk
8ac7d708d3
Change. Reuse same esl connection to send cache event and command.
...
Fix. Implicitly close esl connection after do cache command.
2015-12-24 13:19:53 +03:00
markjcrane
3e09e32390
Change the .wav to ${record_ext} in the internal sip profiles.
2015-12-23 13:23:54 -07:00
markjcrane
6788b15184
Add record_ext to the recordings.lua.
2015-12-23 12:02:14 -07:00
markjcrane
6dea6e653c
Merge branch 'master' of https://github.com/fusionpbx/fusionpbx
2015-12-22 21:30:55 -07:00
markjcrane
18e0ea3376
AND r.enabled = 'true' shows up on two lines change one to m.enabled and then add m.enabled to the second query.
2015-12-22 21:30:36 -07:00
FusionPBX
c9a9182e72
Merge pull request #1341 from moteus/directory_acl_directory
...
Fix. Generate XML for mod_directory.
2015-12-22 20:54:25 -07:00
Alexey Melnichuk
e708d38e01
Fix. Remove unused code.
2015-12-22 17:19:14 +03:00
markjcrane
4479760618
Fix the ring back on the XML handler -> callcenter.conf.lua.
2015-12-21 23:31:46 -07:00
markjcrane
5da1286329
Add session cookie httponly and set it to true.
2015-12-21 20:52:54 -07:00
Alexey Melnichuk
57a4970c77
Fix. Generate XML for mod_directory.
...
Fix. Generate XML for ACL only for ext which contain `cidr` attr.
Fix. Do not generate entire XML with all ext when sofia request gateways
2015-12-21 17:17:06 +03:00
markjcrane
e2feca300a
Remove this->write_debug from the recursive functions.
2015-12-21 04:31:44 -07:00
markjcrane
302238dc67
Remove 'protected' from the function.
2015-12-21 04:28:23 -07:00
FusionPBX
73daad6e10
Merge pull request #1339 from mafoo/Enhance-resouce/functions.php
...
migrated install_switch's recursive_* routines
2015-12-21 04:25:29 -07:00
Matthew Vale
c0cc276601
migrated install_switch's recursive_* routines
2015-12-21 10:54:48 +00:00
markjcrane
4fd6c57828
Shorten the Sofia User Agent to reduce SIP header size. User Agent by default includes version and git version number.
2015-12-21 03:41:37 -07:00
markjcrane
4df39487d0
Test if email_validate function exists and fix change the indentation from spaces to tabs.
2015-12-20 22:36:34 -07:00
markjcrane
a089c6a76c
Add all domain users to XML handler.directory.domain.
2015-12-20 01:01:52 -07:00
markjcrane
fba3fb039f
Add one line between each function.
2015-12-19 15:00:10 -07:00
FusionPBX
bd914ba376
Merge pull request #1315 from mafoo/Enhance-Languages
...
Enhance languages
2015-12-19 09:20:42 -07:00
FusionPBX
6f7538bc9c
Merge pull request #1334 from kpabijanskas/master
...
XML Handler incorrectly handling 'date-time' time conditions
2015-12-18 08:47:47 -07:00
markjcrane
1c592d5f39
Fix the sip_profiles/internal-ipv6 correct core-db-dsn to odbc-dsn.
2015-12-17 10:43:06 -07:00
markjcrane
7c061fab0f
Change the version to 4.1 to represent that their are bug fixes and features added since 4.0.x.
2015-12-15 22:06:35 -07:00
markjcrane
401fbb56e2
Add 'to' variable to the first two parameters for freeswitch.email.
2015-12-15 21:10:18 -07:00
Karolis Pabijanskas
e3520b9f5b
This pull requests fixes XML Handler support for 'date-time' time codition. With this, date-time gets rendered as:
...
<condition date-time="2015-12-15 15:00~2015-12-16 15:00">
Without this, the time condition WOULD get redered as:
<condition field="date-time" expression="2015-12-15 15:00~2015-12-16 15:00">
which is incorrect and would always match false in FreeSWITCH.
FreeSWITCH docs for this are here: https://freeswitch.org/confluence/display/FREESWITCH/Time+of+Day+and+Holiday+Routing#TimeofDayandHolidayRouting-Variables
All other time condition variables documented seem to be included in FusionPBX'es XML Handler.
2015-12-15 16:31:27 +00:00
Matthew Vale
81b85c3caf
Merge branch 'fusionpbx/master' into Enhance-Languages
...
Conflicts:
app/extensions/app_languages.php
2015-12-11 08:45:26 +00:00
blackc2004
0a08484546
CDR Stats Add ADV Search options request 1173
...
CDR Stats Add ADV Search options request 1173
2015-12-10 11:06:42 -08:00
Matthew Vale
fe949cf048
Initial consolidation of common terms
2015-12-10 10:06:48 +00:00
Matthew Vale
fc9a45d313
Added initial version of app/languages
...
for analyzing missing or overlapping with global text
2015-12-10 10:04:35 +00:00
Matthew Vale
e2cc65874d
Add Fallback language support to en-us
2015-12-10 09:57:54 +00:00
Matthew Vale
e3f1e919da
Migrate app_languages.php from core to resources
2015-12-10 09:57:08 +00:00
FusionPBX
daa0f9bb70
Merge pull request #1294 from moteus/fax_queue_mail_template
...
Add. mail templates for fax server responses.
2015-12-09 16:28:35 -08:00
FusionPBX
0547e9fce7
Merge pull request #1303 from blackc2004/patch-19
...
Update directory.lua
2015-12-09 15:02:48 -08:00
blackc2004
8d072ae13f
Update index.lua
2015-12-09 14:04:59 -08:00
blackc2004
dca392fcc5
Update directory.lua
2015-12-09 14:03:17 -08:00
Alexey Melnichuk
92ea882398
Fix. Use task db connection to build template.
2015-12-09 14:56:02 +03:00
Alexey Melnichuk
7a45e14c8c
Add. mail templates for fax server responses.
2015-12-09 12:43:40 +03:00
markjcrane
bc1fcebad3
Fix the domain name in the path for the inbound fax dialplan.
2015-12-08 22:34:23 -07:00
markjcrane
6387f37009
Prevent the conference alone sound from playing twice.
2015-12-07 16:30:03 -07:00
markjcrane
310b7f2b92
Correct the provision time zone variables used in the t48g template.
2015-12-06 14:53:20 -07:00
markjcrane
cde9debb29
After removing domain name from the default recordings dir path need to add the domain name every where the recordings directory is currently used.
2015-12-06 13:37:35 -07:00
markjcrane
16abb2849f
Remove the domain name from the switch recordings SESSION variable. The path for single and multi-tenant are handled the same and all will used their domain name.
2015-12-06 12:36:08 -07:00
markjcrane
689300e9cd
Merge branch 'master' of https://github.com/fusionpbx/fusionpbx
2015-12-04 17:35:27 -07:00
markjcrane
5291abfe17
Update the wakeup phrases.
2015-12-04 17:35:02 -07:00
Alexey Melnichuk
5c8aa45d44
Fix. send_mail without file.
2015-12-04 16:18:53 +03:00
Matthew Vale
47ff30bce0
fix to the external IPv6
2015-12-03 15:42:52 +00:00
markjcrane
8ac5852137
Merge branch 'master' of https://github.com/fusionpbx/fusionpbx
2015-12-02 20:37:26 -07:00
markjcrane
7f0f8ff1cd
Change ntp server variable for Cisco 7940 and 7960 ntp_server_primary.
2015-12-02 20:36:47 -07:00
FusionPBX
6c10eaf21a
Merge pull request #1271 from mafoo/Enhance_Install
...
Enhance install based on feedback
2015-12-02 10:22:44 -07:00
Matthew Vale
96a22b5321
made reference to install resource literal
2015-12-02 16:07:23 +00:00
markjcrane
5d2c76b7e2
Seperate Cisco 7940/7960 from Cisco SPA so that both can work with check-sync for reboot and reprovision.
2015-12-01 21:12:52 -07:00
markjcrane
906cb13145
Add check-sync support for Linksys SPA.
2015-12-01 20:48:47 -07:00
markjcrane
64c6dd0181
Merge branch 'master' of https://github.com/fusionpbx/fusionpbx
2015-12-01 14:10:01 -07:00
markjcrane
706b80ea30
Add syncinfo.xml for cisco 7940 and 7960.
2015-12-01 14:09:44 -07:00
FusionPBX
8bb6d70e64
Merge pull request #1273 from moteus/fax_queue
...
Add. `Tasks.send_mail_task` function to send task reply.
2015-12-01 11:01:32 -07:00
Matthew Vale
f0e2e8d735
Merge remote-tracking branch 'remotes/fusionpbx/master' into Enhance_Install
...
Conflicts:
core/install/resources/classes/install_fusionpbx.php
2015-12-01 16:21:10 +00:00
Matthew Vale
a936bbcf74
moved config_lua responsibility to install_switch
2015-12-01 15:13:33 +00:00
Alexey Melnichuk
efc62b064b
Remove unused code.
2015-12-01 16:24:53 +03:00
Alexey Melnichuk
f8c86b42bc
Add. `Tasks.send_mail_task` function to send task reply.
2015-12-01 15:46:52 +03:00
Matthew Vale
42e9771791
use fixed value for the replacement as DIRECTORY_SEPARATOR changes per platform
2015-12-01 11:44:24 +00:00
Matthew Vale
d520226c87
corrected the normalizer
2015-12-01 11:35:23 +00:00
Alexey Melnichuk
20a84ee9b5
Fix. Remove global variable.
2015-12-01 14:35:17 +03:00
Matthew Vale
db1e53296e
db_create not create_db
...
corrected version detection
corrected constant
2015-12-01 10:23:24 +00:00
Matthew Vale
d305dd2f79
added normalize_path
2015-12-01 10:11:39 +00:00
markjcrane
e7ee8fb0f8
Add an additional line feed to the grandstream/gxp21xx template.
2015-11-30 13:42:06 -07:00
markjcrane
d4303df93a
Adjust the spaces and remove the extra device key type.
2015-11-30 13:39:17 -07:00
markjcrane
ea16b7ea8c
Add a missing plus in the template.
2015-11-30 13:35:31 -07:00
markjcrane
1f7923908f
Adjust the type / mode in the Grandstream gxp21xx template.
2015-11-30 13:33:46 -07:00
markjcrane
675544a655
Add a few more keys parameters to the Grandstream gxp21xx template.
2015-11-30 12:50:41 -07:00
markjcrane
170260a8a5
Merge branch 'master' of https://github.com/fusionpbx/fusionpbx
2015-11-30 12:33:48 -07:00
markjcrane
ba0a00bc84
Add expansion aka side car support to the Grandstream gxp21xx template.
2015-11-30 12:33:27 -07:00
FusionPBX
10380a619b
Merge pull request #1267 from moteus/fax_queue
...
Add. Send reply message after fax task done.
2015-11-30 11:05:19 -07:00
Alexey Melnichuk
6cfc24f8eb
Fix. Send mail when fail create outbound channel.
2015-11-30 12:08:26 +03:00
Alexey Melnichuk
5339e39db8
Add. Send reply message after fax task done.
2015-11-30 11:57:09 +03:00
Alexey Melnichuk
fedd5ba9fc
Add. Text class to manage translate texts.
2015-11-30 10:22:55 +03:00
markjcrane
6fa7dcfa30
Synchronize the cisco 7940 with the 7940 template.
2015-11-28 21:12:16 -07:00
markjcrane
f9a5aa2461
Complete the directory for Cisco 7940 template.
2015-11-28 21:09:12 -07:00
markjcrane
37741c0926
Remove the mac address from the path in one more location.
2015-11-28 19:56:06 -07:00
markjcrane
1a46a38c04
Add option to get the mac address from &name=SEPxxxxx
2015-11-28 19:48:45 -07:00
markjcrane
42b0cf5c76
Escape the & in the directory url with &
2015-11-28 19:31:07 -07:00
markjcrane
7e67cbc16f
Correct the paths to the Cisco 7940 directory xml files.
2015-11-28 18:47:52 -07:00
markjcrane
7ac51b5664
Improve the white space handling in the 7940 directory.xml files.
2015-11-28 18:39:38 -07:00
markjcrane
71b7e1c0ff
Another adjustment to the Cisco 7940 template for nat_enable.
2015-11-28 18:03:47 -07:00
markjcrane
20eae285a9
Set nat_enabled = 1 as a default, and add sync 1 to the Cisco 7940 template.
2015-11-28 17:53:44 -07:00
markjcrane
be5fb172d5
Fix the device label for the Cisco 7940.
2015-11-28 17:31:31 -07:00
markjcrane
f949334989
Update the Cisco 7940 template.
2015-11-28 17:08:41 -07:00
markjcrane
dde6c07a3f
Clear the SIPDefault.cnf better to have full control per device of all setttings.
2015-11-28 16:50:50 -07:00
FusionPBX
3bf31f0c5b
Merge pull request #1263 from moteus/v_mailto
...
Change. Rename v_mailto.bat to mailto.bat
2015-11-28 12:49:29 -07:00
Alexey Melnichuk
85634c801e
Change. Move fax_queue to app/fax.
2015-11-28 11:40:54 +03:00
Alexey Melnichuk
a5d6c85e6f
Change. Rename v_mailto.bat to mailto.bat
2015-11-28 11:17:46 +03:00
markjcrane
1691c3e5f0
Use the new config class in the domains and schema classes.
2015-11-27 19:59:50 -07:00
markjcrane
82e602e93a
Missed a set of round brackets on this->exists.
2015-11-27 19:53:30 -07:00
markjcrane
9d9f2597bb
Correct the variable name and add the additional code examples.
2015-11-27 19:48:22 -07:00
markjcrane
c0394ba790
Remove some of the comments and an extra curly bracket.
2015-11-27 19:29:56 -07:00
markjcrane
ddcd8a5f23
Update the config php class.
2015-11-27 19:25:16 -07:00
markjcrane
e4d850aa10
Rename the config.php file and a few minor adjustments to install_fusionpbx.
2015-11-27 19:03:25 -07:00
markjcrane
377ab8cfd9
Add a new config.php class.
2015-11-27 18:57:23 -07:00
markjcrane
744ba6f9a4
Correct the file names of the Mitel templates.
2015-11-27 13:56:53 -07:00
FusionPBX
962dad91ad
Merge pull request #1261 from moteus/mailto_windows
...
Fix. Use wrapper bat file to v_malito.php on Windows.
2015-11-27 10:27:53 -07:00
Alexey Melnichuk
83022b60b2
Fix. json encode x-headers
2015-11-27 16:29:52 +03:00
Alexey Melnichuk
406e95ab29
Add. `send_mail` wrapper function to freeswitch.email and v_mailto.php.
...
Fix. Send voicemail when set unknown language/dialect.
2015-11-27 15:47:14 +03:00
Alexey Melnichuk
2aaba3b440
Fix. Use wrapper bat file to v_malito.php on Windows.
...
Tested on WAMP and OpenServer.
2015-11-27 14:50:08 +03:00
FusionPBX
a203d730a8
Merge pull request #1257 from mafoo/bugfix-ft_install
...
Bugfix ft install
2015-11-26 10:22:55 -08:00
Alexey Melnichuk
a439e7caa6
Add. log session uuid
2015-11-26 17:41:48 +03:00
Alexey Melnichuk
ed595a3708
Fix. Remove task in next.lua (Fix preview commit)
2015-11-26 17:30:56 +03:00
Alexey Melnichuk
b00229e5fc
Fix. Remove task in next.lua
2015-11-26 17:25:15 +03:00
Alexey Melnichuk
ac44787e36
Fix. problem when same session can release task multiple times.
...
It can be when originate has group dial-string. So it call `api_hangup_hook`
for each channel.
Now we release task in `retry.lua` only if originate success and this is same channel
which execute `exec.lua`.
If originate fail we release task `next.lua`
2015-11-26 17:23:33 +03:00
markjcrane
759a375f5e
Remove trailing tabs. Fix some spelling mistakes. And update core/upgrade/app_defaults.php to fix advanced -> upgrade.
2015-11-25 18:06:27 -07:00
markjcrane
89c2f4ecb5
Correct the primary key of v_fax_tasks table. Coding standards require primary key to remove v_ prefix, singular form and add a _uuid postfix. Result is task_uuid has been changed to fax_task_uuid.
2015-11-25 08:51:54 -07:00
FusionPBX
b562c4e5ec
Merge pull request #1251 from moteus/fax_queue
...
Fax queue
2015-11-25 07:37:28 -08:00
FusionPBX
6ac4d8a25c
Merge pull request #1252 from mafoo/Install_Rewrite
...
Install rewrite
2015-11-25 07:35:50 -08:00
Alexey Melnichuk
3e9222d3ab
Fix. cleanup old tasks.
2015-11-25 13:21:02 +03:00
Alexey Melnichuk
e51c890c41
Fix. Log output in retry.lua
2015-11-25 12:42:56 +03:00
markjcrane
818a0be88d
Fix the path on the provisioning file.
2015-11-24 16:31:25 -07:00
Alexey Melnichuk
e4c51396c8
Add. option to work with broken `affected_rows` FS 1.4
2015-11-24 18:49:21 +03:00
Alexey Melnichuk
6d1e73ca13
Fix. Add `split` function (required by lazy_settings).
2015-11-24 14:26:21 +03:00
markjcrane
faad283331
Clear the dial_string variable so that it to prevent duplicate destinations.
2015-11-22 19:07:56 -07:00
markjcrane
93ff09e8b1
Add a new variable mitel_vlan_id.
2015-11-20 10:50:35 -07:00
markjcrane
ff9e302768
Add Mitel 5324 and 5340 templates.
2015-11-20 09:23:41 -07:00
Matthew Vale
0227b11822
Merge remote-tracking branch 'remotes/fusionpbx/master' into Install_Rewrite
...
Conflicts:
themes/enhanced/app_defaults.php
2015-11-20 10:50:27 +00:00
Alexey Melnichuk
b95410387e
Merge branch 'master' into fax_queue
2015-11-20 11:00:44 +03:00
Alexey Melnichuk
b3cc3a8887
Add. Supports MySQL/SQLite to fax queue.
2015-11-20 10:38:51 +03:00
FusionPBX
d004db6866
Merge pull request #1248 from blackc2004/master
...
vlan id's in yealink
2015-11-19 17:40:11 -08:00
markjcrane
e93e225515
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
blackc2004
0bcde0707c
Update y000000000036.cfg
2015-11-19 13:47:38 -08:00
blackc2004
824287ef76
Update y000000000037.cfg
2015-11-19 13:47:17 -08:00
blackc2004
29ef0453a7
Update y000000000035.cfg
2015-11-19 13:47:05 -08:00
blackc2004
71c8630f00
Update y000000000029.cfg
2015-11-19 13:46:37 -08:00
blackc2004
003c86c015
Update y000000000028.cfg
2015-11-19 13:45:06 -08:00
FusionPBX
bc37dd18d7
Merge pull request #1245 from mafoo/Enhance-Sip_Profiles
...
Enhance sip profiles
2015-11-19 09:17:22 -08:00
Matthew Vale
850a1af0c0
Added more ringer types
...
corrected reference to ssl dir to use $conf_dir
moved countries list out to its own file so it can be maintained easier
(and used by other apps)
2015-11-19 14:54:04 +00:00
Matthew Vale
116298f721
Added External IPv6 support
...
created the external IPv6 profile
2015-11-19 13:57:23 +00:00
Alexey Melnichuk
82d858c2b8
Add. Basic fax_queue_monitor script.
...
To start
From cli: `luarun fax_queue_monitor.lua`
Autostart with FS: Add `<param name="startup-script" value="fax_queue_monitor.lua"/>` to `lua.conf.xml`
From shell: call from `script_dir` `lua fax_queue_monitor.lua` (require installed Lua and some additional libraries).
To stop
remove `fax_queue.tmp` file from `script_dir/run`
2015-11-19 13:19:59 +03:00
Matthew Vale
75efd1bd58
Resolved install issues, environment now in tact enough to run app_defaults
2015-11-18 17:30:43 +00:00
Matthew Vale
192ef9fc3f
Merge remote-tracking branch 'remotes/fusionpbx/master' into Install_Rewrite
2015-11-18 17:08:37 +00:00
Matthew Vale
9db81bdcb6
re-added file to file conflict
2015-11-18 17:05:10 +00:00
FusionPBX
ed8c7ee732
Merge pull request #1239 from mafoo/Enhance-Languages
...
Enhance languages
2015-11-18 08:51:03 -08:00
Alexey Melnichuk
1944c01820
Remove some log.
2015-11-18 16:41:13 +03:00
Alexey Melnichuk
21e3c62816
Rome some comments.
2015-11-18 16:32:00 +03:00
Alexey Melnichuk
e769a0eafe
Add. Lua part of fax_queue.
...
To poll active task you can run `luarun fax_queue_poll_once.lua`
2015-11-18 16:27:55 +03:00
Matthew Vale
9c1277f85c
removed old installers
2015-11-17 17:02:39 +00:00
Matthew Vale
e66b2f831a
added support to name the languages
...
added remaining flags i have from the famfamfam set and renamed them to country names
2015-11-17 16:20:14 +00:00
markjcrane
9761699ae7
Add voicemail record-silence-threshold variable and change the default threshold from 30 to 300.
2015-11-16 16:59:11 -07:00
Matthew Vale
b53999069c
Enhancements to language support (for future use)
...
optimized the text.php to check the language code once, not every time
2015-11-16 09:41:34 +00: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
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
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
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
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
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
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
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
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
Matthew Vale
b9e8b3ef03
fix to use phrases_dir
...
changed phrases_dir to be dealt with inside app_defaults.php so it is retrieved once like the other paths
2015-11-03 11:16:05 +00:00
FusionPBX
fd397f53c1
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
d937f29813
Merge pull request #1186 from moteus/cache_emit_event
...
Add. `cache` class emit MEMCACHE events.
2015-11-03 03:19:36 -07:00
FusionPBX
63a9865c5f
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
4a73bf880f
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