aboutsummaryrefslogtreecommitdiffstats
path: root/configs
AgeCommit message (Collapse)AuthorFilesLines
2009-02-16Eliminate mention of a variable which is only available in trunk.tilghman1-6/+4
git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.0@176098 f38db490-d61c-443f-a65b-d21fe96a405b
2009-02-05Merged revisions 173776 via svnmerge from mmichelson1-1/+1
https://origsvn.digium.com/svn/asterisk/trunk ........ r173776 | mmichelson | 2009-02-05 17:48:48 -0600 (Thu, 05 Feb 2009) | 14 lines Update extensions.conf.sample to be correct. In trunk, the only necessary change pointed out was that the call to ChanIsAvail uses an option that has been removed. For the 1.6.1 branch, however, it appears that the sample file is badly in need of updating since there are |'s used all over the place there. My tentative plan is just to copy trunk's sample config file to those branches since the info there is most up-to-date and should be correct for use in 1.6.1 Thanks to macli in #asterisk-dev for bringing this up ........ git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.0@173777 f38db490-d61c-443f-a65b-d21fe96a405b
2009-02-03Merged revisions 173104 via svnmerge from tilghman1-1/+7
https://origsvn.digium.com/svn/asterisk/trunk ................ r173104 | tilghman | 2009-02-02 18:24:52 -0600 (Mon, 02 Feb 2009) | 12 lines Merged revisions 173070 via svnmerge from https://origsvn.digium.com/svn/asterisk/branches/1.4 ........ r173070 | tilghman | 2009-02-02 18:15:59 -0600 (Mon, 02 Feb 2009) | 5 lines Add warning to standard config, that globals may be overridden by other dialplan configuration files. (closes issue #14388) Reported by: macli ........ ................ git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.0@173111 f38db490-d61c-443f-a65b-d21fe96a405b
2009-02-02Merged revisions 172894 via svnmerge from lmadsen1-2/+2
https://origsvn.digium.com/svn/asterisk/trunk ........ r172894 | lmadsen | 2009-02-02 13:13:40 -0500 (Mon, 02 Feb 2009) | 7 lines Update the res_ldap.conf file with a better working example. (closes issue #13861) Reported by: scramatte Patches: __20080110-res_ldap.conf-2.patch uploaded by blitzrage (license 10) Tested by: jcovert ........ git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.0@172896 f38db490-d61c-443f-a65b-d21fe96a405b
2009-01-31Merged revisions 172581 via svnmerge from twilson1-2/+0
https://origsvn.digium.com/svn/asterisk/trunk ........ r172581 | twilson | 2009-01-30 15:50:03 -0600 (Fri, 30 Jan 2009) | 2 lines Remove incorret line from sample config ........ git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.0@172637 f38db490-d61c-443f-a65b-d21fe96a405b
2009-01-30Merged revisions 172580 via svnmerge from twilson1-0/+6
https://origsvn.digium.com/svn/asterisk/trunk ................ r172580 | twilson | 2009-01-30 15:29:12 -0600 (Fri, 30 Jan 2009) | 44 lines Merged revisions 172517 via svnmerge from https://origsvn.digium.com/svn/asterisk/branches/1.4 ........ r172517 | twilson | 2009-01-30 11:47:41 -0600 (Fri, 30 Jan 2009) | 37 lines Fix feature inheritance with builtin features When using builtin features like parking and transfers, the AST_FEATURE_* flags would not be set correctly for all instances when either performing a builtin attended transfer, or parking a call and getting the timeout callback. Also, there was no way on a per-call basis to specify what features someone should have on picking up a parked call (since that doesn't involve the Dial() command). There was a global option for setting whether or not all users who pickup a parked call should have AST_FEATURE_REDIRECT set, but nothing for DISCONNECT, AUTOMON, or PARKCALL. This patch: 1) adds the BRIDGE_FEATURES dialplan variable which can be set either in the dialplan or with setvar in channels that support it. This variable can be set to any combination of 't', 'k', 'w', and 'h' (case insensitive matching of the equivalent dial options), to set what features should be activated on this channel. The patch moves the setting of the features datastores into the bridging code instead of app_dial to help facilitate this. 2) adds global options parkedcallparking, parkedcallhangup, and parkedcallrecording to be similar to the parkedcalltransfers option for globally setting features. 3) has builtin_atxfer call builtin_parkcall if being transfered to the parking extension since tracking everything through multiple masquerades, etc. is difficult and error-prone 4) attempts to fix all cases of return calls from parking and completed builtin transfers not having the correct permissions (closes issue #14274) Reported by: aragon Patches: fix_feature_inheritence.diff.txt uploaded by otherwiseguy (license 396) Tested by: aragon, otherwiseguy Review http://reviewboard.digium.com/r/138/ ........ ................ git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.0@172635 f38db490-d61c-443f-a65b-d21fe96a405b
2009-01-29Merged revisions 172400 via svnmerge from rmudgett1-3/+5
https://origsvn.digium.com/svn/asterisk/trunk ........ r172400 | rmudgett | 2009-01-29 14:38:34 -0600 (Thu, 29 Jan 2009) | 12 lines channels/chan_dahdi.c * Added doxygen comments to the major dahdi structures. * Fixed PRI and SS7 using an incorrect string value if the extension delimiter is not present in the Dial() function. * Fixed SS7 not checking if the dialed extension is at least as long as the stripmsd option. * Fixed PRI not handling unknown TON/NPI prefix letters correctly. * Fixed some uninitialized string variables on FXS ports. configs/chan_dahdi.conf.sample * Updated some documentation. ........ git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.0@172434 f38db490-d61c-443f-a65b-d21fe96a405b
2009-01-29Merged revisions 172315 via svnmerge from tilghman1-12/+23
https://origsvn.digium.com/svn/asterisk/trunk ........ r172315 | tilghman | 2009-01-29 10:48:25 -0600 (Thu, 29 Jan 2009) | 2 lines Better document mode=multirow, based upon a conversation with Jared. ........ git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.0@172316 f38db490-d61c-443f-a65b-d21fe96a405b
2009-01-28Merged revisions 171838 via svnmerge from oej1-0/+19
https://origsvn.digium.com/svn/asterisk/trunk ................ r171838 | oej | 2009-01-28 14:11:44 +0100 (Ons, 28 Jan 2009) | 10 lines Merged revisions 171837 via svnmerge from https://origsvn.digium.com/svn/asterisk/branches/1.4 ........ r171837 | oej | 2009-01-28 14:07:27 +0100 (Ons, 28 Jan 2009) | 2 lines Add a better explanation of the difference between the device namespace and the dialplan for newbies. ........ ................ git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.0@171846 f38db490-d61c-443f-a65b-d21fe96a405b
2009-01-24Merged revisions 170837 via svnmerge from tilghman1-5/+0
https://origsvn.digium.com/svn/asterisk/trunk ................ r170837 | tilghman | 2009-01-24 07:55:53 -0600 (Sat, 24 Jan 2009) | 9 lines Merged revisions 170836 via svnmerge from https://origsvn.digium.com/svn/asterisk/branches/1.4 ........ r170836 | tilghman | 2009-01-24 07:55:02 -0600 (Sat, 24 Jan 2009) | 2 lines Remove superfluous implementation note (closes issue #14319) ........ ................ git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.0@170838 f38db490-d61c-443f-a65b-d21fe96a405b
2009-01-23Merged revisions 170720 via svnmerge from mmichelson1-0/+5
https://origsvn.digium.com/svn/asterisk/trunk ................ r170720 | mmichelson | 2009-01-23 14:56:07 -0600 (Fri, 23 Jan 2009) | 16 lines Merged revisions 170719 via svnmerge from https://origsvn.digium.com/svn/asterisk/branches/1.4 ........ r170719 | mmichelson | 2009-01-23 14:55:26 -0600 (Fri, 23 Jan 2009) | 8 lines Add notes to the idlecheck explanation in res_odbc.conf.sample (closes issue #14319) Reported by: klaus3000 Patches: patch_idlecheck_res_odbc.conf.sample.txt uploaded by klaus3000 (license 65) ........ ................ git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.0@170721 f38db490-d61c-443f-a65b-d21fe96a405b
2009-01-15Merged revisions 168722 via svnmerge from oej1-0/+1
https://origsvn.digium.com/svn/asterisk/trunk ................ r168722 | oej | 2009-01-15 19:47:14 +0100 (Tor, 15 Jan 2009) | 10 lines Merged revisions 168721 via svnmerge from https://origsvn.digium.com/svn/asterisk/branches/1.4 ........ r168721 | oej | 2009-01-15 19:43:43 +0100 (Tor, 15 Jan 2009) | 2 lines Meetme actually has realtime but wasn't documented ........ ................ git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.0@168723 f38db490-d61c-443f-a65b-d21fe96a405b
2009-01-15Merged revisions 168711 via svnmerge from oej1-3/+7
https://origsvn.digium.com/svn/asterisk/trunk ........ r168711 | oej | 2009-01-15 18:55:53 +0100 (Tor, 15 Jan 2009) | 4 lines Clarify some misunderstandings and make it even more clear that you can refer to a peer in the register= line. ........ git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.0@168717 f38db490-d61c-443f-a65b-d21fe96a405b
2009-01-12Merged revisions 168481 via svnmerge from russell1-1/+1
https://origsvn.digium.com/svn/asterisk/trunk ................ r168481 | russell | 2009-01-12 08:57:49 -0600 (Mon, 12 Jan 2009) | 10 lines Merged revisions 168480 via svnmerge from https://origsvn.digium.com/svn/asterisk/branches/1.4 ........ r168480 | russell | 2009-01-12 08:57:27 -0600 (Mon, 12 Jan 2009) | 2 lines s/ringdance/ringcadence/ for Bulgaria ........ ................ git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.0@168483 f38db490-d61c-443f-a65b-d21fe96a405b
2009-01-07Merged revisions 167477 via svnmerge from lmadsen1-2/+2
https://origsvn.digium.com/svn/asterisk/trunk ........ r167477 | lmadsen | 2009-01-07 13:18:45 -0500 (Wed, 07 Jan 2009) | 8 lines Update queues.conf.sample documentation. Update the queues.conf.sample documentation to mention that you need to preload chan_local.so as well if you plan on using Local channels for queue members, and you're preloading pbx_config.so. (closes issue #14179) Reported by: CrashHD Tested by: CrashHD ........ git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.0@167485 f38db490-d61c-443f-a65b-d21fe96a405b
2008-12-02Merged revisions 152216,152287,152369,152467,152569,152605 via svnmerge from tilghman1-6/+6
https://origsvn.digium.com/svn/asterisk/trunk ................ r152216 | tilghman | 2008-10-27 16:34:04 -0500 (Mon, 27 Oct 2008) | 13 lines Merged revisions 152215 via svnmerge from https://origsvn.digium.com/svn/asterisk/branches/1.4 ........ r152215 | tilghman | 2008-10-27 16:32:00 -0500 (Mon, 27 Oct 2008) | 6 lines Inherit ALL elements of CallerID across a local channel. (closes issue #13368) Reported by: Peter Schlaile Patches: 20080826__bug13368.diff.txt uploaded by Corydon76 (license 14) ........ ................ r152287 | jpeeler | 2008-10-27 18:31:39 -0500 (Mon, 27 Oct 2008) | 10 lines Merged revisions 152286 via svnmerge from https://origsvn.digium.com/svn/asterisk/branches/1.4 ........ r152286 | jpeeler | 2008-10-27 18:28:49 -0500 (Mon, 27 Oct 2008) | 2 lines Buffer policy setting for half is not needed. ........ ................ r152369 | tilghman | 2008-10-28 12:07:39 -0500 (Tue, 28 Oct 2008) | 15 lines Merged revisions 152368 via svnmerge from https://origsvn.digium.com/svn/asterisk/branches/1.4 ........ r152368 | tilghman | 2008-10-28 12:04:56 -0500 (Tue, 28 Oct 2008) | 8 lines Reset all DIAL variables back to blank, in case Dial is called multiple times per call (which could otherwise lead to inconsistent status reports). (closes issue #13216) Reported by: ruddy Patches: 20081014__bug13216.diff.txt uploaded by Corydon76 (license 14) Tested by: ruddy ........ ................ r152467 | tilghman | 2008-10-28 17:33:40 -0500 (Tue, 28 Oct 2008) | 10 lines Merged revisions 152463 via svnmerge from https://origsvn.digium.com/svn/asterisk/branches/1.4 ........ r152463 | tilghman | 2008-10-28 17:32:34 -0500 (Tue, 28 Oct 2008) | 3 lines Quoting in the wrong direction (Fixes AST-107) ........ ................ r152569 | russell | 2008-10-29 00:34:26 -0500 (Wed, 29 Oct 2008) | 15 lines Merged revisions 152539 via svnmerge from https://origsvn.digium.com/svn/asterisk/branches/1.4 ........ r152539 | russell | 2008-10-29 00:23:51 -0500 (Wed, 29 Oct 2008) | 7 lines Fix an incorrect usage of sizeof() (closes issue #13795) Reported by: andrew53 Patches: chan_sip_sizeof.patch uploaded by andrew53 (license 519) ........ ................ r152605 | murf | 2008-10-29 00:47:13 -0500 (Wed, 29 Oct 2008) | 22 lines Merged revisions 152538 via svnmerge from https://origsvn.digium.com/svn/asterisk/branches/1.4 ........ r152538 | murf | 2008-10-28 23:19:04 -0600 (Tue, 28 Oct 2008) | 14 lines A little documentation cross-ref between features and dial and queue... I wasted some time (stupidly) trying to get the one-touch parking stuff working, because it didn't occur to me that I had to also have the corresponding options in the dial command! Duh! (In all this time, I never set this up before!) So, to keep some poor fool from suffering the same fate, I made the features.conf.sample file mention the corresponding opts in dial/queue; and the docs for dial/app specifically mention the corresponding decls in the feature.conf file. I hope this doesn't spoil some vast, eternal plan... ........ ................ git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.0@160388 f38db490-d61c-443f-a65b-d21fe96a405b
2008-11-07Merged revisions 155360 via svnmerge from mmichelson1-1/+0
https://origsvn.digium.com/svn/asterisk/trunk ........ r155360 | mmichelson | 2008-11-07 15:14:49 -0600 (Fri, 07 Nov 2008) | 8 lines Remove one more instance of the sample configuration lying about what's possible. The tz cannot be set in a context like this. It can only be set in the general section or per-mailbox. Thanks to sasargen on #asterisk-dev for pointing this out ........ git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.0@155361 f38db490-d61c-443f-a65b-d21fe96a405b
2008-11-06Merged revisions 155012 via svnmerge from mmichelson1-2/+0
https://origsvn.digium.com/svn/asterisk/trunk ................ r155012 | mmichelson | 2008-11-06 13:46:53 -0600 (Thu, 06 Nov 2008) | 16 lines Merged revisions 155011 via svnmerge from https://origsvn.digium.com/svn/asterisk/branches/1.4 ........ r155011 | mmichelson | 2008-11-06 13:45:52 -0600 (Thu, 06 Nov 2008) | 8 lines The documentation listed the ability to set 'maxmsg' per context. The truth is that you can only set this in the general section or per mailbox. Thus I am updating the sample config file to be more accurate. Thanks to sasargen on IRC for bringing up this issue. ........ ................ git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.0@155013 f38db490-d61c-443f-a65b-d21fe96a405b
2008-10-30Merged revisions 152765 via svnmerge from tilghman1-41/+44
https://origsvn.digium.com/svn/asterisk/trunk ........ r152765 | tilghman | 2008-10-29 23:26:34 -0500 (Wed, 29 Oct 2008) | 5 lines Set up an example stdexten that preserves the original context and extension in the CDR. (Related to issue #13799) Reported by: davidw ........ git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.0@152772 f38db490-d61c-443f-a65b-d21fe96a405b
2008-10-15Merged revisions 149756 via svnmerge from bweschke1-1/+1
https://origsvn.digium.com/svn/asterisk/trunk ................ r149756 | bweschke | 2008-10-15 16:14:20 -0400 (Wed, 15 Oct 2008) | 10 lines Merged revisions 149683 via svnmerge from https://origsvn.digium.com/svn/asterisk/branches/1.4 ........ r149683 | bweschke | 2008-10-15 14:28:54 -0400 (Wed, 15 Oct 2008) | 4 lines An update to the documentation/example of agents.conf.sample with the correct parameter for this feature as defined in chan_agent.c (closes issue #13709) ........ ................ git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.0@149757 f38db490-d61c-443f-a65b-d21fe96a405b
2008-10-09Merged revisions 148120 via svnmerge from tilghman1-0/+3
https://origsvn.digium.com/svn/asterisk/trunk ........ r148120 | tilghman | 2008-10-09 18:25:53 -0500 (Thu, 09 Oct 2008) | 6 lines Fix example schema (closes issue #12860) Reported by: flyn Patches: res_ldap.conf.patch uploaded by flyn (license 503) ........ git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.0@148124 f38db490-d61c-443f-a65b-d21fe96a405b
2008-10-09Merged revisions 147896 via svnmerge from tilghman1-22/+29
https://origsvn.digium.com/svn/asterisk/trunk ........ r147896 | tilghman | 2008-10-09 12:46:15 -0500 (Thu, 09 Oct 2008) | 4 lines Remove "second form" of extensions, as it no longer applies. Also, cleanup the grammar, formatting, and introduce several clarifications to the text. (Closes issue #13654) ........ git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.0@147897 f38db490-d61c-443f-a65b-d21fe96a405b
2008-10-08Remove the sample configuration for configuration sections in chan_dahdi.conf.russell1-53/+0
This code was not merged into 1.6.0. Reported by: angler (closes AST-119) git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.0@147458 f38db490-d61c-443f-a65b-d21fe96a405b
2008-09-26Merged revisions 144829 via svnmerge from file1-1/+2
https://origsvn.digium.com/svn/asterisk/trunk ........ r144829 | file | 2008-09-26 20:12:13 -0300 (Fri, 26 Sep 2008) | 2 lines Update documentation to include default setting. This is for you jtodd! ........ git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.0@144831 f38db490-d61c-443f-a65b-d21fe96a405b
2008-09-25Merged revisions 144523 via svnmerge from murf1-9/+0
https://origsvn.digium.com/svn/asterisk/trunk ........ r144523 | murf | 2008-09-25 15:18:12 -0600 (Thu, 25 Sep 2008) | 13 lines I added a little verbage to hashtab for the hashtab_destroy func. It was pretty sparsely documented. This update fleshes out the pbx_lua module, to add the switch statements to the extensions in the extensions.lua file, as well as removing them when the module is unloaded. Many thanks to Matt Nicholson for his fine contribution! ........ git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.0@144524 f38db490-d61c-443f-a65b-d21fe96a405b
2008-09-12Merged revisions 142866 via svnmerge from tilghman1-0/+14
https://origsvn.digium.com/svn/asterisk/trunk ................ r142866 | tilghman | 2008-09-12 15:49:46 -0500 (Fri, 12 Sep 2008) | 18 lines Merged revisions 142865 via svnmerge from https://origsvn.digium.com/svn/asterisk/branches/1.4 ........ r142865 | tilghman | 2008-09-12 15:37:18 -0500 (Fri, 12 Sep 2008) | 11 lines Create rules for disallowing contacts at certain addresses, which may improve the security of various installations. As this does not change any default behavior, it is not classified as a direct security fix for anything within Asterisk, but may help PBX admins better secure their SIP servers. (closes issue #11776) Reported by: ibc Patches: 20080829__bug11776.diff.txt uploaded by Corydon76 (license 14) Tested by: Corydon76, blitzrage ........ ................ git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.0@142867 f38db490-d61c-443f-a65b-d21fe96a405b
2008-09-09Merged revisions 142280 via svnmerge from phsultan1-2/+4
https://origsvn.digium.com/svn/asterisk/trunk ........ r142280 | phsultan | 2008-09-10 00:08:56 +0200 (Wed, 10 Sep 2008) | 6 lines Disable autoprune by default. (closes issue #13411) Reported by: caio1982 Patches: res_jabber_autoprune1.diff uploaded by caio1982 (license 22) Tested by: caio1982 ........ git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.0@142281 f38db490-d61c-443f-a65b-d21fe96a405b
2008-08-16Merged revisions 138442 via svnmerge from seanbright1-1/+0
https://origsvn.digium.com/svn/asterisk/trunk ........ r138442 | seanbright | 2008-08-16 12:40:43 -0400 (Sat, 16 Aug 2008) | 4 lines Since it's introduction in revision 3497, cdr_tds has *never* read the port configuration option from cdr_tds.conf. So go ahead and remove it from the sample config. ........ git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.0@138443 f38db490-d61c-443f-a65b-d21fe96a405b
2008-08-15Merged revisions 138260 via svnmerge from tilghman1-1/+3
https://origsvn.digium.com/svn/asterisk/trunk ................ r138260 | tilghman | 2008-08-15 17:54:57 -0500 (Fri, 15 Aug 2008) | 16 lines Merged revisions 138258 via svnmerge from https://origsvn.digium.com/svn/asterisk/branches/1.4 ........ r138258 | tilghman | 2008-08-15 17:33:42 -0500 (Fri, 15 Aug 2008) | 8 lines More fixes for realtime peers. (closes issue #12921) Reported by: Nuitari Patches: 20080804__bug12921.diff.txt uploaded by Corydon76 (license 14) 20080815__bug12921.diff.txt uploaded by Corydon76 (license 14) Tested by: Corydon76 ........ ................ git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.0@138262 f38db490-d61c-443f-a65b-d21fe96a405b
2008-08-15Merged revisions 138206 via svnmerge from tilghman1-11/+10
https://origsvn.digium.com/svn/asterisk/trunk ........ r138206 | tilghman | 2008-08-15 15:35:24 -0500 (Fri, 15 Aug 2008) | 4 lines Remove deprecated syntax from sample config file (closes issue #13314) Reported by: kue ........ git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.0@138207 f38db490-d61c-443f-a65b-d21fe96a405b
2008-08-14Merged revisions 137732 via svnmerge from russell1-442/+425
https://origsvn.digium.com/svn/asterisk/trunk ................ r137732 | russell | 2008-08-14 09:15:50 -0500 (Thu, 14 Aug 2008) | 12 lines Merged revisions 137731 via svnmerge from https://origsvn.digium.com/svn/asterisk/branches/1.4 ........ r137731 | russell | 2008-08-14 09:05:23 -0500 (Thu, 14 Aug 2008) | 4 lines Comments in this config file were aligned only if your tab size was set to 8. So, convert tabs to spaces so that things should be aligned regardless of what tab size you use in your editor. ........ ................ git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.0@137783 f38db490-d61c-443f-a65b-d21fe96a405b
2008-08-07Merged revisions 136594 via svnmerge from rmudgett1-4/+13
https://origsvn.digium.com/svn/asterisk/trunk ................ r136594 | rmudgett | 2008-08-07 14:01:03 -0500 (Thu, 07 Aug 2008) | 13 lines Merged revisions 136241 via svnmerge from https://origsvn.digium.com/svn/asterisk/branches/1.4 ........ r136241 | rmudgett | 2008-08-06 16:18:53 -0500 (Wed, 06 Aug 2008) | 5 lines * The allowed_bearers setting in misdn.conf misspelled one of its options: digital_restricted. * Fixed some other spelling errors and typos. ........ ................ git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.0@136598 f38db490-d61c-443f-a65b-d21fe96a405b
2008-08-04Merged revisions 135537 via svnmerge from russell1-1/+1
https://origsvn.digium.com/svn/asterisk/trunk ................ r135537 | russell | 2008-08-04 15:15:27 -0500 (Mon, 04 Aug 2008) | 10 lines Merged revisions 135536 via svnmerge from https://origsvn.digium.com/svn/asterisk/branches/1.4 ........ r135536 | russell | 2008-08-04 15:15:03 -0500 (Mon, 04 Aug 2008) | 2 lines fix a config sample typo ........ ................ git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.0@135538 f38db490-d61c-443f-a65b-d21fe96a405b
2008-08-04Merged revisions 135474 via svnmerge from russell1-1/+4
https://origsvn.digium.com/svn/asterisk/trunk ................ r135474 | russell | 2008-08-04 11:28:07 -0500 (Mon, 04 Aug 2008) | 10 lines Merged revisions 135473 via svnmerge from https://origsvn.digium.com/svn/asterisk/branches/1.4 ........ r135473 | russell | 2008-08-04 11:26:17 -0500 (Mon, 04 Aug 2008) | 2 lines Add a minor clarification to the documentation of mohinterpret and mohsuggest ........ ................ git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.0@135475 f38db490-d61c-443f-a65b-d21fe96a405b
2008-08-01Merged revisions 135126 via svnmerge from tilghman1-1/+1
https://origsvn.digium.com/svn/asterisk/trunk ........ r135126 | tilghman | 2008-08-01 11:39:51 -0500 (Fri, 01 Aug 2008) | 9 lines SIP should use the transport type set in the Moved Temporarily for the next invite. (closes issue #11843) Reported by: pestermann Patches: 20080723__issue11843_302_ignores_transport_16branch.diff uploaded by bbryant (license 36) 20080723__issue11843_302_ignores_transport_trunk.diff uploaded by bbryant (license 36) Tested by: pabelanger ........ git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.0@135127 f38db490-d61c-443f-a65b-d21fe96a405b
2008-08-01Merged revisions 135067-135068 via svnmerge from mmichelson1-0/+5
https://origsvn.digium.com/svn/asterisk/trunk ........ r135067 | mmichelson | 2008-08-01 09:29:48 -0500 (Fri, 01 Aug 2008) | 13 lines IMAP storage functioned under the assumption that folders such as "Work" and "Family" would be subfolders of the INBOX. This is an invalid assumption to make, but it could be desirable to set up folders in this manner, so a new option for voicemail.conf, "imapparentfolder" has been added to allow for this. (closes issue #13142) Reported by: jaroth Patches: parentfolder.patch uploaded by jaroth (license 50) ........ r135068 | mmichelson | 2008-08-01 09:42:24 -0500 (Fri, 01 Aug 2008) | 3 lines IMAP-specific items must go in IMAP_STORAGE defines... ........ git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.0@135070 f38db490-d61c-443f-a65b-d21fe96a405b
2008-07-28Merged revisions 134086 via svnmerge from kpfleming1-7/+6
https://origsvn.digium.com/svn/asterisk/trunk ........ r134086 | kpfleming | 2008-07-28 11:42:00 -0500 (Mon, 28 Jul 2008) | 3 lines remove remaining Zaptel references in various places ........ git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.0@134087 f38db490-d61c-443f-a65b-d21fe96a405b
2008-07-22Merged revisions 132778 via svnmerge from tilghman1-0/+10
https://origsvn.digium.com/svn/asterisk/trunk ................ r132778 | tilghman | 2008-07-22 16:53:40 -0500 (Tue, 22 Jul 2008) | 18 lines Merged revisions 132713 via svnmerge from https://origsvn.digium.com/svn/asterisk/branches/1.4 ................ r132713 | tilghman | 2008-07-22 16:19:39 -0500 (Tue, 22 Jul 2008) | 10 lines Merged revisions 132711 via svnmerge from https://origsvn.digium.com/svn/asterisk/branches/1.2 ........ r132711 | tilghman | 2008-07-22 16:14:10 -0500 (Tue, 22 Jul 2008) | 2 lines Fixes for AST-2008-010 and AST-2008-011 ........ ................ ................ git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.0@132780 f38db490-d61c-443f-a65b-d21fe96a405b
2008-07-22Merged revisions 132643 via svnmerge from kpfleming1-1/+1
https://origsvn.digium.com/svn/asterisk/trunk ................ r132643 | kpfleming | 2008-07-22 14:59:10 -0500 (Tue, 22 Jul 2008) | 10 lines Merged revisions 132641 via svnmerge from https://origsvn.digium.com/svn/asterisk/branches/1.4 ........ r132641 | kpfleming | 2008-07-22 14:49:11 -0500 (Tue, 22 Jul 2008) | 2 lines use renamed libpri API call for controlling this feature (was improperly named before) ........ ................ git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.0@132644 f38db490-d61c-443f-a65b-d21fe96a405b
2008-07-21Merged revisions 132514 via svnmerge from bbryant4-1/+17
https://origsvn.digium.com/svn/asterisk/trunk ........ r132514 | bbryant | 2008-07-21 16:12:51 -0500 (Mon, 21 Jul 2008) | 8 lines Update configuration files to add missing options for jingle, gtalk, manager.conf, and features.conf. (closes issue #13128) Reported by: caio1982 Patches: missing_options1.diff uploaded by caio1982 (license 22) ........ git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.0@132515 f38db490-d61c-443f-a65b-d21fe96a405b
2008-07-11Merged revisions 130040 via svnmerge from kpfleming1-0/+4
https://origsvn.digium.com/svn/asterisk/trunk ................ r130040 | kpfleming | 2008-07-11 10:57:17 -0500 (Fri, 11 Jul 2008) | 12 lines Merged revisions 130039 via svnmerge from https://origsvn.digium.com/svn/asterisk/branches/1.4 ........ r130039 | kpfleming | 2008-07-11 10:41:56 -0500 (Fri, 11 Jul 2008) | 4 lines add support for a configuration parameter for 'inband audio during RELEASE', which is currently mandatory in libpri-1.4.4 but will become configurable in libpri-1.4.5 later today (related to issue #13042) ........ ................ git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.0@130041 f38db490-d61c-443f-a65b-d21fe96a405b
2008-07-07Merged revisions 128599 via svnmerge from mmichelson1-1/+1
https://origsvn.digium.com/svn/asterisk/trunk ........ r128599 | mmichelson | 2008-07-07 09:35:27 -0500 (Mon, 07 Jul 2008) | 6 lines Update a few instances of "extensions reload" to "dialplan reload" in the documentation. Patch provided by caio1982 (license 22) ........ git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.0@128601 f38db490-d61c-443f-a65b-d21fe96a405b
2008-07-06Merged revisions 128524 via svnmerge from oej1-1/+2
https://origsvn.digium.com/svn/asterisk/trunk ........ r128524 | oej | 2008-07-06 22:11:37 +0200 (Sön, 06 Jul 2008) | 5 lines - Fixing issues with "sip show settings" - Adding IP address for TCP and/or TLS too if auto-domain is enabled and binding to a different IP address - Fixing documentation in sip.conf.sample ........ git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.0@128539 f38db490-d61c-443f-a65b-d21fe96a405b
2008-07-05Merged revisions 128237 via svnmerge from oej1-3/+4
https://origsvn.digium.com/svn/asterisk/trunk ........ r128237 | oej | 2008-07-05 22:39:54 +0200 (Lör, 05 Jul 2008) | 2 lines Make TCP disabled by default (it's considered experimental) ........ git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.0@128239 f38db490-d61c-443f-a65b-d21fe96a405b
2008-07-05Merged revisions 128236 via svnmerge from oej1-2/+15
https://origsvn.digium.com/svn/asterisk/trunk ........ r128236 | oej | 2008-07-05 22:37:53 +0200 (Lör, 05 Jul 2008) | 2 lines Reformatting the config sample ........ git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.0@128238 f38db490-d61c-443f-a65b-d21fe96a405b
2008-07-05Merged revisions 128122 via svnmerge from mattf1-0/+11
https://origsvn.digium.com/svn/asterisk/trunk ........ r128122 | mattf | 2008-07-04 22:26:42 -0500 (Fri, 04 Jul 2008) | 1 line Add option to wait to be able to explicitly send ACM via the Proceeding() application in the dialplan. Also minor documentation update explaining how to setup multiple signalling links within a linkset ........ git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.0@128124 f38db490-d61c-443f-a65b-d21fe96a405b
2008-07-01Merged revisions 127154 via svnmerge from bbryant1-0/+3
https://origsvn.digium.com/svn/asterisk/trunk ........ r127154 | bbryant | 2008-07-01 16:03:52 -0500 (Tue, 01 Jul 2008) | 2 lines Add a configuration option so the global outboundproxy can use tcptls without it being defined by each sip user. ........ git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.0@127163 f38db490-d61c-443f-a65b-d21fe96a405b
2008-07-01Merged revisions 126845 via svnmerge from oej1-4/+3
https://origsvn.digium.com/svn/asterisk/trunk ................ r126845 | oej | 2008-07-01 14:54:57 +0200 (Tis, 01 Jul 2008) | 14 lines Merged revisions 126844 via svnmerge from https://origsvn.digium.com/svn/asterisk/branches/1.4 ........ r126844 | oej | 2008-07-01 14:53:01 +0200 (Tis, 01 Jul 2008) | 5 lines Clear up documentation on "domain=" setting in sip.conf Reported by: davidw (closes issue #12413) ........ ................ git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.0@126847 f38db490-d61c-443f-a65b-d21fe96a405b
2008-06-30Merged revisions 126675 via svnmerge from jpeeler1-4/+68
https://origsvn.digium.com/svn/asterisk/trunk ........ r126675 | jpeeler | 2008-06-30 17:34:08 -0500 (Mon, 30 Jun 2008) | 1 line rename zapata.conf.sample to chan_dahdi.conf.sample ........ git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.0@126676 f38db490-d61c-443f-a65b-d21fe96a405b
2008-06-27Merged revisions 125891 via svnmerge from bbryant1-0/+7
https://origsvn.digium.com/svn/asterisk/trunk ........ r125891 | bbryant | 2008-06-27 11:28:06 -0500 (Fri, 27 Jun 2008) | 6 lines Change the way that the transport option works for sip users. transport will now take multiple arguments, the first one listed will be the one used for new dialogs, and the rest listed will be acceptable ways for that peer to contact us. This fixes a minor bug where, because SIP TCP/UDP run on the same port, could cause a TCP peer to be saved in the ast_db. There will also be warnings when a transport is changed for an unexpected reason. (issue #12799) ........ git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.0@125892 f38db490-d61c-443f-a65b-d21fe96a405b