Sean Bright ed1ee072b8 Merged revisions 304774 via svnmerge from ...

https://origsvn.digium.com/svn/asterisk/branches/1.8

................
  r304774 | seanbright | 2011-01-29 12:54:43 -0500 (Sat, 29 Jan 2011) | 16 lines
  
  Merged revisions 304773 via svnmerge from 
  https://origsvn.digium.com/svn/asterisk/branches/1.6.2
  
  ........
    r304773 | seanbright | 2011-01-29 12:51:28 -0500 (Sat, 29 Jan 2011) | 9 lines
    
    When we pass the S() or L() options to MeetMe, make sure that we honor C as well.
    
    Without this patch, if the user was kicked from the conference via the S() or L()
    mechanism, we would just hang up on them even if we also passed C (continue in
    dialplan when kicked).  With this patch we honor the C flag in those cases.
    
    (closes issue #17317)
    Reported by: var
  ........
................


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@304775 65c4cc65-6c06-0410-ace0-fbb531ad65f3

2011-01-29 17:57:01 +00:00

..

app_adsiprog.c

Merged revisions 284610 via svnmerge from

2010-09-02 05:27:53 +00:00

app_alarmreceiver.c

ast_callerid restructuring

2010-07-14 15:48:36 +00:00

app_amd.c

Merged revisions 277182 via svnmerge from

2010-07-16 17:13:46 +00:00

app_authenticate.c

…

app_cdr.c

…

app_celgenuserevent.c

Merged revisions 282979 via svnmerge from

2010-08-20 11:54:22 +00:00

app_chanisavail.c

Store the cause code that is returned when trying to create a channel in ChanIsAvail in the

2009-11-13 17:22:47 +00:00

app_channelredirect.c

…

app_chanspy.c

Merged revisions 299865 via svnmerge from

2010-12-28 19:00:04 +00:00

app_confbridge.c

Add load priority order, such that preload becomes unnecessary in most cases

2010-07-20 19:35:02 +00:00

app_controlplayback.c

…

app_dahdibarge.c

Expand codec bitfield from 32 bits to 64 bits.

2009-11-04 14:05:12 +00:00

app_dahdiras.c

…

app_db.c

…

app_dial.c

Merged revisions 302918 via svnmerge from

2011-01-20 15:46:24 +00:00

app_dictate.c

Expand codec bitfield from 32 bits to 64 bits.

2009-11-04 14:05:12 +00:00

app_directed_pickup.c

Merged revisions 290376 via svnmerge from

2010-10-05 19:57:31 +00:00

app_directory.c

Merged revisions 263769 via svnmerge from

2010-05-18 19:27:34 +00:00

app_disa.c

ast_callerid restructuring

2010-07-14 15:48:36 +00:00

app_dumpchan.c

ast_callerid restructuring

2010-07-14 15:48:36 +00:00

app_echo.c

revert ability to exit echo app

2010-03-02 19:39:58 +00:00

app_exec.c

Because ExecIf needs to reprocess arguments, it's best if we don't remove quotes during parsing.

2010-03-11 21:07:07 +00:00

app_externalivr.c

initialize playing_silence in struct initialization

2011-01-03 14:09:29 +00:00

app_fax.c

ast_callerid restructuring

2010-07-14 15:48:36 +00:00

app_festival.c

Merged revisions 284281 via svnmerge from

2010-08-30 22:30:10 +00:00

app_flash.c

…

app_followme.c

Add option to followme to delay answer until ready to bridge call.

2011-01-26 23:41:55 +00:00

app_forkcdr.c

…

app_getcpeid.c

Merged revisions 284610 via svnmerge from

2010-09-02 05:27:53 +00:00

app_ices.c

…

app_image.c

…

app_ivrdemo.c

…

app_jack.c

Convert a few places to use ast_calloc_with_stringfields where applicable.

2010-01-15 18:21:50 +00:00

app_macro.c

Merged revisions 295866 via svnmerge from

2010-11-22 19:42:02 +00:00

app_meetme.c

Merged revisions 304774 via svnmerge from

2011-01-29 17:57:01 +00:00

app_milliwatt.c

Expand codec bitfield from 32 bits to 64 bits.

2009-11-04 14:05:12 +00:00

app_minivm.c

ast_callerid restructuring

2010-07-14 15:48:36 +00:00

app_mixmonitor.c

Added MixMonitorMute manager command

2010-04-21 11:27:27 +00:00

app_morsecode.c

…

app_mp3.c

Merged revisions 238009 via svnmerge from

2010-01-06 15:19:10 +00:00

app_nbscat.c

Expand codec bitfield from 32 bits to 64 bits.

2009-11-04 14:05:12 +00:00

app_originate.c

…

app_osplookup.c

Fixed the issue caused by EXTEN including user parameters.

2010-08-10 07:26:59 +00:00

app_page.c

Add audio announcement option to app_page

2009-12-10 17:31:23 +00:00

app_parkandannounce.c

ast_callerid restructuring

2010-07-14 15:48:36 +00:00

app_playback.c

Add doxygen documentation

2010-08-30 08:03:42 +00:00

app_playtones.c

…

app_privacy.c

Merged revisions 302921 via svnmerge from

2011-01-20 16:12:35 +00:00

app_queue.c

Merged revisions 303009 via svnmerge from

2011-01-20 17:14:01 +00:00

app_read.c

…

app_readexten.c

Merged revisions 281723 via svnmerge from

2010-08-11 15:20:29 +00:00

app_readfile.c

…

app_record.c

Be less ambiguous in Record() app docs.

2010-03-10 20:53:43 +00:00

app_rpt.c

ast_callerid restructuring

2010-07-14 15:48:36 +00:00

app_saycounted.c

Add new application for declining counting words in multiple languages.

2010-06-21 05:10:06 +00:00

app_sayunixtime.c

…

app_senddtmf.c

Allow SendDTMF to play digits to a specified channel.

2010-05-24 22:16:29 +00:00

app_sendtext.c

Enable SendText to send strings in encoded format.

2010-01-19 22:41:36 +00:00

app_setcallerid.c

ast_callerid restructuring

2010-07-14 15:48:36 +00:00

app_skel.c

…

app_sms.c

Merged revisions 289426 via svnmerge from

2010-09-30 15:40:10 +00:00

app_softhangup.c

Flags not initialized in app_softhangup.c, causing undefined behavior

2009-11-11 18:13:56 +00:00

app_speech_utils.c

Merged revisions 284610 via svnmerge from

2010-09-02 05:27:53 +00:00

app_stack.c

Merged revisions 284610 via svnmerge from

2010-09-02 05:27:53 +00:00

app_system.c

If the argument to the system application is quoted, ensure we remove the quotes before trying to execute.

2010-03-11 20:25:02 +00:00

app_talkdetect.c

ast_callerid restructuring

2010-07-14 15:48:36 +00:00

app_test.c

Expand codec bitfield from 32 bits to 64 bits.

2009-11-04 14:05:12 +00:00

app_transfer.c

…

app_url.c

Expand codec bitfield from 32 bits to 64 bits.

2009-11-04 14:05:12 +00:00

app_userevent.c

Change usage of pipe to comma in UserEvent docs.

2010-03-18 17:52:35 +00:00

app_verbose.c

Merged revisions 301177 via svnmerge from

2011-01-08 22:02:39 +00:00

app_voicemail.c

Merged revisions 303678 via svnmerge from

2011-01-25 17:05:56 +00:00

app_voicemail.exports.in

Allow symbol export filtering to work properly on platforms that have symbol prefixes.

2010-04-02 18:57:58 +00:00

app_waitforring.c

add silence gen to wait apps

2010-01-13 16:31:14 +00:00

app_waitforsilence.c

add silence gen to wait apps

2010-01-13 16:31:14 +00:00

app_waituntil.c

…

app_while.c

ast_callerid restructuring

2010-07-14 15:48:36 +00:00

app_zapateller.c

ast_callerid restructuring

2010-07-14 15:48:36 +00:00

enter.h

…

leave.h

…

Makefile

…

rpt_flow.pdf

…