Commit graph

9 commits

Author SHA1 Message Date
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
Olle Johansson
9d8260c68e Formatting fixes
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@17864 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2006-04-06 15:41:37 +00:00
Kevin P. Fleming
2c65582b66 remove extraneous svn:executable properties
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@7221 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2005-11-29 18:24:39 +00:00
Kevin P. Fleming
3e4feebbd6 issues #3599 and #4252
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@7033 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2005-11-08 23:19:30 +00:00
Kevin P. Fleming
f387421905 make sample config files easier to ready (issue #5371)
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@6720 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2005-10-04 22:51:59 +00:00
Mark Spencer
3fa3e8539d Merge config sample updates mentioning reload (bug #3697)
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@5187 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2005-03-17 15:56:55 +00:00
Mark Spencer
7279b57216 Add "admin pin" mode (bug #2387)
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@5066 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2005-02-22 15:42:41 +00:00
Jeremy McNamara
3f0a3cc6c0 Documment pin usage in MeetMe. Bug #843
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@2031 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2004-01-14 06:38:29 +00:00
Mark Spencer
a4cb6c34d3 Version 0.1.12 from FTP
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@432 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2002-04-09 00:49:07 +00:00