Tilghman Lesher 979ef8d2ed Merged revisions 42783 via svnmerge from ...

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

........
r42783 | tilghman | 2006-09-11 16:47:23 -0500 (Mon, 11 Sep 2006) | 4 lines

When paging, only wait 5 seconds for the marked user to enter the conference.
After that, assume the paging already completed by the time the channel entered
the conference and drop back out.  (Issue 7275)

........


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

2006-09-11 22:17:46 +00:00

..

app_adsiprog.c

merge new_loader_completion branch, including (at least):

2006-08-21 02:11:39 +00:00

app_alarmreceiver.c

everything that loads a config that needs a config file to run

2006-08-31 21:00:20 +00:00

app_amd.c

Make this module fit the guidelines better

2006-09-06 17:05:48 +00:00

app_authenticate.c

Merged revisions 42421 via svnmerge from

2006-09-08 16:08:36 +00:00

app_cdr.c

merge new_loader_completion branch, including (at least):

2006-08-21 02:11:39 +00:00

app_chanisavail.c

merge new_loader_completion branch, including (at least):

2006-08-21 02:11:39 +00:00

app_channelredirect.c

merge new_loader_completion branch, including (at least):

2006-08-21 02:11:39 +00:00

app_chanspy.c

Minor tweak - we need to lock the channel when we are removing the spy from it.

2006-09-05 17:01:02 +00:00

app_controlplayback.c

merge new_loader_completion branch, including (at least):

2006-08-21 02:11:39 +00:00

app_db.c

merge new_loader_completion branch, including (at least):

2006-08-21 02:11:39 +00:00

app_dial.c

These small app documentation changes to app_dial and app_read will hopefully avert any more 7544 type bug reports\!

2006-09-06 17:14:50 +00:00

app_dictate.c

merge new_loader_completion branch, including (at least):

2006-08-21 02:11:39 +00:00

app_directed_pickup.c

merge new_loader_completion branch, including (at least):

2006-08-21 02:11:39 +00:00

app_directory.c

merge new_loader_completion branch, including (at least):

2006-08-21 02:11:39 +00:00

app_disa.c

merge new_loader_completion branch, including (at least):

2006-08-21 02:11:39 +00:00

app_dumpchan.c

merge new_loader_completion branch, including (at least):

2006-08-21 02:11:39 +00:00

app_echo.c

Merge in VLDTMF support with Zaptel/Core done by the ever great Darumkilla Russell Bryant and the RTP portion done by myself, Muffinlicious Joshua Colp. This has gone through so many discussions/revisions it's not funny but we finally have it!

2006-08-31 01:59:02 +00:00

app_exec.c

merge new_loader_completion branch, including (at least):

2006-08-21 02:11:39 +00:00

app_externalivr.c

merge new_loader_completion branch, including (at least):

2006-08-21 02:11:39 +00:00

app_festival.c

everything that loads a config that needs a config file to run

2006-08-31 21:00:20 +00:00

app_flash.c

merge new_loader_completion branch, including (at least):

2006-08-21 02:11:39 +00:00

app_followme.c

Fix a small typo, to make app_followme.c show properly in "show version files"

2006-09-06 21:37:12 +00:00

app_forkcdr.c

merge new_loader_completion branch, including (at least):

2006-08-21 02:11:39 +00:00

app_getcpeid.c

merge new_loader_completion branch, including (at least):

2006-08-21 02:11:39 +00:00

app_hasnewvoicemail.c

merge new_loader_completion branch, including (at least):

2006-08-21 02:11:39 +00:00

app_ices.c

merge new_loader_completion branch, including (at least):

2006-08-21 02:11:39 +00:00

app_image.c

merge new_loader_completion branch, including (at least):

2006-08-21 02:11:39 +00:00

app_ivrdemo.c

merge new_loader_completion branch, including (at least):

2006-08-21 02:11:39 +00:00

app_lookupblacklist.c

merge new_loader_completion branch, including (at least):

2006-08-21 02:11:39 +00:00

app_lookupcidname.c

merge new_loader_completion branch, including (at least):

2006-08-21 02:11:39 +00:00

app_macro.c

Committed a fix for 7731, suggested by mnehauser.

2006-08-29 13:21:47 +00:00

app_meetme.c

Merged revisions 42783 via svnmerge from

2006-09-11 22:17:46 +00:00

app_milliwatt.c

Merge team/russell/frame_caching

2006-08-29 20:50:36 +00:00

app_mixmonitor.c

Make the difference clear about what the responsibilities of the core and a spy are when it comes to spying on a channel. The core is responsible for adding a spy to a channel, feeding frames into the spy, removing the spy from the channel, and notifying the spy that is has been detached. The spy is responsible for reading frames in, and cleaning itself up. Each side will not try to do the other's job.

2006-09-03 23:30:37 +00:00

app_morsecode.c

