Changeset 9290

Show
Ignore:
Timestamp:
03/19/10 16:52:47 (2 years ago)
Author:
p_lindheimer
Message:

Merged revisions 9253-9289 via svnmerge from
http://svn.freepbx.org/modules/branches/2.7

................

r9282 | mickecarlsson | 2010-03-18 14:48:59 -0700 (Thu, 18 Mar 2010) | 9 lines


Merged revisions 9279 via svnmerge from
http://svn.freepbx.org/modules/branches/2.8


........

r9279 | mickecarlsson | 2010-03-18 22:06:12 +0100 (Thu, 18 Mar 2010) | 1 line


Removed dbug from language module

........

................

r9288 | p_lindheimer | 2010-03-19 14:43:52 -0700 (Fri, 19 Mar 2010) | 1 line


closes #4148 work around Asterisk bug returning transferer to dialplan since it is present in several reelases

................

r9289 | p_lindheimer | 2010-03-19 14:44:41 -0700 (Fri, 19 Mar 2010) | 1 line


update module.xml

................

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved
  • modules/branches/2.8

    • Property svnmerge-integrated changed from /modules/branches/2.7:1-9252 to /modules/branches/2.7:1-9289
  • modules/branches/2.8/core/etc/extensions.conf

    r8900 r9290  
    193193exten => DONTCALL,n,Playback(ss-noservice) 
    194194exten => DONTCALL,n,Macro(hangupcall) 
     195exten => ANSWER,1,Noop(Call successfully answered - Hanging up now) 
     196exten => ANSWER,n,Macro(hangupcall,) 
    195197 
    196198; make sure hungup calls go here so that proper cleanup occurs from call confirmed calls and the like 
  • modules/branches/2.8/core/functions.inc.php

    r9264 r9290  
    31323132        $ext->add($mcontext,$exten,'', new ext_return('')); 
    31333133 
     3134        /* 
     3135        * There are reported bugs in Asterisk Blind Trasfers that result in Dial() returning and continuing 
     3136        * execution with a status of ANSWER. So we hangup at this point 
     3137        */ 
     3138        $exten = 's-ANSWER'; 
     3139        $ext->add($context, $exten, '', new ext_noop('Call successfully answered - Hanging up now')); 
     3140        $ext->add($context, $exten, '', new ext_macro('hangupcall')); 
     3141 
    31343142        $exten = 's-TORTURE'; 
    31353143        $ext->add($mcontext,$exten,'', new ext_goto('1','musiconhold','app-blackhole')); 
  • modules/branches/2.8/core/module.xml

    r9264 r9290  
    1010  <canuninstall>no</canuninstall> 
    1111  <changelog> 
     12    *2.8.0.0beta1.3* #4148, triming local changelog 
    1213    *2.8.0.0beta1.2* #4146 
    1314    *2.8.0.0beta1.1* #4132, #2833, #4068, #4135, #4143, #4144 
     
    4445    *2.6.0alpha1.1* #3380, #3358, #3387, localizations 
    4546    *2.6.0alpha1.0* #3321, #3328, #3345 inbound CID routing fix, adds vm-callme voicemail access option 
    46     *2.5.1.1* #3311, revert #3266 (r7001) 
    47     *2.5.1.0* #3304, #3276, #3299 
    48     *2.5.0.4* #3299 
    49     *2.5.0.3* #3266, #3267, #3281, #3042 (vm-callme context), localiztion fixes 
    50     *2.5.0.2* #3219, #3241, #3240, #3251, #3215, localization fixes 
    51     *2.5.0.1* minor bug not showing extensions 
    52     *2.5.0.0* #3211, and final release 
    53     *2.5.0rc3.3* #3193, #3200, localization fixes, Swedish 
    54     *2.5.0rc3.2* #3124, #3180 
    55     *2.5.0rc3.1* #3173, #3077 auto-blkvm,  auto-confirm to auto generation,  visual feedback to DAHDI compatibility 
    56     *2.5.0rc3.0* #3150, #3152, #3142, #3167, #3077 (DAHDI Support) 
    57     *2.5.0rc2.5* #3129, #3144, #3146 and some streamling of dialout-trunk and outbound-callerid 
    58     *2.5.0rc2.4* #3128, #3140 sqlite3 fix and fixed typo introduced in dialparties.agi 
    59     *2.5.0rc2.3* #3130, #2750, #3128, #3131 (requires r6519) added master recording disable (can be performance booster) 
    60     *2.5.0rc2.2* lots of changed to be updated 
    61     *2.5.0rc2.1* #3115, #3116 remove warning and add t option to nv_faxdetect 
    62     *2.5.0rc2.0* #3091, #3099, #3100 Added return from voicemail/busy to IVR support, added CID Priority Route Inbound Route option 
    63     *2.5.0rc1.1* #3060, #3072, #3078 mixmonitor recording dir typo, move disallow=all to top of all sip, iax sections, file call screening nomemory 
    64     *2.5.0rc1.0* #3053 allow routing in CIDs like Private, Blocked, Restricted, etc. and bump to rc1 
    65     *2.5.0beta1.4* #3046, #3019, #3047, #3040 
    66     *2.5.0beta1.3* #2530 typo _GLOBALS should be GLOBALS, clean up conflicts when creating users/extensions 
    67     *2.5.0beta1.2* #2913 Add pre-answer delay option to incoming routes, rearrange the order of options on incoming screen 
    68     *2.5.0beta1.1* #2991, #2999, #2993, #3020, #3002, #3041, #2996, #3029, #3031 
    69     *2.5.0beta1.0* #2976, #2778, #2413, #2974, #2962, #2894, #2073 
    70     *2.5.0alpha1.1* #2930, #2938, #2922, #2939, #1568, #2949, #2779, #2953, #1911, #2807 
    71     *2.5.0alpha1.0* #2853, #2925, #2391, #2785, #2923, #2671, #2585, #2908, #2909, #2510, #2976, #2845, #1715, #2760, #2926, #2927, #2838, also added misc icons, links between users/devices 
    72     *2.4.0.4* #2857, #2848, #2791, #2449 
    73     *2.4.0.3* #2851 forwarded/followme/ringgroup calls originating from outside fail 
    74     *2.4.0.2* #2702, #2759, #2763, #2801, #2747, #2828, #2604, #2841, #2835 - review svn log or tickets for details 
    75     *2.4.0.1* #2693 fix DID editing creating new DID route introduced from #2664 fix 
    76     *2.4.0.0* CHANGELOG TRUNCATED See SVN Repository 
     47    *2.5* CHANGELOG TRUNCATED See SVN Repository 
    7748  </changelog> 
    7849  <depends>