Changeset 9252

Timestamp:

03/16/10 21:05:03 (2 years ago)

Author:

p_lindheimer

Message:

Merged revisions 9070-9113,9115-9251 via svnmerge from
http://svn.freepbx.org/freepbx/branches/2.7

........

r9115 | p_lindheimer | 2010-03-10 10:15:05 -0800 (Wed, 10 Mar 2010) | 1 line

fixes #4109, fixes #3375 (regressed) merge r9108, r9109, r9110 from trunk

........

r9212 | p_lindheimer | 2010-03-14 08:52:36 -0700 (Sun, 14 Mar 2010) | 1 line

update existing manager.conf file with new permissions, this will need to be added to a 2.7.1 version but at least new framework upgrades will catch this when it is next published

........

Files:

• freepbx/trunk (modified) (1 prop)
• freepbx/trunk/amportal.conf (modified) (1 diff)
• freepbx/trunk/upgrades/2.7.0/updatemanager.php (copied) (copied from freepbx/branches/2.7/upgrades/2.7.0/updatemanager.php)

freepbx/trunk/amportal.conf

@@ -292 +292 @@
-# though it results in no errors. If you know that you want the includes, you can set this to true. If you comment it out FreePBX
-# will revert to legacy behavior and include the contexts.
+
+# RELOADCONFIRM=true|false
+# DEFAULT VALUE: true
+# When set to false, will by-pass the confirm on Relaod Box
+
+# FCBEEPONLY=true|false
+# DEFAULT VALUE: false
+# When set to true, a beep is played instead of confirmation message when activating/de-activating:
+# CallForward, CallWaiting, DayNight, DoNotDisturb and FindMeFollow