Show
Ignore:
Timestamp:
09/20/11 17:39:02 (8 months ago)
Author:
p_lindheimer
Message:

Merged revisions 12168,12170,12172,12183,12205,12221,12226-12229,12231,12235,12237,12250,12321,12357,12363,12467,12476,12529 via svnmerge from
http://www.freepbx.org/v2/svn/freepbx/branches/2.9

........

r12168 | GameGamer?43 | 2011-05-19 15:49:56 -0700 (Thu, 19 May 2011) | 1 line


closes #5160 - goes back to how things where done prior to r12066 with the exception that utility.functions.php is included where bootstrap-utility.functions.php used to be

........

r12170 | p_lindheimer | 2011-05-20 08:26:04 -0700 (Fri, 20 May 2011) | 1 line


remove 2.9.0.md5 checksum to regenerate 2.9.0 tag

........

r12172 | p_lindheimer | 2011-05-20 08:28:23 -0700 (Fri, 20 May 2011) | 1 line


Creating release 2.9.0

........

r12183 | p_lindheimer | 2011-05-20 16:32:04 -0700 (Fri, 20 May 2011) | 1 line


fixes #5138 make restrict_mods local and also detect and skip bootstrap if already called

........

r12205 | p_lindheimer | 2011-06-03 09:10:17 -0700 (Fri, 03 Jun 2011) | 1 line


fixed #5194 fix logic flaw so agi scripts can be copied after first module install

........

r12221 | mbrevda | 2011-06-07 08:32:39 -0700 (Tue, 07 Jun 2011) | 1 line


re #5209, write_freepbx should use AMPDBNAME for the db name, not AMPENGINE.

........

r12226 | p_lindheimer | 2011-06-09 15:23:24 -0700 (Thu, 09 Jun 2011) | 1 line


fixes #5217 don't return stripped version of xml to Module Admin

........

r12227 | p_lindheimer | 2011-06-09 15:29:41 -0700 (Thu, 09 Jun 2011) | 1 line


point to 2.9 modules re #5221 - need to rebuild tarball before closing

........

r12228 | p_lindheimer | 2011-06-09 15:53:54 -0700 (Thu, 09 Jun 2011) | 1 line


fixes #5212 if ASTAGIDIR is defined, chown even if it's already been done above through ASTVARLIBDIR...

........

r12229 | p_lindheimer | 2011-06-09 16:08:05 -0700 (Thu, 09 Jun 2011) | 1 line


fixes #5211 make amportal.conf and freepbx.conf 640 permission

........

r12231 | p_lindheimer | 2011-06-11 10:40:16 -0700 (Sat, 11 Jun 2011) | 1 line


closes #5226 include fw_ari and fw_fop in tarball

........

r12235 | p_lindheimer | 2011-06-11 12:17:07 -0700 (Sat, 11 Jun 2011) | 1 line


remove md5 hashes in preperation for re-generating 2.9.0 tarball because of 2.8 modules re #5221

........

r12237 | p_lindheimer | 2011-06-11 12:19:09 -0700 (Sat, 11 Jun 2011) | 1 line


Creating release 2.9.0

........

r12250 | p_lindheimer | 2011-06-11 12:25:01 -0700 (Sat, 11 Jun 2011) | 1 line


special case fw_ari and fw_fop during install_amp as framework re #5227

........

r12321 | mickecarlsson | 2011-07-26 07:43:52 -0700 (Tue, 26 Jul 2011) | 1 line


Closes #5280 revert some of r11047.

........

r12357 | xrobau | 2011-08-04 14:30:20 -0700 (Thu, 04 Aug 2011) | 1 line


Minor fixes for installer, and add the ability to symlink any asterisk path to elsewhere, and it'll still work.

........

r12363 | mickecarlsson | 2011-08-07 12:47:11 -0700 (Sun, 07 Aug 2011) | 1 line


Updated amp.pot for 2.9, should have been submitted a long time ago

........

r12467 | GameGamer?43 | 2011-08-30 15:43:20 -0700 (Tue, 30 Aug 2011) | 1 line


check if the readlink is valid before trying to chown & chmod directories to avoid displaying errors in the event the directories are not there or the user sets this to something else which isnt valid

........

r12476 | mickecarlsson | 2011-09-02 08:52:19 -0700 (Fri, 02 Sep 2011) | 1 line


Close #5348, updated Russian language. Thank you ded

........

r12529 | mickecarlsson | 2011-09-18 02:26:52 -0700 (Sun, 18 Sep 2011) | 1 line


Close #5352, double quotes in string for Advanced Settings should be single quotes and the string itself should be in double quotes.

........

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved
  • freepbx/trunk

    • Property svnmerge-integrated changed from /freepbx/branches/2.9:1-12166 to /freepbx/branches/2.9:1-12548
  • freepbx/trunk/libfreepbx.install.php

    r12409 r12549  
    919919  $set['options'] = ''; 
    920920  $set['name'] = 'Block CNAM on External Trunks'; 
    921   $set['description'] = 'Some carriers will reject a call if a CallerID Name (CNAM) is presented. This occurs in several areas when configuring CID on the PBX using the format of "CNAM" <CNUM>. To remove the CNAM part of CID on all external trunks, set this value to true. This WILL NOT remove CNAM when a trunk is called from an Intra-Company route. This can be done on each individual trunk in addition to globally if there are trunks where it is desirable to keep CNAM information, though most carriers ignore CNAM.'
     921  $set['description'] = "Some carriers will reject a call if a CallerID Name (CNAM) is presented. This occurs in several areas when configuring CID on the PBX using the format of 'CNAM' <CNUM>. To remove the CNAM part of CID on all external trunks, set this value to true. This WILL NOT remove CNAM when a trunk is called from an Intra-Company route. This can be done on each individual trunk in addition to globally if there are trunks where it is desirable to keep CNAM information, though most carriers ignore CNAM."
    922922  $set['emptyok'] = 0; 
    923923  $set['readonly'] = 0; 
     
    13581358  $set['options'] = ''; 
    13591359  $set['name'] = 'Leave Reload Bar Up'; 
    1360   $set['description'] = 'Forces the "Apply Configuration Changes" reload bar to always be present even when not necessary.'
     1360  $set['description'] = "Forces the 'Apply Configuration Changes' reload bar to always be present even when not necessary."
    13611361  $set['emptyok'] = 0; 
    13621362  $set['readonly'] = 0;