Russell Bryant f11d0b3d54 Merged revisions 55006 via svnmerge from ...

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

................
r55006 | russell | 2007-02-16 16:49:42 -0600 (Fri, 16 Feb 2007) | 17 lines

Merged revisions 55005 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/branches/1.2

........
r55005 | russell | 2007-02-16 16:48:22 -0600 (Fri, 16 Feb 2007) | 9 lines

Revert the change I did in revisions 54955, 54969, and 54970, in 1.2, 1.4, 
and trunk.  I decided that once a conference is created from meetme.conf,
it is acceptable behavior that the pin can not be changed until the
conference goes away.  I also added a note in meetme.conf to describe this
behavior.

We still have another issue in 1.4 and trunk where some conferences with no
users don't go away.  That is the real bug that needs to be addressed here.

........

................


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

2007-02-16 22:50:22 +00:00

..

adsi.conf.sample

remove extraneous svn:executable properties

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

adtranvofr.conf.sample

remove extraneous svn:executable properties

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

agents.conf.sample

add the ability to turn off the feature that allows agents to end calls

2006-04-15 22:32:23 +00:00

alarmreceiver.conf.sample

remove extraneous svn:executable properties

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

alsa.conf.sample

Merged revisions 42716 via svnmerge from

2006-09-11 16:41:49 +00:00

amd.conf.sample

Changing syntax once again slightly and standardizing

2006-02-20 18:30:49 +00:00

asterisk.adsi

remove extraneous svn:executable properties

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

cdr_custom.conf.sample

remove extraneous svn:executable properties

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

cdr_manager.conf.sample

remove extraneous svn:executable properties

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

cdr_odbc.conf.sample

remove extraneous svn:executable properties

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

cdr_pgsql.conf.sample

remove extraneous svn:executable properties

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

cdr_tds.conf.sample

allows the table field to be configurable for

2006-03-08 22:12:20 +00:00

cdr.conf.sample

Merged revisions 42716 via svnmerge from

2006-09-11 16:41:49 +00:00

codecs.conf.sample

remove extraneous svn:executable properties

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

dnsmgr.conf.sample

remove extraneous svn:executable properties

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

dundi.conf.sample

Merged revisions 42716 via svnmerge from

2006-09-11 16:41:49 +00:00

enum.conf.sample

Merged revisions 42716 via svnmerge from

2006-09-11 16:41:49 +00:00

extconfig.conf.sample

Issue #7443 - amdtech - Optionally SIP registrations in another

2007-02-15 12:10:55 +00:00

extensions.ael.sample

Merged revisions 43739 via svnmerge from

2006-09-27 02:46:50 +00:00

extensions.conf.sample

Merged revisions 48186 via svnmerge from

2006-12-01 20:26:44 +00:00

features.conf.sample

Allow the user to specify where to enable the respective features for when a parked call is picked up. (ie: transfers and parking)

2007-02-16 18:08:34 +00:00

festival.conf.sample

remove extraneous svn:executable properties

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

followme.conf.sample

remove some extraneous 'followme' in prompt names

2006-08-07 18:47:33 +00:00

func_odbc.conf.sample

Integrate functionality tested on svncommunity users back into trunk

2006-12-28 20:13:00 +00:00

gtalk.conf.sample

seperate jingle and gtalk so it will be easier to track

2006-09-18 16:36:14 +00:00

h323.conf.sample

Handle HOLD/RETRIEVE notifications

2006-09-28 10:41:38 +00:00

http.conf.sample

Use spaces as a separator for the redirect option to improve readability

2006-12-24 21:01:02 +00:00

iax.conf.sample