merge new_loader_completion branch, including (at least):

2006-08-21 02:11:39 +00:00

app_mp3.c

merge new_loader_completion branch, including (at least):

2006-08-21 02:11:39 +00:00

app_nbscat.c

merge new_loader_completion branch, including (at least):

2006-08-21 02:11:39 +00:00

app_osplookup.c

everything that loads a config that needs a config file to run

2006-08-31 21:00:20 +00:00

app_page.c

Merged revisions 42783 via svnmerge from

2006-09-11 22:17:46 +00:00

app_parkandannounce.c

merge new_loader_completion branch, including (at least):

2006-08-21 02:11:39 +00:00

app_playback.c

merge new_loader_completion branch, including (at least):

2006-08-21 02:11:39 +00:00

app_privacy.c

merge new_loader_completion branch, including (at least):

2006-08-21 02:11:39 +00:00

app_queue.c

This was added to app_dial a while back, and now it's in app_queue as well. Provide an option to prevent members of the queue from forwarding calls from the queue to somewhere else.

2006-09-03 19:32:51 +00:00

app_random.c

merge new_loader_completion branch, including (at least):

2006-08-21 02:11:39 +00:00

app_read.c

Minor cleanup and make sure the tmp variable is clean

2006-09-07 18:54:36 +00:00

app_readfile.c

merge new_loader_completion branch, including (at least):

2006-08-21 02:11:39 +00:00

app_realtime.c

merge new_loader_completion branch, including (at least):

2006-08-21 02:11:39 +00:00

app_record.c

small fix for issue 007926

2006-09-11 16:00:53 +00:00

app_rpt.c

everything that loads a config that needs a config file to run

2006-08-31 21:00:20 +00:00

app_sayunixtime.c

merge new_loader_completion branch, including (at least):

2006-08-21 02:11:39 +00:00

app_senddtmf.c

merge new_loader_completion branch, including (at least):

2006-08-21 02:11:39 +00:00

app_sendtext.c

merge new_loader_completion branch, including (at least):

2006-08-21 02:11:39 +00:00

app_setcallerid.c

merge new_loader_completion branch, including (at least):

2006-08-21 02:11:39 +00:00

app_setcdruserfield.c

merge new_loader_completion branch, including (at least):

2006-08-21 02:11:39 +00:00

app_settransfercapability.c

merge new_loader_completion branch, including (at least):

2006-08-21 02:11:39 +00:00

app_skel.c

merge new_loader_completion branch, including (at least):

2006-08-21 02:11:39 +00:00

app_sms.c

suppress compiler warning

2006-08-29 17:31:15 +00:00

app_softhangup.c

merge new_loader_completion branch, including (at least):

2006-08-21 02:11:39 +00:00

app_speech_utils.c

Documentation updates (thanks Shaun for the speechrec.txt one!)

2006-08-24 15:44:24 +00:00

app_stack.c

merge new_loader_completion branch, including (at least):

2006-08-21 02:11:39 +00:00

app_system.c

merge new_loader_completion branch, including (at least):

2006-08-21 02:11:39 +00:00

app_talkdetect.c

merge new_loader_completion branch, including (at least):

2006-08-21 02:11:39 +00:00

app_test.c

merge new_loader_completion branch, including (at least):

2006-08-21 02:11:39 +00:00

app_transfer.c

merge new_loader_completion branch, including (at least):

2006-08-21 02:11:39 +00:00

app_url.c

merge new_loader_completion branch, including (at least):

2006-08-21 02:11:39 +00:00

app_userevent.c

merge new_loader_completion branch, including (at least):

2006-08-21 02:11:39 +00:00

app_verbose.c

merge new_loader_completion branch, including (at least):

2006-08-21 02:11:39 +00:00

app_voicemail.c

Get rid of ugly tmp directory, although I really should

2006-09-08 22:54:28 +00:00

app_waitforring.c

merge new_loader_completion branch, including (at least):

2006-08-21 02:11:39 +00:00

app_waitforsilence.c

Changes/fixes to the app_waitforsilence app to make it behave more the way the author originally intended for it

2006-09-03 20:23:41 +00:00

app_while.c

merge new_loader_completion branch, including (at least):

2006-08-21 02:11:39 +00:00

app_zapateller.c

merge new_loader_completion branch, including (at least):

2006-08-21 02:11:39 +00:00

app_zapbarge.c

merge new_loader_completion branch, including (at least):

2006-08-21 02:11:39 +00:00

app_zapras.c

merge new_loader_completion branch, including (at least):

2006-08-21 02:11:39 +00:00

app_zapscan.c

merge new_loader_completion branch, including (at least):

2006-08-21 02:11:39 +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

GNU make already knows how to quietly ignore non-existent files in 'include' directives

2006-08-26 23:58:47 +00:00

rpt_flow.pdf

remove extraneous svn:executable properties

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