asterisk

mirror of https://github.com/asterisk/asterisk.git synced 2025-09-06 12:36:58 +00:00

Files

Kinsey Moore 40ea500078 Config inheritance doesn't work with ConfBridge() menu definitions

Current behavior in ConfBridge menu definitions is that first definition takes
precedence, even in templated situations.  This change allows inheritance and
overriding to work as expected so that the last definition takes precedence.

(closes ASTERISK-17986)
Review: https://reviewboard.asterisk.org/r/1267/


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

2011-06-13 20:44:59 +00:00

confbridge

Config inheritance doesn't work with ConfBridge() menu definitions

2011-06-13 20:44:59 +00:00

app_adsiprog.c

Merged revisions 284610 via svnmerge from

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

app_alarmreceiver.c

Asterisk media architecture conversion - no more format bitfields

2011-02-03 16:22:10 +00:00

app_amd.c

Merged revisions 316265 via svnmerge from

2011-05-03 20:45:32 +00:00

app_authenticate.c

Global var cleanup - constification and removing unused vars.

2009-06-07 14:55:51 +00:00

app_cdr.c

Const-ify the world (or at least a good part of it)

2009-05-21 21:13:09 +00:00

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

Global var cleanup - constification and removing unused vars.

2009-06-07 14:55:51 +00:00

app_chanspy.c

Merged revisions 316650 via svnmerge from

2011-05-04 14:26:33 +00:00

app_confbridge.c

MOH for only user not working with ConfBridge

2011-06-13 14:38:57 +00:00

app_controlplayback.c

Change warning message to debug message.

2009-11-03 19:48:53 +00:00

app_dahdibarge.c

Asterisk media architecture conversion - no more format bitfields

2011-02-03 16:22:10 +00:00

app_dahdiras.c

Global var cleanup - constification and removing unused vars.

2009-06-07 14:55:51 +00:00

app_db.c

Global var cleanup - constification and removing unused vars.

2009-06-07 14:55:51 +00:00

app_dial.c

Merged revisions 320823 via svnmerge from

2011-05-25 17:14:11 +00:00

app_dictate.c

Asterisk media architecture conversion - no more format bitfields

2011-02-03 16:22:10 +00:00

app_directed_pickup.c

Merged revisions 322749 via svnmerge from

2011-06-09 16:47:07 +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

Merged revisions 313517 via svnmerge from

2011-04-13 15:23:23 +00:00

app_echo.c

Asterisk media architecture conversion - no more format bitfields

2011-02-03 16:22:10 +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

Merged revisions 309403 via svnmerge from

2011-03-04 01:52:21 +00:00

app_fax.c

Merged revisions 320823 via svnmerge from

2011-05-25 17:14:11 +00:00

app_festival.c

Merged revisions 316265 via svnmerge from

2011-05-03 20:45:32 +00:00

app_flash.c

Const-ify the world (or at least a good part of it)

2009-05-21 21:13:09 +00:00

app_followme.c

Merged revisions 316265 via svnmerge from

2011-05-03 20:45:32 +00:00

app_forkcdr.c

This patch adds a sequence field to CDRs that can be combined with the linkedid or uniqueid field to uniquely identify a CDR.

2009-11-03 21:21:09 +00:00

app_getcpeid.c

Merged revisions 284610 via svnmerge from

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

app_ices.c

Merged revisions 316265 via svnmerge from

2011-05-03 20:45:32 +00:00

app_image.c

Const-ify the world (or at least a good part of it)

2009-05-21 21:13:09 +00:00

app_ivrdemo.c

Const-ify the world (or at least a good part of it)

2009-05-21 21:13:09 +00:00

app_jack.c

Media Project Phase2: SILK 8khz-24khz, SLINEAR 8khz-192khz, SPEEX 32khz, hd audio ConfBridge, and other stuff

2011-02-22 23:04:49 +00:00

app_macro.c

Merged revisions 295866 via svnmerge from

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

app_meetme.c

Merged revisions 320823 via svnmerge from

2011-05-25 17:14:11 +00:00

app_milliwatt.c

Asterisk media architecture conversion - no more format bitfields

2011-02-03 16:22:10 +00:00

app_minivm.c

Merged revisions 316331 via svnmerge from

2011-05-03 21:48:40 +00:00

app_mixmonitor.c

Mix Monitor: Now with r and t options.

2011-03-11 18:54:45 +00:00

app_morsecode.c

AST-2009-005

2009-08-10 19:20:57 +00:00

app_mp3.c

Asterisk media architecture conversion - no more format bitfields

2011-02-03 16:22:10 +00:00

app_nbscat.c

Asterisk media architecture conversion - no more format bitfields

2011-02-03 16:22:10 +00:00

app_originate.c

Merged revisions 316265 via svnmerge from

2011-05-03 20:45:32 +00:00

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

Asterisk media architecture conversion - no more format bitfields

2011-02-03 16:22:10 +00:00

app_playback.c

Add doxygen documentation

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

app_playtones.c

Const-ify the world (or at least a good part of it)

2009-05-21 21:13:09 +00:00

app_privacy.c

Merged revisions 321337 via svnmerge from

2011-05-27 22:09:03 +00:00

app_queue.c

Merged revisions 322484 via svnmerge from

2011-06-08 20:48:03 +00:00

app_read.c

Last batch of 'static' qualifiers for module-level global variables.

2009-06-15 19:10:10 +00:00

app_readexten.c

Merged revisions 281723 via svnmerge from

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

app_readfile.c

AST-2009-005

2009-08-10 19:20:57 +00:00

app_record.c

Asterisk media architecture conversion - no more format bitfields

2011-02-03 16:22:10 +00:00

app_rpt.c

Merged revisions 317427 via svnmerge from

2011-05-05 22:02:31 +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

Const-ify the world (or at least a good part of it)

2009-05-21 21:13:09 +00:00

app_senddtmf.c

Allow SendDTMF to play digits to a specified channel.

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

app_sendtext.c

Merged revisions 305923 via svnmerge from

2011-02-03 00:29:46 +00:00

app_setcallerid.c

ast_callerid restructuring

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

app_skel.c

Last batch of 'static' qualifiers for module-level global variables.

2009-06-15 19:10:10 +00:00

app_sms.c

Asterisk media architecture conversion - no more format bitfields

2011-02-03 16:22: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

Asterisk media architecture conversion - no more format bitfields

2011-02-03 16:22:10 +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

Asterisk media architecture conversion - no more format bitfields

2011-02-03 16:22:10 +00:00

app_test.c

Asterisk media architecture conversion - no more format bitfields

2011-02-03 16:22:10 +00:00

app_transfer.c

Const-ify the world (or at least a good part of it)

2009-05-21 21:13:09 +00:00

app_url.c

Expand codec bitfield from 32 bits to 64 bits.

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

app_userevent.c

Add the Uniqueid header to Userevent.

2011-05-06 20:44:53 +00:00

app_verbose.c

Merged revisions 301177 via svnmerge from

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

app_voicemail.c

Merged revisions 321537 via svnmerge from

2011-06-01 20:11:08 +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

Asterisk media architecture conversion - no more format bitfields

2011-02-03 16:22:10 +00:00

app_waituntil.c

AST-2009-005

2009-08-10 19:20:57 +00:00

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

remove extraneous svn:executable properties

2005-11-29 18:24:39 +00:00

leave.h

remove extraneous svn:executable properties

2005-11-29 18:24:39 +00:00

Makefile

New HD ConfBridge conferencing application.

2011-04-21 18:11:40 +00:00

rpt_flow.pdf

remove extraneous svn:executable properties

2005-11-29 18:24:39 +00:00