Add SRV Lookup support on outbound calls to chan_iax2. It's listed in the RFC so we might want to support it and please don't hurt me Marko ... (issue #7812 reported by drorlb)

2007-01-23 03:15:04 +00:00

iaxprov.conf.sample

improve IP TOS support for SIP and IAX2 (issue #6355, code from jcollie plus modifications)

2006-03-28 03:28:52 +00:00

indications.conf.sample

Merged revisions 43159 via svnmerge from

2006-09-18 15:07:59 +00:00

jabber.conf.sample

solves some bugs with memory allocation, and adds

2006-06-07 22:43:20 +00:00

jingle.conf.sample

asterisk-xmpp merge in

2006-05-22 21:12:30 +00:00

logger.conf.sample

Add option to logger to rename log files with timestamp (issue #8020 reported by jmls)

2006-10-02 17:54:21 +00:00

manager.conf.sample

- Generalize the function ssl_setup() so that the certificate info

2006-12-07 16:42:29 +00:00

meetme.conf.sample

Merged revisions 55006 via svnmerge from

2007-02-16 22:50:22 +00:00

mgcp.conf.sample

Merged revisions 42716 via svnmerge from

2006-09-11 16:41:49 +00:00

misdn.conf.sample

Merged revisions 49313 via svnmerge from

2007-01-03 11:15:02 +00:00

modem.conf.sample

remove extraneous svn:executable properties

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

modules.conf.sample

remove documentation of 'global' section in modules.conf, since it is no longer needed or supported

2006-08-25 14:14:27 +00:00

musiconhold.conf.sample

Merged revisions 47279 via svnmerge from

2006-11-07 18:56:56 +00:00

muted.conf.sample

I've been meaning to add some explanation about muted... here it is

2006-10-04 17:10:53 +00:00

osp.conf.sample

Fix a couple of typos in the sample osp.conf.

2007-01-16 01:20:06 +00:00

oss.conf.sample

Merged revisions 42716 via svnmerge from

2006-09-11 16:41:49 +00:00

phone.conf.sample

Add support for G729 passthrough with Sigma Designs boards. (issue #8829 reported by ywalther)

2007-01-16 17:23:31 +00:00

privacy.conf.sample

remove extraneous svn:executable properties

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

queues.conf.sample

Add 'loose' option to joinempty and leavewhenempty which is almost exactly like 'strict' except it does not count paused queue members as unavailable. (issue #8263 reported by gnarf)

2006-11-13 18:23:55 +00:00

res_odbc.conf.sample

Feature: allow the sanity SQL to be customized per connection class (Issue 6453)

2006-11-13 05:58:14 +00:00

res_snmp.conf.sample

Add SNMP support (bug #6439)

2006-02-26 20:46:11 +00:00

rpt.conf.sample

Added docs for new features (duplex mode & tailmessages)

2005-12-20 23:53:26 +00:00

rtp.conf.sample

Issue #2863 - Improved RTCP support (John Martin, Fredrik Olsson)

2006-06-05 08:39:42 +00:00

say.conf.sample

Merged revisions 51350 via svnmerge from

2007-01-20 06:54:45 +00:00

sip_notify.conf.sample

Merged revisions 45439 via svnmerge from

2006-10-18 02:19:55 +00:00

sip.conf.sample

Make documentation match the source code.

2007-02-14 17:02:16 +00:00

skinny.conf.sample

Add documentation on rtp packetization.

2006-09-20 17:39:59 +00:00

sla.conf.sample

Merged revisions 53810 via svnmerge from

2007-02-10 00:40:57 +00:00

smdi.conf.sample

Merged revisions 42716 via svnmerge from

2006-09-11 16:41:49 +00:00

telcordia-1.adsi

remove extraneous svn:executable properties

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

udptl.conf.sample

Bug 5090 - sample configuration for udptl packets

2006-01-16 18:05:19 +00:00

users.conf.sample

Merged revisions 54002 via svnmerge from

2007-02-12 15:48:28 +00:00

voicemail.conf.sample

Merged revisions 50647 via svnmerge from

2007-01-12 19:25:26 +00:00

vpb.conf.sample

Merged revisions 42716 via svnmerge from

2006-09-11 16:41:49 +00:00

zapata.conf.sample

Add ability to modify range for dring matching.

2006-11-16 22:32:23 +00:00