asterisk

mirror of https://github.com/asterisk/asterisk.git synced 2025-11-20 00:30:20 +00:00

Files

Tilghman Lesher cd4aa016a1 Merged revisions 251989 via svnmerge from

https://origsvn.digium.com/svn/asterisk/trunk

........
  r251989 | tilghman | 2010-03-12 13:43:23 -0600 (Fri, 12 Mar 2010) | 8 lines
  
  Don't override a user option with the global option.
  
  (closes issue #16849)
   Reported by: ip-rob
   Patches: 
         20100311__issue16849.diff.txt uploaded by tilghman (license 14)
   Tested by: ip-rob
........


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

2010-03-12 19:50:57 +00:00

app_adsiprog.c

AST-2009-005

2009-08-10 19:36:38 +00:00

app_alarmreceiver.c

AST-2009-005

2009-08-10 19:36:38 +00:00

app_amd.c

Merged revisions 232356 via svnmerge from

2009-12-02 17:11:09 +00:00

app_authenticate.c

- Add more <see-also> based on TFOT.

2008-11-05 13:07:29 +00:00

app_cdr.c

Merge changes from team/group/appdocsxml

2008-11-01 21:10:07 +00:00

app_chanisavail.c

Merged revisions 229966 via svnmerge from

2009-11-13 17:21:49 +00:00

app_channelredirect.c

Merged revisions 172030 via svnmerge from

2009-01-28 20:31:06 +00:00

app_chanspy.c

Merged revisions 228189 via svnmerge from

2009-11-05 21:27:30 +00:00

app_confbridge.c

Merged revisions 249892 via svnmerge from

2010-03-02 19:09:20 +00:00

app_controlplayback.c

Merged revisions 227368 via svnmerge from

2009-11-03 19:49:45 +00:00

app_dahdibarge.c

AST-2009-005

2009-08-10 19:36:38 +00:00

app_dahdiras.c

Fix various spelling and grammatical issues in documentation

2008-11-02 02:50:33 +00:00

app_dahdiscan.c

Merge changes from team/group/appdocsxml

2008-11-01 21:10:07 +00:00

app_db.c

- Add some see-also references based on TFOT.

2008-11-05 12:13:57 +00:00

app_dial.c

Merged revisions 244393 via svnmerge from

2010-02-02 20:35:44 +00:00

app_dictate.c

Fix 'd' option for app_dial and add new option to Answer application

2009-02-11 22:41:01 +00:00

app_directed_pickup.c

Merged revisions 218224 via svnmerge from

2009-09-14 15:20:40 +00:00

app_directory.c

Merged revisions 251779 via svnmerge from

2010-03-11 07:48:14 +00:00

app_disa.c

Merged revisions 220289 via svnmerge from

2009-09-24 19:42:42 +00:00

app_dumpchan.c

Merged revisions 184693 via svnmerge from

2009-03-27 16:25:13 +00:00

app_echo.c

revert ability to exit echo app

2010-03-02 19:50:32 +00:00

app_exec.c

Merged revisions 251884 via svnmerge from

2010-03-11 21:08:33 +00:00

app_externalivr.c

Merged revisions 232587 via svnmerge from

2009-12-03 15:14:47 +00:00

app_fax.c

Merged revisions 245729 via svnmerge from

2010-02-09 18:09:34 +00:00

app_festival.c

Merged revisions 208113 via svnmerge from

2009-07-22 21:46:05 +00:00

app_flash.c

Add Flash() application XML documentation.

2008-11-02 05:10:22 +00:00

app_followme.c

Merged revisions 250979 via svnmerge from

2010-03-05 19:11:25 +00:00

app_forkcdr.c

Merged revisions 209554 via svnmerge from

2009-07-30 18:51:15 +00:00

app_getcpeid.c

Merge changes from team/group/appdocsxml

2008-11-01 21:10:07 +00:00

app_ices.c

Merge changes from team/group/appdocsxml

2008-11-01 21:10:07 +00:00

app_image.c

- Add more <see-also> based on TFOT.

2008-11-05 13:07:29 +00:00

app_ivrdemo.c

Add XML documentation for:

2008-11-03 01:01:25 +00:00

app_jack.c

Fix build WRT ast_str_opaque

2008-12-15 14:40:08 +00:00

app_macro.c

AST-2009-005

2009-08-10 19:36:38 +00:00

app_meetme.c

Merged revisions 238181 via svnmerge from

2010-01-06 20:40:34 +00:00

app_milliwatt.c

Merged revisions 209839 via svnmerge from

2009-08-01 11:04:34 +00:00

app_minivm.c

AST-2009-005

2009-08-10 19:36:38 +00:00

app_mixmonitor.c

Merged revisions 237656 via svnmerge from

2010-01-05 16:09:37 +00:00

app_morsecode.c

AST-2009-005

2009-08-10 19:36:38 +00:00

app_mp3.c

Merged revisions 238010 via svnmerge from

2010-01-06 15:22:41 +00:00

app_nbscat.c

Merged revisions 182847 via svnmerge from

2009-03-18 14:39:05 +00:00

app_originate.c

AST-2009-005

2009-08-10 19:36:38 +00:00

app_osplookup.c

Fixed compile error with OSP Toolkit 3.6.

2009-12-08 07:41:15 +00:00

app_page.c

Merged revisions 170979 via svnmerge from

2009-01-25 13:35:48 +00:00

app_parkandannounce.c

Clear the autoloop flag when parsing and setting the context/extension/priority to go back to. When the channel executes a PBX again we want it to start out at the point we explicitly say and at that point it will not yet be doing autoloop.

2009-01-22 15:01:54 +00:00

app_playback.c

Merged revisions 220289 via svnmerge from

2009-09-24 19:42:42 +00:00

app_playtones.c

Merge a large set of updates to the Asterisk indications API.

2009-02-17 20:41:24 +00:00

app_privacy.c

AST-2009-005

2009-08-10 19:36:38 +00:00

app_queue.c

Merged revisions 247736 via svnmerge from

2010-02-18 20:59:38 +00:00

app_read.c

app_read does not break from prompt loop with user terminated empty string

2009-03-03 23:21:18 +00:00

app_readexten.c

Merge a large set of updates to the Asterisk indications API.

2009-02-17 20:41:24 +00:00

app_readfile.c

AST-2009-005

2009-08-10 19:36:38 +00:00

app_record.c

Merged revisions 251680 via svnmerge from

2010-03-10 20:54:19 +00:00

app_rpt.c

AST-2009-005

2009-08-10 19:36:38 +00:00

app_sayunixtime.c

Add more SeeAlso references based on TFOT.

2008-11-05 14:37:07 +00:00

app_senddtmf.c

Merged revisions 184079 via svnmerge from

2009-03-24 22:42:26 +00:00

app_sendtext.c

Merged revisions 187363 via svnmerge from

2009-04-09 16:41:31 +00:00

app_setcallerid.c

AST-2009-005

2009-08-10 19:36:38 +00:00

app_skel.c

Merge changes from team/group/appdocsxml

2008-11-01 21:10:07 +00:00

app_sms.c

AST-2009-005

2009-08-10 19:36:38 +00:00

app_softhangup.c

Merged revisions 229460 via svnmerge from

2009-11-11 18:35:58 +00:00

app_speech_utils.c

Swap reversed timevals.

2009-03-01 23:25:23 +00:00

app_stack.c

Merged revisions 236300 via svnmerge from

2009-12-23 18:27:05 +00:00

app_system.c

Merged revisions 251877 via svnmerge from

2010-03-11 20:27:37 +00:00

app_talkdetect.c

AST-2009-005

2009-08-10 19:36:38 +00:00

app_test.c

Add a wait to ensure TestServer thinks it has finished sending the final digit.

2010-01-05 23:10:54 +00:00

app_transfer.c

Merge changes from team/group/appdocsxml

2008-11-01 21:10:07 +00:00

app_url.c

- Add some see-also references based on TFOT.

2008-11-05 12:13:57 +00:00

app_userevent.c

Merged revisions 169364 via svnmerge from

2009-01-19 20:05:52 +00:00

app_verbose.c

AST-2009-005

2009-08-10 19:36:38 +00:00

app_voicemail.c

Merged revisions 251989 via svnmerge from

2010-03-12 19:50:57 +00:00

app_waitforring.c

Merged revisions 239712 via svnmerge from

2010-01-13 16:37:06 +00:00

app_waitforsilence.c

Merged revisions 239712 via svnmerge from

2010-01-13 16:37:06 +00:00

app_waituntil.c

AST-2009-005

2009-08-10 19:36:38 +00:00

app_while.c

Merged revisions 156755 via svnmerge from

2008-11-14 00:43:13 +00:00

app_zapateller.c

Merge changes from team/group/appdocsxml

2008-11-01 21:10:07 +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

Merged revisions 201783 via svnmerge from

2009-06-18 20:54:55 +00:00

rpt_flow.pdf

remove extraneous svn:executable properties

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