Changeset 3366

Show
Ignore:
Timestamp:
12/19/06 15:45:48 (6 years ago)
Author:
qldrob
Message:

Merge changes from 2.2 into trunk - fix for set_caller_pres, add rc2 changes.

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • freepbx/trunk/amp_conf/astetc/extensions.conf

    r3336 r3366  
    753753exten => s,n(usercid),GotoIf($["${USEROUTCID:1:2}" = ""]?report) ; check CID override for extension 
    754754exten => s,n,Set(CALLERID(all)=${USEROUTCID}) 
    755 exten => s,n,GotoIf($["x${USEROUTCID:1:5}"!="hidden"]?checktrunk:hidecid) ; check CID blocking for extension 
    756 exten => s,n(checktrunk),GotoIf($["x${TRUNKOUTCID:1:5}"!="hidden"]?report:hidecid) ; check CID blocking for extension 
     755exten => s,n,GotoIf($["x${CALLERID(name)}"!="hidden"]?report:hidecid) ; check CID blocking for extension 
    757756exten => s,n(hidecid),SetCallerPres(prohib_passed_screen) ; Only works with ISDN (T1/E1/BRI) 
    758757exten => s,n(report),NoOp(CallerID set to ${CALLERID(all)}) 

  • freepbx/trunk/install_amp

    r3252 r3366  
    4444    '2.2.0beta3', 
    4545    '2.2.0rc1', 
     46    '2.2.0rc2', 
    4647    '2.3.0alpha' 
    4748  );