Joshua Colp
1c2e3e1ffc
Major res_speech cleanup. It looks much better now!
...
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@60363 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2007-04-06 01:29:28 +00:00
Joshua Colp
4b618442a0
Merged revisions 60361 via svnmerge from
...
https://origsvn.digium.com/svn/asterisk/branches/1.4
........
r60361 | file | 2007-04-05 22:14:00 -0300 (Thu, 05 Apr 2007) | 2 lines
Add support for returning different types of results (ie: NBest).
........
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@60362 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2007-04-06 01:15:50 +00:00
Steve Murphy
09c0d56c5c
Merged revisions 59522 via svnmerge from
...
https://origsvn.digium.com/svn/asterisk/branches/1.4
........
r59522 | murf | 2007-03-30 11:51:17 -0600 (Fri, 30 Mar 2007) | 1 line
several changes via kpflemings review
........
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@59523 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2007-03-30 17:57:47 +00:00
Steve Murphy
0f11d3c8c3
Merged revisions 59486 via svnmerge from
...
https://origsvn.digium.com/svn/asterisk/branches/1.4
........
r59486 | murf | 2007-03-30 08:11:59 -0600 (Fri, 30 Mar 2007) | 1 line
These mods fix CDR issues from 8221, 8593, 8680, 8743, and perhaps others. Mainly with CDRs generated from transfer situations.
........
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@59500 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2007-03-30 14:37:21 +00:00
Russell Bryant
921e975d5f
Merged revisions 59363 via svnmerge from
...
https://origsvn.digium.com/svn/asterisk/branches/1.4
........
r59363 | russell | 2007-03-29 12:43:52 -0500 (Thu, 29 Mar 2007) | 6 lines
When building a response to a subscription, the "from" must be the full Jabber
ID. This fixes some problems where jabber users are not able to add their
Asterisk account to their user list, since they are unable to get Asterisk
to approve their subscription. (issue #8210 , reported by caspy, and verified
by bradtem)
........
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@59364 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2007-03-29 17:44:45 +00:00
Tilghman Lesher
fdb5e1107d
Merged revisions 59289 via svnmerge from
...
https://origsvn.digium.com/svn/asterisk/branches/1.4
........
r59289 | tilghman | 2007-03-27 22:38:09 -0500 (Tue, 27 Mar 2007) | 2 lines
Another crash that I thought we had fixed already - Issue 9396
........
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@59290 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2007-03-28 03:40:19 +00:00
Joshua Colp
606b1414f6
Merged revisions 59087 via svnmerge from
...
https://origsvn.digium.com/svn/asterisk/branches/1.4
................
r59087 | file | 2007-03-21 14:04:58 -0400 (Wed, 21 Mar 2007) | 10 lines
Merged revisions 59086 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.2
........
r59086 | file | 2007-03-21 14:03:20 -0400 (Wed, 21 Mar 2007) | 2 lines
Indicate the filename changed when it is changed. (issue #9311 reported by jsmith)
........
................
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@59088 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2007-03-21 18:06:59 +00:00
Russell Bryant
5bea998a55
Merge changes from team/russell/sqlite:
...
* Add new module, cdr_sqlite3_custom which allows logging custom CDRs into a
SQLite3 database. (issue #7149 , alerios)
* Add new module, res_config_sqlite, which adds realtime database configuration
support for SQLite version 2. I decided that this was ok since we didn't have
any realtime support for version 3. If someone ports this to version 3, then
version 2 support can be removed or marked deprecated.
(issue #7790 , rbarun_proformatique)
* Mark cdr_sqlite as deprecated in favor of cdr_sqlite3_custom.
Also, note that there were other modules on the bug tracker that did not make
the cut because they provided some duplicated functionality. Those are:
* cdr_sqlite3 (issue #6754 , moy)
* cdr_sqlite3 (issue #8694 , bsd)
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@58866 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2007-03-13 21:22:33 +00:00
Tilghman Lesher
207c34f2d6
Merged revisions 58479 via svnmerge from
...
https://origsvn.digium.com/svn/asterisk/branches/1.4
........
r58479 | tilghman | 2007-03-08 15:33:03 -0600 (Thu, 08 Mar 2007) | 2 lines
Fix segfault (Issue 9236)
........
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@58480 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2007-03-08 21:34:40 +00:00
Joshua Colp
0fb8d82f18
Merged revisions 57770 via svnmerge from
...
https://origsvn.digium.com/svn/asterisk/branches/1.4
........
r57770 | file | 2007-03-04 22:35:03 -0500 (Sun, 04 Mar 2007) | 2 lines
Don't reference a potentially NULL pointer. (issue #9199 reported by klolik)
........
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@57771 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2007-03-05 03:39:32 +00:00
Olle Johansson
75d387acbc
Doxygen additions, corrections
...
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@56665 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2007-02-24 20:29:41 +00:00
Olle Johansson
bc01e39174
Creating new doxygen macro "\extref" to create page that lists
...
external libraries and URLs to these. Please help me add these
references.
We might want to create a similar macro "\linuxpackage" to list
the needed Linux packages in popular distributions.
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@56647 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2007-02-24 19:27:50 +00:00
Jason Parker
ae47fc4541
Merged revisions 55555 via svnmerge from
...
https://origsvn.digium.com/svn/asterisk/branches/1.4
........
r55555 | qwell | 2007-02-20 10:53:45 -0600 (Tue, 20 Feb 2007) | 4 lines
No need to cast nor free with strdupa (thanks file)
55555!
........
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@55556 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2007-02-20 16:56:58 +00:00
Joshua Colp
264733381a
I like it when trunk builds, so let's make res_jabber compile again!
...
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@55534 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2007-02-20 15:19:23 +00:00
Olle Johansson
36c46f0d81
Merged revisions 55483 via svnmerge from
...
https://origsvn.digium.com/svn/asterisk/branches/1.4
........
r55483 | oej | 2007-02-19 22:12:55 +0100 (Mon, 19 Feb 2007) | 3 lines
- Not sending arguments to an application is not "out of memory"
- Making error messages a bit more clear
........
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@55514 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2007-02-20 07:48:12 +00:00
Olle Johansson
4561b7a83b
Being picky...
...
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@55330 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2007-02-18 15:11:52 +00:00
Olle Johansson
7f0934b6f4
Simplify post_manager_event()
...
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@55323 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2007-02-18 15:01:07 +00:00
Joshua Colp
b8ab0abb83
Allow the user to specify where to enable the respective features for when a parked call is picked up. (ie: transfers and parking)
...
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@54910 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2007-02-16 18:08:34 +00:00
Russell Bryant
a8309d1a3c
Merged revisions 54888 via svnmerge from
...
https://origsvn.digium.com/svn/asterisk/branches/1.4
........
r54888 | russell | 2007-02-16 11:40:38 -0600 (Fri, 16 Feb 2007) | 3 lines
Clean up a few coding guidelines issues - spaces to tabs, use sizeof() to pass
the size of a static buffer, add spaces ...
........
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@54890 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2007-02-16 17:44:39 +00:00
Joshua Colp
ae6898cbe5
Add option to features.conf that enables parking via DTMF on picked up parked calls. (issue #9082 reported by francesco_r)
...
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@54889 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2007-02-16 17:41:27 +00:00
Olle Johansson
33915a153a
Issue #9068 - make sure we quote HTML characters correctly too (seanbright)
...
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@54774 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2007-02-16 11:47:48 +00:00
Olle Johansson
71c7f6e32f
Merged revisions 54772 via svnmerge from
...
https://origsvn.digium.com/svn/asterisk/branches/1.4
................
r54772 | oej | 2007-02-16 12:39:55 +0100 (Fri, 16 Feb 2007) | 10 lines
Merged revisions 54771 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.2
........
r54771 | oej | 2007-02-16 12:38:03 +0100 (Fri, 16 Feb 2007) | 2 lines
Issue #9069 - If we open with TH we should not close with /TD. (seanbright)
........
................
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@54773 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2007-02-16 11:43:41 +00:00
Russell Bryant
f60efe347a
This introduces a new dialplan function, DEVSTATE, which allows you to do some
...
pretty cool things.
First, you can get the device state of anything in the dialplan:
NoOp(SIP/mypeer has state ${DEVSTATE(SIP/mypeer)})
NoOp(The conference room 1234 has state ${DEVSTATE(MeetMe:1234)})
Most importantly, this allows you to create custom device states so you can
control phone lamps directly from the dialplan.
Set(DEVSTATE(Custom:mycustomlamp)=BUSY)
...
exten => mycustomlamp,hint,Custom:mycustomlamp
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@54261 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2007-02-13 22:02:20 +00:00
Kevin P. Fleming
e758ef09b3
Merged revisions 53779-53781 via svnmerge from
...
https://origsvn.digium.com/svn/asterisk/branches/1.4
........
r53779 | kpfleming | 2007-02-09 17:51:29 -0600 (Fri, 09 Feb 2007) | 2 lines
fix awk scripts to work when both MODULEINFO and MAKEOPTS are present in a source file
........
r53780 | kpfleming | 2007-02-09 17:51:41 -0600 (Fri, 09 Feb 2007) | 2 lines
add some inter-module dependencies
........
r53781 | kpfleming | 2007-02-09 17:52:44 -0600 (Fri, 09 Feb 2007) | 2 lines
another dependency
........
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@53782 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2007-02-09 23:53:51 +00:00
Joshua Colp
b3c0e124bd
I'm crazy so I think I'll change the musiconhold classes linked list to read/write as well!
...
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@53691 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2007-02-09 01:57:48 +00:00
Tilghman Lesher
c1e37165c1
Merged revisions 53294 via svnmerge from
...
https://origsvn.digium.com/svn/asterisk/branches/1.4
........
r53294 | tilghman | 2007-02-06 23:24:31 -0600 (Tue, 06 Feb 2007) | 2 lines
Text fix for jabber reload command (reported by bkruse via IRC)
........
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@53297 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2007-02-07 05:25:54 +00:00
Joshua Colp
c19b8803f3
Merged revisions 53088 via svnmerge from
...
https://origsvn.digium.com/svn/asterisk/branches/1.4
................
r53088 | file | 2007-02-01 15:11:28 -0600 (Thu, 01 Feb 2007) | 10 lines
Merged revisions 53084 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.2
........
r53084 | file | 2007-02-01 15:03:10 -0600 (Thu, 01 Feb 2007) | 2 lines
Return previous behavior of having MOH pick up where it was left off. (issue #8672 reported by sinistermidget)
........
................
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@53089 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2007-02-01 21:12:26 +00:00
Olle Johansson
38341590a3
Formatting changes
...
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@53054 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2007-02-01 00:38:43 +00:00
Paul Cadach
b2aa1a68e6
Merged revisions 52808 via svnmerge from
...
https://origsvn.digium.com/svn/asterisk/branches/1.4
........
r52808 | pcadach | 2007-01-30 00:34:26 -0800 (Втр, 30 Янв 2007) | 1 line
Don't play with free()'d pointers
........
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@52819 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2007-01-30 09:10:09 +00:00
Steve Murphy
80435b54a5
Merged revisions 51716 via svnmerge from
...
https://origsvn.digium.com/svn/asterisk/branches/1.4
........
r51716 | murf | 2007-01-23 13:32:54 -0700 (Tue, 23 Jan 2007) | 1 line
this mod from 8593 (dstchannel in cdr is empty when transfer call).
........
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@51717 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2007-01-23 20:36:08 +00:00
Joshua Colp
fa6d3941df
Merged revisions 51513 via svnmerge from
...
https://origsvn.digium.com/svn/asterisk/branches/1.4
................
r51513 | file | 2007-01-22 20:45:04 -0500 (Mon, 22 Jan 2007) | 10 lines
Merged revisions 51512 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.2
........
r51512 | file | 2007-01-22 20:41:35 -0500 (Mon, 22 Jan 2007) | 2 lines
Yield before reading from zaptel timing source under Solaris so that other threads get a chance to do things. (issue #7875 reported by bob)
........
................
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@51514 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2007-01-23 01:47:55 +00:00
Luigi Rizzo
dc31eaa025
include "asterisk/zapata.h" instead of looking
...
directly for the zaptel.h and tonezone.h
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@51292 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2007-01-19 16:16:19 +00:00
Joshua Colp
10e3cba61e
Add parkedcalltransfers option for res_features. This basically enables/disables DTMF based transfers. If you want to get former behavior you will have to make sure it is enabled.
...
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@51152 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2007-01-16 17:50:25 +00:00
Joshua Colp
0f456a07e3
Merged revisions 51148 via svnmerge from
...
https://origsvn.digium.com/svn/asterisk/branches/1.4
................
r51148 | file | 2007-01-16 12:39:50 -0500 (Tue, 16 Jan 2007) | 10 lines
Merged revisions 51145 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.2
........
r51145 | file | 2007-01-16 12:36:50 -0500 (Tue, 16 Jan 2007) | 2 lines
Return previous behavior. ParkedCalls will be able to do DTMF based transfers again. trunk however will get an option to allow this to be set on/off. (issue #8804 reported by nortex)
........
................
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@51149 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2007-01-16 17:42:47 +00:00
Joshua Colp
2a5df21d5f
Merged revisions 50674 via svnmerge from
...
https://origsvn.digium.com/svn/asterisk/branches/1.4
........
r50674 | file | 2007-01-12 22:04:55 -0500 (Fri, 12 Jan 2007) | 2 lines
Only join the snmp thread on an unload if the thread is actually running. (issue #8810 reported by junky)
........
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@50675 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2007-01-13 03:06:24 +00:00
Tilghman Lesher
c4c2c546da
When calling the Realtime app more than once, unset fields which were
...
previously set are erroneously still set (Bug 6701). After discussion,
it was determined this should only be changed in trunk.
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@49801 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2007-01-07 16:21:12 +00:00
Jason Parker
5abda34cd9
Merged revisions 49742 via svnmerge from
...
https://origsvn.digium.com/svn/asterisk/branches/1.4
........
r49742 | qwell | 2007-01-05 18:24:38 -0600 (Fri, 05 Jan 2007) | 7 lines
Save 1 whopping byte of allocated memory!
This looks like it may have been a chicken/egg scenario..
You had to call a cleanup func, because everything was allocated.
Then since you had to call a cleanup func, you were forced to allocate - ie; strdup("").
........
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@49743 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2007-01-06 00:28:16 +00:00
Kevin P. Fleming
87b9abc892
Merged revisions 49676 via svnmerge from
...
https://origsvn.digium.com/svn/asterisk/branches/1.4
........
r49676 | kpfleming | 2007-01-05 16:16:33 -0600 (Fri, 05 Jan 2007) | 2 lines
reduce stack consumption for AMI and AMI/HTTP requests by nearly 20K in most cases
........
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@49678 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2007-01-05 22:43:18 +00:00
Luigi Rizzo
09f75aa6dc
rename the structs struct tone_zone_sound and struct tone_zone
...
defined in indications.h to ind_tone_zone_sound and ind_tone_zone,
to avoid conflicts with the structs with the same names
defined in tonezone.h
Hope i haven't missed any instance.
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@48958 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2006-12-25 06:38:09 +00:00
Steve Murphy
7b338004bf
a quick fix to app_sms.c to get rid of cursed compiler warnings so I can compile under --enable-dev-mode
...
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@48767 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2006-12-21 19:44:20 +00:00
Joshua Colp
09de4d2b67
Update res_snmp to use new API declaration of pbx_builtin_serialize_variables (issue #8627 reported by johann8384)
...
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@48595 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2006-12-19 22:55:26 +00:00
Joshua Colp
3830f08dc5
OpenBSD does not have RLIMIT_AS or RLIMIT_VMEM so until someone finds the right rlimit to use then let's not support the -v option on OpenBSD. (issue #8543 reported by jtodd)
...
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@48591 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2006-12-19 21:59:33 +00:00
Kevin P. Fleming
518f25f65c
Merged revisions 48577 via svnmerge from
...
https://origsvn.digium.com/svn/asterisk/branches/1.4
........
r48577 | kpfleming | 2006-12-19 08:57:09 -0600 (Tue, 19 Dec 2006) | 2 lines
use the proper variable type for these unixODBC API calls, eliminating warnings on 64-bit platforms that use the 'new' 64-bit types for ODBC API calls
........
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@48578 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2006-12-19 14:57:45 +00:00
Luigi Rizzo
a61418e1df
prevent a compiler warning
...
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@48512 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2006-12-16 02:42:53 +00:00
Luigi Rizzo
4a0738a665
remove a duplicate include
...
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@48508 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2006-12-15 22:00:48 +00:00
Tilghman Lesher
d670858735
Merged revisions 48375 via svnmerge from
...
https://origsvn.digium.com/svn/asterisk/branches/1.4
................
r48375 | tilghman | 2006-12-10 18:47:21 -0600 (Sun, 10 Dec 2006) | 13 lines
Merged revisions 48374 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.2
........
r48374 | tilghman | 2006-12-10 18:33:59 -0600 (Sun, 10 Dec 2006) | 5 lines
When doing a fork() and exec(), two problems existed (Issue 8086):
1) Ignored signals stayed ignored after the exec().
2) Signals could possibly fire between the fork() and exec(), causing Asterisk
signal handlers within the child to execute, which caused nasty race conditions.
........
................
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@48376 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2006-12-11 00:52:19 +00:00
Russell Bryant
d24a78944d
Merged revisions 48357 via svnmerge from
...
https://origsvn.digium.com/svn/asterisk/branches/1.4
................
r48357 | russell | 2006-12-07 13:17:28 -0500 (Thu, 07 Dec 2006) | 11 lines
Merged revisions 48356 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.2
........
r48356 | russell | 2006-12-07 13:14:13 -0500 (Thu, 07 Dec 2006) | 3 lines
Ensure that the file position is not incremented beyond the total number of
files available for playback. (issue #8539 , ulogic)
........
................
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@48358 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2006-12-07 18:21:21 +00:00
Russell Bryant
af870057c1
Constify a bunch of usage strings for CLI commands.
...
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@48305 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2006-12-06 07:31:28 +00:00
Joshua Colp
d72171b6e4
Merged revisions 48155 via svnmerge from
...
https://origsvn.digium.com/svn/asterisk/branches/1.4
................
r48155 | file | 2006-11-30 14:05:14 -0500 (Thu, 30 Nov 2006) | 10 lines
Merged revisions 48154 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.2
........
r48154 | file | 2006-11-30 14:04:11 -0500 (Thu, 30 Nov 2006) | 2 lines
Do not listen for DTMF on the bridge that comes into existence when ParkedCall is executed. This means native bridging can now occur for this. (issue #8406 reported by kebl0155)
........
................
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@48156 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2006-11-30 19:06:22 +00:00
Tilghman Lesher
35b63c6b4c
Merged revisions 48049 via svnmerge from
...
https://origsvn.digium.com/svn/asterisk/branches/1.4
................
r48049 | tilghman | 2006-11-27 11:20:37 -0600 (Mon, 27 Nov 2006) | 10 lines
Merged revisions 48045 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.2
........
r48045 | tilghman | 2006-11-27 11:15:54 -0600 (Mon, 27 Nov 2006) | 2 lines
Random MOH wasn't really random (bug 8381)
........
................
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@48050 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2006-11-27 17:31:56 +00:00